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

Some nitpicky code cleanup on a few files before I do something useful with them

This commit is contained in:
adelikat 2014-02-24 02:50:56 +00:00
parent b1dc3f0f48
commit 3cf2ba7afc
2 changed files with 52 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
BizHawk.Client.EmuHawk/CustomControls/HexTextBox.cs
View File

@ -2,31 +2,35 @@
using System.Globalization;
using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{
public interface INumberBox
{
bool Nullable { get; }
int? ToRawInt();
void SetFromRawInt(int? rawint);
bool Nullable { get; }
}
public class HexTextBox : TextBox, INumberBox
{
private string _addressFormatStr = String.Empty;
private int? _maxSize = null;
private string _addressFormatStr = string.Empty;
private int? _maxSize;
private bool _nullable = true;
public HexTextBox()
{
CharacterCasing = CharacterCasing.Upper;
}
public bool Nullable { get { return _nullable; } set { _nullable = value; } }
public void SetHexProperties(int domainSize)
{
_maxSize = domainSize - 1;
MaxLength = IntHelpers.GetNumDigits(_maxSize.Value);
_addressFormatStr = "{0:X" + MaxLength.ToString() + "}";
_addressFormatStr = "{0:X" + MaxLength + "}";
ResetText();
}
@ -37,27 +41,13 @@ namespace BizHawk.Client.EmuHawk
{
return (uint)_maxSize.Value;
}
else
{
return IntHelpers.MaxHexValueFromMaxDigits(MaxLength);
}
return IntHelpers.MaxHexValueFromMaxDigits(MaxLength);
}
public override void ResetText()
{
if (_nullable)
{
Text = String.Empty;
}
else
{
Text = String.Format(_addressFormatStr, 0);
}
}
public HexTextBox()
{
CharacterCasing = CharacterCasing.Upper;
Text = _nullable ? string.Empty : string.Format(_addressFormatStr, 0);
}
protected override void OnKeyPress(KeyPressEventArgs e)
@ -66,7 +56,8 @@ namespace BizHawk.Client.EmuHawk
{
return;
}
else if (!InputValidate.IsHex(e.KeyChar))
if (!InputValidate.IsHex(e.KeyChar))
{
e.Handled = true;
}
@ -76,9 +67,9 @@ namespace BizHawk.Client.EmuHawk
{
if (e.KeyCode == Keys.Up)
{
if (InputValidate.IsHex(Text) && !String.IsNullOrEmpty(_addressFormatStr))
if (InputValidate.IsHex(Text) && !string.IsNullOrEmpty(_addressFormatStr))
{
uint val = (uint)ToRawInt();
var val = (uint)ToRawInt();
if (val == GetMax())
{
@ -89,14 +80,14 @@ namespace BizHawk.Client.EmuHawk
val++;
}
Text = String.Format(_addressFormatStr, val);
Text = string.Format(_addressFormatStr, val);
}
}
else if (e.KeyCode == Keys.Down)
{
if (InputValidate.IsHex(Text) && !String.IsNullOrEmpty(_addressFormatStr))
if (InputValidate.IsHex(Text) && !string.IsNullOrEmpty(_addressFormatStr))
{
uint val = (uint)ToRawInt();
var val = (uint)ToRawInt();
if (val == 0)
{
val = GetMax();
@ -106,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
val--;
}
Text = String.Format(_addressFormatStr, val);
Text = string.Format(_addressFormatStr, val);
}
}
else
@ -117,7 +108,7 @@ namespace BizHawk.Client.EmuHawk
protected override void OnTextChanged(EventArgs e)
{
if (String.IsNullOrWhiteSpace(Text))
if (string.IsNullOrWhiteSpace(Text))
{
ResetText();
}
@ -127,45 +118,34 @@ namespace BizHawk.Client.EmuHawk
public int? ToRawInt()
{
if (String.IsNullOrWhiteSpace(Text))
if (string.IsNullOrWhiteSpace(Text))
{
if (Nullable)
{
return null;
}
else
{
return 0;
}
}
else
{
return int.Parse(Text, NumberStyles.HexNumber);
return 0;
}
return int.Parse(Text, NumberStyles.HexNumber);
}
public void SetFromRawInt(int? val)
{
if (val.HasValue)
{
Text = String.Format(_addressFormatStr, val);
}
else
{
Text = String.Empty;
}
Text = val.HasValue ? string.Format(_addressFormatStr, val) : string.Empty;
}
}
public class UnsignedIntegerBox : TextBox, INumberBox
{
private bool _nullable = true;
public UnsignedIntegerBox()
{
CharacterCasing = CharacterCasing.Upper;
}
private bool _nullable = true;
public bool Nullable { get { return _nullable; } set { _nullable = value; } }
protected override void OnKeyPress(KeyPressEventArgs e)
@ -174,7 +154,8 @@ namespace BizHawk.Client.EmuHawk
{
return;
}
else if (!InputValidate.IsUnsigned(e.KeyChar))
if (!InputValidate.IsUnsigned(e.KeyChar))
{
e.Handled = true;
}
@ -182,14 +163,7 @@ namespace BizHawk.Client.EmuHawk
public override void ResetText()
{
if (_nullable)
{
Text = String.Empty;
}
else
{
Text = "0";
}
Text = _nullable ? string.Empty : "0";
}
protected override void OnKeyDown(KeyEventArgs e)
@ -198,7 +172,7 @@ namespace BizHawk.Client.EmuHawk
{
if (InputValidate.IsUnsigned(Text))
{
uint val = (uint)ToRawInt();
var val = (uint)ToRawInt();
if (val == uint.MaxValue)
{
val = 0;
@ -207,6 +181,7 @@ namespace BizHawk.Client.EmuHawk
{
val++;
}
Text = val.ToString();
}
}
@ -214,7 +189,7 @@ namespace BizHawk.Client.EmuHawk
{
if (InputValidate.IsUnsigned(Text))
{
uint val = (uint)ToRawInt();
var val = (uint)ToRawInt();
if (val == 0)
{
@ -236,7 +211,7 @@ namespace BizHawk.Client.EmuHawk
protected override void OnTextChanged(EventArgs e)
{
if (String.IsNullOrWhiteSpace(Text))
if (string.IsNullOrWhiteSpace(Text))
{
ResetText();
}
@ -246,26 +221,22 @@ namespace BizHawk.Client.EmuHawk
public int? ToRawInt()
{
if (String.IsNullOrWhiteSpace(Text))
if (string.IsNullOrWhiteSpace(Text))
{
if (Nullable)
{
return null;
}
else
{
return 0;
}
}
else
{
return (int)uint.Parse(Text);
return 0;
}
return (int)uint.Parse(Text);
}
public void SetFromRawInt(int? val)
{
Text = val.HasValue ? val.ToString() : String.Empty;
Text = val.HasValue ? val.ToString() : string.Empty;
}
}
}

21
BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
View File

@ -35,24 +35,23 @@ namespace BizHawk.Client.EmuHawk
private string GetFindBoxChars()
{
if (String.IsNullOrWhiteSpace(FindBox.Text))
if (string.IsNullOrWhiteSpace(FindBox.Text))
{
return String.Empty;
return string.Empty;
}
else if (HexRadio.Checked)
if (HexRadio.Checked)
{
return FindBox.Text;
}
else
var bytestring = new StringBuilder();
foreach (var b in FindBox.Text.Select(Convert.ToByte))
{
var bytestring = new StringBuilder();
foreach (var b in FindBox.Text.Select(Convert.ToByte))
{
bytestring.Append(String.Format("{0:X2}", b));
}
return bytestring.ToString();
bytestring.Append(string.Format("{0:X2}", b));
}
return bytestring.ToString();
}
private void Find_Prev_Click(object sender, EventArgs e)