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

WatchEditor - some code cleanup

This commit is contained in:
adelikat 2019-10-04 13:29:08 -05:00
parent 879f8a97bc
commit 357cdf5df7
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
View File

@ -11,7 +11,7 @@ namespace BizHawk.Client.EmuHawk
{
public partial class WatchEditor : Form
{
public enum Mode { New, Duplicate, Edit };
public enum Mode { New, Duplicate, Edit }
private readonly List<Watch> _watchList = new List<Watch>();
@ -23,9 +23,9 @@ namespace BizHawk.Client.EmuHawk
private bool _changedSize;
private bool _changedDisplayType;
public Mode EditorMode { get { return _mode; } }
public List<Watch> Watches { get { return _watchList; } }
public Point InitialLocation = new Point(0, 0);
public List<Watch> Watches => _watchList;
public Point InitialLocation { get; set; } = new Point(0, 0);
public WatchEditor()
{
@ -39,6 +39,7 @@ namespace BizHawk.Client.EmuHawk
{
Location = InitialLocation;
}
_loading = false;
SetAddressBoxProperties();
@ -117,6 +118,7 @@ namespace BizHawk.Client.EmuHawk
DomainDropDown.Items.Clear();
DomainDropDown.Items.AddRange(MemoryDomains
.Select(d => d.ToString())
.Cast<object>()
.ToArray());
DomainDropDown.SelectedItem = domain.ToString();
@ -160,7 +162,7 @@ namespace BizHawk.Client.EmuHawk
{
default:
case 0:
foreach(DisplayType t in ByteWatch.ValidTypes)
foreach (DisplayType t in ByteWatch.ValidTypes)
{
DisplayTypeDropDown.Items.Add(Watch.DisplayTypeToString(t));
}
@ -240,17 +242,17 @@ namespace BizHawk.Client.EmuHawk
var address = AddressBox.ToLong() ?? 0;
var notes = NotesBox.Text;
var type = Watch.StringToDisplayType(DisplayTypeDropDown.SelectedItem.ToString());
var bigendian = BigEndianCheckBox.Checked;
var bigEndian = BigEndianCheckBox.Checked;
switch (SizeDropDown.SelectedIndex)
{
case 0:
_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.Byte, type, bigendian, notes));
_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.Byte, type, bigEndian, notes));
break;
case 1:
_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.Word, type, bigendian, notes));
_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.Word, type, bigEndian, notes));
break;
case 2:
_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.DWord, type, bigendian, notes));
_watchList.Add(Watch.GenerateWatch(domain, address, WatchSize.DWord, type, bigEndian, notes));
break;
}

3
BizHawk.Client.EmuHawk/tools/Watch/WatchValueBox.cs
View File

@ -619,7 +619,10 @@ namespace BizHawk.Client.EmuHawk
if (Text.IsSigned())
{
if (Text == "-")
{
return 0;
}
return int.Parse(Text);
}