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

hook up new ram search in various places in mainform, and basic updating of values done

This commit is contained in:
adelikat 2013-09-15 01:49:02 +00:00
parent 55fe3e4a49
commit 3fa153f4cd
5 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BizHawk.MultiClient/MainForm.cs
View File

@ -86,6 +86,8 @@ namespace BizHawk.MultiClient
//tool dialogs
private RamSearch _ramsearch = null;
private NewRamSearch _newramsearch = null;
private HexEditor _hexeditor = null;
private TraceLogger _tracelogger = null;
private SNESGraphicsDebugger _snesgraphicsdebugger = null;
@ -109,6 +111,8 @@ namespace BizHawk.MultiClient
//TODO: this is a lazy way to refactor things, but works for now. The point is to not have these objects created until needed, without refactoring a lot of code
public RamSearch RamSearch1 { get { if (_ramsearch == null) _ramsearch = new RamSearch(); return _ramsearch; } set { _ramsearch = value; } }
public NewRamSearch NewRamSearch1 { get { if (_newramsearch == null) _newramsearch = new NewRamSearch(); return _newramsearch; } set { _newramsearch = value; } }
public HexEditor HexEditor1 { get { if (_hexeditor == null) _hexeditor = new HexEditor(); return _hexeditor; } set { _hexeditor = value; } }
public TraceLogger TraceLogger1 { get { if (_tracelogger == null) _tracelogger = new TraceLogger(); return _tracelogger; } set { _tracelogger = value; } }
public SNESGraphicsDebugger SNESGraphicsDebugger1 { get { if (_snesgraphicsdebugger == null) _snesgraphicsdebugger = new SNESGraphicsDebugger(); return _snesgraphicsdebugger; } set { _snesgraphicsdebugger = value; } }
@ -1578,6 +1582,8 @@ namespace BizHawk.MultiClient
// SyncThrottle();
//}
if (_ramsearch != null) RamSearch1.Restart();
if (_newramsearch != null) NewRamSearch1.Restart();
if (_newramwatch != null) NewRamWatch1.Restart();
if (_hexeditor != null) HexEditor1.Restart();
if (_nesppu != null) NESPPU1.Restart();
@ -2324,6 +2330,8 @@ namespace BizHawk.MultiClient
#endif
if (_newramwatch != null) NewRamWatch1.UpdateValues();
if (_ramsearch != null) RamSearch1.UpdateValues();
if (_newramsearch != null) NewRamSearch1.UpdateValues();
if (_hexeditor != null) HexEditor1.UpdateValues();
//The other tool updates are earlier, TAStudio needs to be later so it can display the latest
//frame of execution in its list view.
@ -2669,7 +2677,15 @@ namespace BizHawk.MultiClient
//TODO
if (MainForm.INTERIM && Global.Config.RecentSearches.AutoLoad)
{
new NewRamSearch().Show();
if (!NewRamSearch1.IsHandleCreated || NewRamSearch1.IsDisposed)
{
NewRamSearch1 = new NewRamSearch();
NewRamSearch1.Show();
}
else
{
NewRamSearch1.Focus();
}
}
else
{
@ -3196,6 +3212,7 @@ namespace BizHawk.MultiClient
RewireSound();
ResetRewindBuffer();
RamSearch1.Restart();
NewRamSearch1.Restart();
NewRamWatch1.Restart();
HexEditor1.Restart();
NESPPU1.Restart();
@ -3239,6 +3256,7 @@ namespace BizHawk.MultiClient
{
CloseForm(NewRamWatch1);
CloseForm(RamSearch1);
CloseForm(NewRamSearch1);
CloseForm(HexEditor1);
CloseForm(NESNameTableViewer1);
CloseForm(NESPPU1);

2
BizHawk.MultiClient/tools/Cheats.cs
View File

@ -232,6 +232,7 @@ namespace BizHawk.MultiClient
{
Global.MainForm.NewRamWatch1.UpdateValues();
Global.MainForm.RamSearch1.UpdateValues();
Global.MainForm.NewRamSearch1.UpdateValues();
Global.MainForm.HexEditor1.UpdateValues();
}
@ -782,6 +783,7 @@ namespace BizHawk.MultiClient
Global.MainForm.NewRamWatch1.UpdateValues();
Global.MainForm.RamSearch1.UpdateValues();
Global.MainForm.NewRamSearch1.UpdateValues();
Global.MainForm.HexEditor1.UpdateValues();
}
UpdateNumberOfCheats();

2
BizHawk.MultiClient/tools/HexEditor/HexEditor.cs
View File

@ -847,6 +847,7 @@ namespace BizHawk.MultiClient
}
Global.MainForm.RamSearch1.UpdateValues();
Global.MainForm.NewRamSearch1.UpdateValues();
Global.MainForm.NewRamWatch1.UpdateValues();
Global.MainForm.Cheats_UpdateValues();
}
@ -1662,6 +1663,7 @@ namespace BizHawk.MultiClient
MemoryViewerBox.Refresh();
Global.MainForm.RamSearch1.UpdateValues();
Global.MainForm.NewRamSearch1.UpdateValues();
Global.MainForm.NewRamWatch1.UpdateValues();
Global.MainForm.Cheats_UpdateValues();
}

11
BizHawk.MultiClient/tools/Watch/NewRamSearch.cs
View File

@ -92,11 +92,22 @@ namespace BizHawk.MultiClient
#region Public
public void UpdateValues()
{
Searches.Update();
WatchListView.Refresh();
}
public void SaveConfigSettings()
{
//TODO
}
public void Restart()
{
//TODO
}
#endregion
#region Private

2
BizHawk.MultiClient/tools/Watch/RamWatch.cs
View File

@ -1132,7 +1132,7 @@ namespace BizHawk.MultiClient
Global.MainForm.Cheats1.RemoveAllCheats();
UpdateValues();
Global.MainForm.RamSearch1.UpdateValues();
Global.MainForm.RamSearch1.UpdateValues();
Global.MainForm.NewRamSearch1.UpdateValues();
Global.MainForm.HexEditor1.UpdateValues();
Global.MainForm.Cheats_UpdateValues();
}