ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MacroInput tool - some code cleanup

This commit is contained in:
adelikat 2016-12-06 11:01:47 -06:00
parent 2fbcaba8f4
commit 9e2ec00160
1 changed files with 86 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
View File

@ -15,8 +15,11 @@ namespace BizHawk.Client.EmuHawk
{ {
[RequiredService] [RequiredService]
private IEmulator Emulator { get; set; } private IEmulator Emulator { get; set; }
// Zones
List<MovieZone> zones = new List<MovieZone>(); private readonly List<MovieZone> _zones = new List<MovieZone>();
private readonly List<int> _unsavedZones = new List<int>();
private bool _selecting = false;
private IMovie CurrentMovie private IMovie CurrentMovie
{ {
get { return Global.MovieSession.Movie; } get { return Global.MovieSession.Movie; }
@ -39,8 +42,8 @@ namespace BizHawk.Client.EmuHawk
if (!Global.MovieSession.Movie.IsActive && !GlobalWin.Tools.IsLoaded<TAStudio>()) if (!Global.MovieSession.Movie.IsActive && !GlobalWin.Tools.IsLoaded<TAStudio>())
{ {
MessageBox.Show("In order to use this tool you must be recording a movie."); MessageBox.Show("In order to use this tool you must be recording a movie.");
this.Close(); Close();
this.DialogResult = System.Windows.Forms.DialogResult.Cancel; DialogResult = DialogResult.Cancel;
return; return;
} }
@ -48,10 +51,12 @@ namespace BizHawk.Client.EmuHawk
OverlayBox.Enabled = CurrentMovie is TasMovie; OverlayBox.Enabled = CurrentMovie is TasMovie;
PlaceNum.Enabled = CurrentMovie is TasMovie; PlaceNum.Enabled = CurrentMovie is TasMovie;
MovieZone main = new MovieZone(CurrentMovie, 0, CurrentMovie.InputLogLength); var main = new MovieZone(CurrentMovie, 0, CurrentMovie.InputLogLength)
main.Name = "Entire Movie"; {
Name = "Entire Movie"
};
zones.Add(main); _zones.Add(main);
ZonesList.Items.Add(main.Name + " - length: " + main.Length); ZonesList.Items.Add(main.Name + " - length: " + main.Length);
ZonesList.Items[0] += " [Zones don't change!]"; ZonesList.Items[0] += " [Zones don't change!]";
@ -63,18 +68,24 @@ namespace BizHawk.Client.EmuHawk
private void MacroInputTool_FormClosing(object sender, FormClosingEventArgs e) private void MacroInputTool_FormClosing(object sender, FormClosingEventArgs e)
{ {
if (_initializing) if (_initializing)
{
return; return;
}
if (!AskSaveChanges()) if (!AskSaveChanges())
{
e.Cancel = true; e.Cancel = true;
} }
}
public void Restart() public void Restart()
{ {
if (_initializing) if (_initializing)
{
return; return;
}
zones.Clear(); _zones.Clear();
ZonesList.Items.Clear(); ZonesList.Items.Clear();
MacroInputTool_Load(null, null); MacroInputTool_Load(null, null);
@ -87,10 +98,12 @@ namespace BizHawk.Client.EmuHawk
{ {
} }
public void FastUpdate() public void FastUpdate()
{ {
} }
public bool UpdateBefore public bool UpdateBefore
{ {
get { return true; } get { return true; }
@ -98,19 +111,27 @@ namespace BizHawk.Client.EmuHawk
public bool AskSaveChanges() public bool AskSaveChanges()
{ {
if (unsavedZones.Count == 0 || IsDisposed) if (_unsavedZones.Count == 0 || IsDisposed)
{
return true; return true;
}
else else
{ {
DialogResult result = MessageBox.Show("You have unsaved macro(s). Do you wish to save them?", "Save?", MessageBoxButtons.YesNoCancel); DialogResult result = MessageBox.Show("You have unsaved macro(s). Do you wish to save them?", "Save?", MessageBoxButtons.YesNoCancel);
if (result == DialogResult.Cancel) if (result == DialogResult.Cancel)
{
return false; return false;
}
else if (result == DialogResult.No) else if (result == DialogResult.No)
{
return true; return true;
} }
}
for (int i = 0; i < unsavedZones.Count; i++) for (int i = 0; i < _unsavedZones.Count; i++)
SaveMacroAs(zones[unsavedZones[i]]); {
SaveMacroAs(_zones[_unsavedZones[i]]);
}
return true; return true;
} }
@ -120,7 +141,6 @@ namespace BizHawk.Client.EmuHawk
Close(); Close();
} }
List<int> unsavedZones = new List<int>();
private void SetZoneButton_Click(object sender, EventArgs e) private void SetZoneButton_Click(object sender, EventArgs e)
{ {
if (StartNum.Value >= CurrentMovie.InputLogLength || EndNum.Value >= CurrentMovie.InputLogLength) if (StartNum.Value >= CurrentMovie.InputLogLength || EndNum.Value >= CurrentMovie.InputLogLength)
@ -129,12 +149,12 @@ namespace BizHawk.Client.EmuHawk
return; return;
} }
MovieZone newZone = new MovieZone(CurrentMovie, (int)StartNum.Value, (int)(EndNum.Value - StartNum.Value + 1)); var newZone = new MovieZone(CurrentMovie, (int)StartNum.Value, (int)(EndNum.Value - StartNum.Value + 1));
newZone.Name = "Zone " + zones.Count; newZone.Name = "Zone " + _zones.Count;
zones.Add(newZone); _zones.Add(newZone);
ZonesList.Items.Add(newZone.Name + " - length: " + newZone.Length); ZonesList.Items.Add(newZone.Name + " - length: " + newZone.Length);
unsavedZones.Add(ZonesList.Items.Count - 1); _unsavedZones.Add(ZonesList.Items.Count - 1);
} }
private MovieZone selectedZone private MovieZone selectedZone
@ -142,15 +162,20 @@ namespace BizHawk.Client.EmuHawk
get get
{ {
if (ZonesList.SelectedIndex == -1) if (ZonesList.SelectedIndex == -1)
{
return null; return null;
return zones[ZonesList.SelectedIndex]; }
return _zones[ZonesList.SelectedIndex];
} }
} }
private bool _selecting = false;
private void ZonesList_SelectedIndexChanged(object sender, EventArgs e) private void ZonesList_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (selectedZone == null) if (selectedZone == null)
{
return; return;
}
_selecting = true; _selecting = true;
PlaceNum.Value = selectedZone.Start; PlaceNum.Value = selectedZone.Start;
@ -163,32 +188,44 @@ namespace BizHawk.Client.EmuHawk
private void NameTextbox_TextChanged(object sender, EventArgs e) private void NameTextbox_TextChanged(object sender, EventArgs e)
{ {
if (selectedZone == null || _selecting) if (selectedZone == null || _selecting)
{
return; return;
}
selectedZone.Name = NameTextbox.Text; selectedZone.Name = NameTextbox.Text;
ZonesList.Items[ZonesList.SelectedIndex] = selectedZone.Name + " - length: " + selectedZone.Length; ZonesList.Items[ZonesList.SelectedIndex] = selectedZone.Name + " - length: " + selectedZone.Length;
} }
private void PlaceNum_ValueChanged(object sender, EventArgs e) private void PlaceNum_ValueChanged(object sender, EventArgs e)
{ {
if (selectedZone == null || _selecting) if (selectedZone == null || _selecting)
{
return; return;
}
selectedZone.Start = (int)PlaceNum.Value; selectedZone.Start = (int)PlaceNum.Value;
} }
private void ReplaceBox_CheckedChanged(object sender, EventArgs e) private void ReplaceBox_CheckedChanged(object sender, EventArgs e)
{ {
if (selectedZone == null || _selecting) if (selectedZone == null || _selecting)
{
return; return;
}
selectedZone.Replace = ReplaceBox.Checked; selectedZone.Replace = ReplaceBox.Checked;
} }
private void OverlayBox_CheckedChanged(object sender, EventArgs e) private void OverlayBox_CheckedChanged(object sender, EventArgs e)
{ {
if (selectedZone == null || _selecting) if (selectedZone == null || _selecting)
{
return; return;
}
selectedZone.Overlay = OverlayBox.Checked; selectedZone.Overlay = OverlayBox.Checked;
} }
private void CurrentButton_Click(object sender, EventArgs e) private void CurrentButton_Click(object sender, EventArgs e)
{ {
PlaceNum.Value = Global.Emulator.Frame; PlaceNum.Value = Global.Emulator.Frame;
@ -197,16 +234,20 @@ namespace BizHawk.Client.EmuHawk
private void PlaceZoneButton_Click(object sender, EventArgs e) private void PlaceZoneButton_Click(object sender, EventArgs e)
{ {
if (selectedZone == null) if (selectedZone == null)
{
return; return;
}
if (!(CurrentMovie is TasMovie)) if (!(CurrentMovie is TasMovie))
{ {
selectedZone.Start = Global.Emulator.Frame; selectedZone.Start = Global.Emulator.Frame;
} }
selectedZone.PlaceZone(CurrentMovie); selectedZone.PlaceZone(CurrentMovie);
} }
#region "Menu Items" #region Menu Items
private void saveAsToolStripMenuItem_Click(object sender, EventArgs e) private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (selectedZone == null) if (selectedZone == null)
@ -216,7 +257,7 @@ namespace BizHawk.Client.EmuHawk
} }
if (SaveMacroAs(selectedZone)) if (SaveMacroAs(selectedZone))
unsavedZones.Remove(ZonesList.SelectedIndex); _unsavedZones.Remove(ZonesList.SelectedIndex);
} }
private void loadMacroToolStripMenuItem_Click(object sender, EventArgs e) private void loadMacroToolStripMenuItem_Click(object sender, EventArgs e)
@ -224,7 +265,7 @@ namespace BizHawk.Client.EmuHawk
MovieZone loadZone = LoadMacro(); MovieZone loadZone = LoadMacro();
if (loadZone != null) if (loadZone != null)
{ {
zones.Add(loadZone); _zones.Add(loadZone);
ZonesList.Items.Add(loadZone.Name + " - length: " + loadZone.Length); ZonesList.Items.Add(loadZone.Name + " - length: " + loadZone.Length);
// Options only for TasMovie // Options only for TasMovie
@ -242,10 +283,11 @@ namespace BizHawk.Client.EmuHawk
RecentToolStripMenuItem.DropDownItems.AddRange( RecentToolStripMenuItem.DropDownItems.AddRange(
Global.Config.RecentMacros.RecentMenu(DummyLoadMacro, true)); Global.Config.RecentMacros.RecentMenu(DummyLoadMacro, true));
} }
private void DummyLoadMacro(string path) private void DummyLoadMacro(string path)
{ {
MovieZone loadZone = new MovieZone(path); MovieZone loadZone = new MovieZone(path);
zones.Add(loadZone); _zones.Add(loadZone);
ZonesList.Items.Add(loadZone.Name + " - length: " + loadZone.Length); ZonesList.Items.Add(loadZone.Name + " - length: " + loadZone.Length);
} }
@ -255,11 +297,18 @@ namespace BizHawk.Client.EmuHawk
Global.Config.PathEntries["Global", "Macros"].Path, Global.Config.PathEntries["Global", "Macros"].Path,
Global.Game.Name), null); Global.Game.Name), null);
} }
#endregion #endregion
public static bool SaveMacroAs(MovieZone macro) public static bool SaveMacroAs(MovieZone macro)
{ {
SaveFileDialog dialog = new SaveFileDialog(); var dialog = new SaveFileDialog
{
InitialDirectory = SuggestedFolder(),
FileName = macro.Name,
Filter = "Movie Macros (*.bk2m)|*.bk2m|All Files|*.*"
};
// Create directory? // Create directory?
bool create = false; bool create = false;
if (!Directory.Exists(SuggestedFolder())) if (!Directory.Exists(SuggestedFolder()))
@ -267,15 +316,15 @@ namespace BizHawk.Client.EmuHawk
Directory.CreateDirectory(SuggestedFolder()); Directory.CreateDirectory(SuggestedFolder());
create = true; create = true;
} }
dialog.InitialDirectory = SuggestedFolder();
dialog.FileName = macro.Name;
dialog.Filter = "Movie Macros (*.bk2m)|*.bk2m|All Files|*.*";
DialogResult result = dialog.ShowHawkDialog(); DialogResult result = dialog.ShowHawkDialog();
if (result != DialogResult.OK) if (result != DialogResult.OK)
{ {
if (create) if (create)
{
Directory.Delete(dialog.InitialDirectory); Directory.Delete(dialog.InitialDirectory);
}
return false; return false;
} }
@ -284,21 +333,23 @@ namespace BizHawk.Client.EmuHawk
return true; return true;
} }
public static MovieZone LoadMacro() public static MovieZone LoadMacro()
{ {
OpenFileDialog dialog = new OpenFileDialog(); var dialog = new OpenFileDialog
dialog.InitialDirectory = SuggestedFolder(); {
dialog.Filter = "Movie Macros (*.bk2m)|*.bk2m|All Files|*.*"; InitialDirectory = SuggestedFolder(),
Filter = "Movie Macros (*.bk2m)|*.bk2m|All Files|*.*"
};
DialogResult result = dialog.ShowHawkDialog(); DialogResult result = dialog.ShowHawkDialog();
if (result != DialogResult.OK) if (result != DialogResult.OK)
{
return null; return null;
}
MovieZone ret = new MovieZone(dialog.FileName);
if (ret != null)
Global.Config.RecentMacros.Add(dialog.FileName); Global.Config.RecentMacros.Add(dialog.FileName);
return new MovieZone(dialog.FileName);
return ret;
} }
} }
} }