Hex Editor - very slight optimziing of GenerateMemoryViewString

This commit is contained in:
andres.delikat 2011-08-25 17:05:51 +00:00
parent db0fe17933
commit dea2afd513
1 changed files with 6 additions and 7 deletions

View File

@ -23,6 +23,7 @@ namespace BizHawk.MultiClient
int RowsVisible = 0; int RowsVisible = 0;
string Header = ""; string Header = "";
int NumDigits = 4; int NumDigits = 4;
string NumDigitsStr = "{0:X4} ";
char[] nibbles = { 'G', 'G', 'G', 'G' , 'G', 'G', 'G', 'G'}; //G = off 0-9 & A-F are acceptable values char[] nibbles = { 'G', 'G', 'G', 'G' , 'G', 'G', 'G', 'G'}; //G = off 0-9 & A-F are acceptable values
int addressHighlighted = -1; int addressHighlighted = -1;
int addressOver = -1; int addressOver = -1;
@ -94,9 +95,6 @@ namespace BizHawk.MultiClient
{ {
unchecked unchecked
{ {
row = 0;
addr = 0;
StringBuilder rowStr = new StringBuilder(""); StringBuilder rowStr = new StringBuilder("");
addrOffset = (NumDigits % 4) * 9; addrOffset = (NumDigits % 4) * 9;
@ -105,11 +103,11 @@ namespace BizHawk.MultiClient
for (int i = 0; i < RowsVisible; i++) for (int i = 0; i < RowsVisible; i++)
{ {
row = i + vScrollBar1.Value; row = i + vScrollBar1.Value;
if (row * 16 >= Domain.Size) addr = (row * 16);
if (addr >= Domain.Size)
break; break;
rowStr.AppendFormat("{0:X" + NumDigits + "} ", row * 16); rowStr.AppendFormat(NumDigitsStr, addr);
addr = (row * 16);
for (int j = 0; j < 16; j += Global.Config.HexEditorDataSize) for (int j = 0; j < 16; j += Global.Config.HexEditorDataSize)
{ {
if (addr + j < Domain.Size) if (addr + j < Domain.Size)
@ -380,6 +378,7 @@ namespace BizHawk.MultiClient
break; break;
} }
NumDigits = GetNumDigits(Domain.Size); NumDigits = GetNumDigits(Domain.Size);
NumDigitsStr = "{0:X" + NumDigits.ToString() + "} ";
} }
public void SetDataSize(int size) public void SetDataSize(int size)