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

Move SearcMode enum out of SearchEngineSettings

This commit is contained in:
adelikat 2020-03-03 11:48:52 -06:00
parent a151bd7424
commit 23c819de4a
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/tools/RamSearchEngine/Enums.cs
View File

@ -9,4 +9,9 @@
{ {
Previous, SpecificValue, SpecificAddress, Changes, Difference Previous, SpecificValue, SpecificAddress, Changes, Difference
} }
public enum SearchMode
{
Fast, Detailed
}
} }

30
BizHawk.Client.Common/tools/RamSearchEngine/RamSearchEngine.cs
View File

@ -62,7 +62,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
{ {
default: default:
case WatchSize.Byte: case WatchSize.Byte:
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
for (int i = 0; i < domain.Size; i++) for (int i = 0; i < domain.Size; i++)
{ {
@ -79,7 +79,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
break; break;
case WatchSize.Word: case WatchSize.Word:
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
for (int i = 0; i < domain.Size - 1; i += _settings.CheckMisAligned ? 1 : 2) for (int i = 0; i < domain.Size - 1; i += _settings.CheckMisAligned ? 1 : 2)
{ {
@ -96,7 +96,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
break; break;
case WatchSize.DWord: case WatchSize.DWord:
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
for (int i = 0; i < domain.Size - 3; i += _settings.CheckMisAligned ? 1 : 4) for (int i = 0; i < domain.Size - 3; i += _settings.CheckMisAligned ? 1 : 4)
{ {
@ -122,7 +122,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
{ {
get get
{ {
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
return Watch.GenerateWatch( return Watch.GenerateWatch(
_settings.Domain, _settings.Domain,
@ -194,7 +194,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
public int Count => _watchList.Count; public int Count => _watchList.Count;
public SearchEngineSettings.SearchMode Mode => _settings.Mode; public SearchMode Mode => _settings.Mode;
public MemoryDomain Domain => _settings.Domain; public MemoryDomain Domain => _settings.Domain;
@ -225,7 +225,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
public void Update() public void Update()
{ {
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
foreach (IMiniWatchDetails watch in _watchList) foreach (IMiniWatchDetails watch in _watchList)
{ {
@ -247,7 +247,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
/// <exception cref="InvalidOperationException"><see cref="Mode"/> is <see cref="Settings.SearchMode.Fast"/> and <paramref name="type"/> is <see cref="PreviousType.LastFrame"/></exception> /// <exception cref="InvalidOperationException"><see cref="Mode"/> is <see cref="Settings.SearchMode.Fast"/> and <paramref name="type"/> is <see cref="PreviousType.LastFrame"/></exception>
public void SetPreviousType(PreviousType type) public void SetPreviousType(PreviousType type)
{ {
if (_settings.Mode == SearchEngineSettings.SearchMode.Fast) if (_settings.Mode == SearchMode.Fast)
{ {
if (type == PreviousType.LastFrame) if (type == PreviousType.LastFrame)
{ {
@ -265,7 +265,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
public void ClearChangeCounts() public void ClearChangeCounts()
{ {
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
foreach (var watch in _watchList.Cast<IMiniWatchDetails>()) foreach (var watch in _watchList.Cast<IMiniWatchDetails>())
{ {
@ -311,7 +311,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
{ {
default: default:
case WatchSize.Byte: case WatchSize.Byte:
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
foreach (var addr in addresses) foreach (var addr in addresses)
{ {
@ -328,7 +328,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
break; break;
case WatchSize.Word: case WatchSize.Word:
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
foreach (var addr in addresses) foreach (var addr in addresses)
{ {
@ -345,7 +345,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
break; break;
case WatchSize.DWord: case WatchSize.DWord:
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
foreach (var addr in addresses) foreach (var addr in addresses)
{ {
@ -394,7 +394,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
break; break;
case WatchList.CHANGES: case WatchList.CHANGES:
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed) if (_settings.Mode == SearchMode.Detailed)
{ {
if (reverse) if (reverse)
{ {
@ -611,7 +611,7 @@ namespace BizHawk.Client.Common.RamSearchEngine
private IEnumerable<IMiniWatch> CompareChanges(IEnumerable<IMiniWatch> watchList) private IEnumerable<IMiniWatch> CompareChanges(IEnumerable<IMiniWatch> watchList)
{ {
if (_settings.Mode == SearchEngineSettings.SearchMode.Detailed && CompareValue.HasValue) if (_settings.Mode == SearchMode.Detailed && CompareValue.HasValue)
{ {
var compareValue = CompareValue.Value; var compareValue = CompareValue.Value;
switch (Operator) switch (Operator)
@ -760,8 +760,8 @@ namespace BizHawk.Client.Common.RamSearchEngine
{ {
return _settings.Mode switch return _settings.Mode switch
{ {
SearchEngineSettings.SearchMode.Detailed => true, SearchMode.Detailed => true,
SearchEngineSettings.SearchMode.Fast => (compareType != Compare.Changes), SearchMode.Fast => (compareType != Compare.Changes),
_ => true _ => true
}; };
} }

5
BizHawk.Client.Common/tools/RamSearchEngine/SearchEngineSettings.cs
View File

@ -19,11 +19,6 @@ namespace BizHawk.Client.Common.RamSearchEngine
} }
/*Require restart*/ /*Require restart*/
public enum SearchMode
{
Fast, Detailed
}
public SearchMode Mode { get; set; } public SearchMode Mode { get; set; }
public MemoryDomain Domain { get; set; } public MemoryDomain Domain { get; set; }
public WatchSize Size { get; set; } public WatchSize Size { get; set; }

22
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -150,7 +150,7 @@ namespace BizHawk.Client.EmuHawk
_dropdownDontfire = false; _dropdownDontfire = false;
if (_settings.Mode == SearchEngineSettings.SearchMode.Fast) if (_settings.Mode == SearchMode.Fast)
{ {
SetToFastMode(); SetToFastMode();
} }
@ -606,9 +606,9 @@ namespace BizHawk.Client.EmuHawk
private void DoDomainSizeCheck() private void DoDomainSizeCheck()
{ {
if (_settings.Domain.Size >= MaxDetailedSize if (_settings.Domain.Size >= MaxDetailedSize
&& _settings.Mode == SearchEngineSettings.SearchMode.Detailed) && _settings.Mode == SearchMode.Detailed)
{ {
_settings.Mode = SearchEngineSettings.SearchMode.Fast; _settings.Mode = SearchMode.Fast;
SetReboot(true); SetReboot(true);
MessageLabel.Text = "Large domain, switching to fast mode"; MessageLabel.Text = "Large domain, switching to fast mode";
} }
@ -768,7 +768,7 @@ namespace BizHawk.Client.EmuHawk
private void SetToDetailedMode() private void SetToDetailedMode()
{ {
_settings.Mode = SearchEngineSettings.SearchMode.Detailed; _settings.Mode = SearchMode.Detailed;
NumberOfChangesRadio.Enabled = true; NumberOfChangesRadio.Enabled = true;
NumberOfChangesBox.Enabled = true; NumberOfChangesBox.Enabled = true;
DifferenceRadio.Enabled = true; DifferenceRadio.Enabled = true;
@ -797,7 +797,7 @@ namespace BizHawk.Client.EmuHawk
private void SetToFastMode() private void SetToFastMode()
{ {
_settings.Mode = SearchEngineSettings.SearchMode.Fast; _settings.Mode = SearchMode.Fast;
if (_settings.PreviousType == PreviousType.LastFrame || _settings.PreviousType == PreviousType.LastChange) if (_settings.PreviousType == PreviousType.LastFrame || _settings.PreviousType == PreviousType.LastChange)
{ {
@ -1074,8 +1074,8 @@ namespace BizHawk.Client.EmuHawk
private void ModeSubMenu_DropDownOpened(object sender, EventArgs e) private void ModeSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
DetailedMenuItem.Checked = _settings.Mode == SearchEngineSettings.SearchMode.Detailed; DetailedMenuItem.Checked = _settings.Mode == SearchMode.Detailed;
FastMenuItem.Checked = _settings.Mode == SearchEngineSettings.SearchMode.Fast; FastMenuItem.Checked = _settings.Mode == SearchMode.Fast;
} }
private void MemoryDomainsSubMenu_DropDownOpened(object sender, EventArgs e) private void MemoryDomainsSubMenu_DropDownOpened(object sender, EventArgs e)
@ -1152,8 +1152,8 @@ namespace BizHawk.Client.EmuHawk
break; break;
} }
PreviousFrameMenuItem.Enabled = _settings.Mode != SearchEngineSettings.SearchMode.Fast; PreviousFrameMenuItem.Enabled = _settings.Mode != SearchMode.Fast;
Previous_LastChangeMenuItem.Enabled = _settings.Mode != SearchEngineSettings.SearchMode.Fast; Previous_LastChangeMenuItem.Enabled = _settings.Mode != SearchMode.Fast;
} }
private void DetailedMenuItem_Click(object sender, EventArgs e) private void DetailedMenuItem_Click(object sender, EventArgs e)
@ -1219,7 +1219,7 @@ namespace BizHawk.Client.EmuHawk
private void SearchSubMenu_DropDownOpened(object sender, EventArgs e) private void SearchSubMenu_DropDownOpened(object sender, EventArgs e)
{ {
ClearChangeCountsMenuItem.Enabled = _settings.Mode == SearchEngineSettings.SearchMode.Detailed; ClearChangeCountsMenuItem.Enabled = _settings.Mode == SearchMode.Detailed;
RemoveMenuItem.Enabled = RemoveMenuItem.Enabled =
AddToRamWatchMenuItem.Enabled = AddToRamWatchMenuItem.Enabled =
@ -1411,7 +1411,7 @@ namespace BizHawk.Client.EmuHawk
RamSearchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback)); RamSearchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
_settings = new SearchEngineSettings(MemoryDomains); _settings = new SearchEngineSettings(MemoryDomains);
if (_settings.Mode == SearchEngineSettings.SearchMode.Fast) if (_settings.Mode == SearchMode.Fast)
{ {
SetToFastMode(); SetToFastMode();
} }