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

Ram Search - IEnumerable instead of IList, Any() instead of Count > 0, makes a few things a bit faster in large search lists

This commit is contained in:
adelikat 2014-07-02 23:50:09 +00:00
parent a10e5fa16a
commit 8362d078a4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,9 +497,9 @@ namespace BizHawk.Client.EmuHawk
_forcePreviewClear = true; _forcePreviewClear = true;
} }
private IList<int> SelectedIndices private IEnumerable<int> SelectedIndices
{ {
get { return WatchListView.SelectedIndices.Cast<int>().ToList(); } get { return WatchListView.SelectedIndices.Cast<int>(); }
} }
private IEnumerable<Watch> SelectedItems private IEnumerable<Watch> SelectedItems
@ -779,11 +779,12 @@ namespace BizHawk.Client.EmuHawk
private void RemoveAddresses() private void RemoveAddresses()
{ {
if (SelectedIndices.Count > 0) var indices = SelectedIndices.ToList();
if (indices.Any())
{ {
SetRemovedMessage(SelectedIndices.Count); SetRemovedMessage(indices.Count);
var addresses = SelectedIndices.Select(index => _searches[index].Address ?? 0).ToList(); var addresses = indices.Select(index => _searches[index].Address ?? 0).ToList();
_searches.RemoveRange(addresses); _searches.RemoveRange(addresses);
WatchListView.ItemCount = _searches.Count; WatchListView.ItemCount = _searches.Count;
@ -851,7 +852,7 @@ namespace BizHawk.Client.EmuHawk
private void PokeAddress() private void PokeAddress()
{ {
if (SelectedIndices.Count > 0) if (SelectedIndices.Any())
{ {
var poke = new RamPoke(); var poke = new RamPoke();
var watches = SelectedIndices.Select(t => _searches[t]).ToList(); var watches = SelectedIndices.Select(t => _searches[t]).ToList();
@ -1397,7 +1398,7 @@ namespace BizHawk.Client.EmuHawk
ContextMenuSeparator2.Visible = ContextMenuSeparator2.Visible =
ViewInHexEditorContextMenuItem.Visible = ViewInHexEditorContextMenuItem.Visible =
SelectedIndices.Count > 0; SelectedIndices.Any();
UnfreezeAllContextMenuItem.Visible = Global.CheatList.ActiveCount > 0; UnfreezeAllContextMenuItem.Visible = Global.CheatList.ActiveCount > 0;
@ -1664,7 +1665,7 @@ namespace BizHawk.Client.EmuHawk
} }
else if (e.KeyCode == Keys.C && e.Control && !e.Alt && !e.Shift) // Copy else if (e.KeyCode == Keys.C && e.Control && !e.Alt && !e.Shift) // Copy
{ {
if (SelectedIndices.Count > 0) if (SelectedIndices.Any())
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
foreach (var index in SelectedIndices) foreach (var index in SelectedIndices)
@ -1721,7 +1722,7 @@ namespace BizHawk.Client.EmuHawk
private void WatchListView_MouseDoubleClick(object sender, MouseEventArgs e) private void WatchListView_MouseDoubleClick(object sender, MouseEventArgs e)
{ {
if (SelectedIndices.Count > 0) if (SelectedIndices.Any())
{ {
AddToRamWatch(); AddToRamWatch();
} }