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

New Ram Watch - configurable previous value definitions

This commit is contained in:
adelikat 2013-09-08 19:22:21 +00:00
parent 440185a229
commit d1e36b62e1
4 changed files with 123 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/Config.cs
View File

@ -211,6 +211,7 @@ namespace BizHawk.MultiClient
public int RamWatchNotesIndex = 6;
public int RamWatchPrev_Type = 1;
public Watch.PreviousType RamWatchDefinePrevious = Watch.PreviousType.LastFrame;
// RamSearch Settings
public bool RamSearchSaveWindowPosition = true;

16
BizHawk.MultiClient/tools/Watch/NewRamWatch.Designer.cs generated
View File

@ -96,6 +96,7 @@
this.DiffColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.DomainColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.NotesColumn = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.originalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
@ -604,23 +605,26 @@
//
this.definePreviousValueAsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.previousFrameToolStripMenuItem,
this.lastChangeToolStripMenuItem});
this.definePreviousValueAsToolStripMenuItem.Enabled = false;
this.lastChangeToolStripMenuItem,
this.originalToolStripMenuItem});
this.definePreviousValueAsToolStripMenuItem.Name = "definePreviousValueAsToolStripMenuItem";
this.definePreviousValueAsToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
this.definePreviousValueAsToolStripMenuItem.Text = "Define Previous Value As";
this.definePreviousValueAsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.definePreviousValueAsToolStripMenuItem_DropDownOpened);
//
// previousFrameToolStripMenuItem
//
this.previousFrameToolStripMenuItem.Name = "previousFrameToolStripMenuItem";
this.previousFrameToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
this.previousFrameToolStripMenuItem.Text = "Previous Frame";
this.previousFrameToolStripMenuItem.Click += new System.EventHandler(this.previousFrameToolStripMenuItem_Click);
//
// lastChangeToolStripMenuItem
//
this.lastChangeToolStripMenuItem.Name = "lastChangeToolStripMenuItem";
this.lastChangeToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
this.lastChangeToolStripMenuItem.Text = "Last Change";
this.lastChangeToolStripMenuItem.Click += new System.EventHandler(this.lastChangeToolStripMenuItem_Click);
//
// displayWatchesOnScreenToolStripMenuItem
//
@ -721,6 +725,13 @@
this.NotesColumn.Text = "Notes";
this.NotesColumn.Width = 128;
//
// originalToolStripMenuItem
//
this.originalToolStripMenuItem.Name = "originalToolStripMenuItem";
this.originalToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
this.originalToolStripMenuItem.Text = "&Original";
this.originalToolStripMenuItem.Click += new System.EventHandler(this.originalToolStripMenuItem_Click);
//
// NewRamWatch
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -814,5 +825,6 @@
private System.Windows.Forms.Label MessageLabel;
private System.Windows.Forms.Label MemDomainLabel;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem originalToolStripMenuItem;
}
}

36
BizHawk.MultiClient/tools/Watch/NewRamWatch.cs
View File

@ -863,6 +863,42 @@ namespace BizHawk.MultiClient
saveWindowPositionToolStripMenuItem.Checked = Global.Config.RamWatchSaveWindowPosition;
}
private void definePreviousValueAsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
lastChangeToolStripMenuItem.Checked = false;
previousFrameToolStripMenuItem.Checked = false;
originalToolStripMenuItem.Checked = false;
switch (Global.Config.RamWatchDefinePrevious)
{
default:
case Watch.PreviousType.LastFrame:
previousFrameToolStripMenuItem.Checked = true;
break;
case Watch.PreviousType.LastChange:
lastChangeToolStripMenuItem.Checked = true;
break;
case Watch.PreviousType.OriginalValue:
originalToolStripMenuItem.Checked = true;
break;
}
}
private void previousFrameToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.RamWatchDefinePrevious = Watch.PreviousType.LastFrame;
}
private void lastChangeToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.RamWatchDefinePrevious = Watch.PreviousType.LastChange;
}
private void originalToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.RamWatchDefinePrevious = Watch.PreviousType.OriginalValue;
}
private void displayWatchesOnScreenToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.DisplayRamWatch ^= true;

62
BizHawk.MultiClient/tools/Watch/Watch.cs
View File

@ -13,6 +13,7 @@ namespace BizHawk.MultiClient
{
public enum WatchSize { Byte = 1, Word = 2, DWord = 4, Separator = 0 };
public enum DisplayType { Separator, Signed, Unsigned, Hex, Binary, FixedPoint_12_4, FixedPoint_20_12, Float };
public enum PreviousType { OriginalValue = 0, LastSearch = 1, LastFrame = 2, LastChange = 3 };
public static string DisplayTypeToString(DisplayType type)
{
@ -415,14 +416,32 @@ namespace BizHawk.MultiClient
public string Notes { get; set; }
public void Update() //TODO: different notions of previous
public void Update()
{
switch (Global.Config.RamWatchDefinePrevious)
{
case PreviousType.LastSearch: //TODO
case PreviousType.OriginalValue:
/*Do Nothing*/
break;
case PreviousType.LastChange:
var temp = _value;
_value = GetByte();
if (_value != temp)
{
_previous = _value;
ChangeCount++;
}
break;
case PreviousType.LastFrame:
_previous = _value;
_value = GetByte();
if (_value != Previous)
{
ChangeCount++;
}
break;
}
}
}
@ -515,14 +534,33 @@ namespace BizHawk.MultiClient
public string Notes { get; set; }
public void Update() //TODO: different notions of previous
public void Update()
{
switch (Global.Config.RamWatchDefinePrevious)
{
case PreviousType.LastSearch: //TODO
case PreviousType.OriginalValue:
/*Do Nothing*/
break;
case PreviousType.LastChange:
var temp = _value;
_value = GetWord();
if (_value != temp)
{
_previous = temp;
ChangeCount++;
}
break;
case PreviousType.LastFrame:
_previous = _value;
_value = GetWord();
if (_value != Previous)
{
ChangeCount++;
}
break;
}
}
}
@ -616,14 +654,32 @@ namespace BizHawk.MultiClient
public string Notes { get; set; }
public void Update() //TODO: different notions of previous
public void Update()
{
switch (Global.Config.RamWatchDefinePrevious)
{
case PreviousType.LastSearch: //TODO
case PreviousType.OriginalValue:
/*Do Nothing*/
break;
case PreviousType.LastChange:
var temp = _value;
_value = GetDWord();
if (_value != temp)
{
_previous = _value;
ChangeCount++;
}
break;
case PreviousType.LastFrame:
_previous = _value;
_value = GetDWord();
if (_value != Previous)
{
ChangeCount++;
}
break;
}
}
}