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

some fixes to last commit

This commit is contained in:
adelikat 2015-01-27 02:53:57 +00:00
parent bb2cd1b476
commit f547dfbb21
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Client.Common/tools/Watch.cs
View File

@ -38,7 +38,7 @@ namespace BizHawk.Client.Common
var type = Watch.DisplayTypeFromChar(parts[2][0]);
var bigEndian = parts[3] == "0" ? false : true;
var domain = domains[parts[4]];
var notes = parts[5];
var notes = parts[5].Trim(new[] { '\r', '\n' });
return Watch.GenerateWatch(
domain,
@ -55,18 +55,19 @@ namespace BizHawk.Client.Common
}
}
public static string ToString(Watch watch, int numdigits)
public static string ToString(Watch watch, MemoryDomain domain)
{
var numDigits = (domain.Size - 1).NumHexDigits();
var sb = new StringBuilder();
sb
.Append((watch.Address ?? 0).ToHexString(numdigits)).Append('\t')
.Append((watch.Address ?? 0).ToHexString(numDigits)).Append('\t')
.Append(watch.SizeAsChar).Append('\t')
.Append(watch.TypeAsChar).Append('\t')
.Append(watch.BigEndian ? '1' : '0').Append('\t')
.Append(watch.DomainName).Append('\t')
.Append(watch.Notes)
.AppendLine();
.Append(watch.Notes.Trim(new[] { '\r', '\n' }));
return sb.ToString();
}

15
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using BizHawk.Common.NumberExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.IEmulatorExtensions;
@ -343,20 +344,12 @@ namespace BizHawk.Client.EmuHawk
private void CopyWatchesToClipBoard()
{
var indexes = SelectedIndices.ToList();
if (indexes.Any())
if (SelectedItems.Any())
{
var sb = new StringBuilder();
foreach (var index in indexes)
foreach (var watch in SelectedItems)
{
foreach (ColumnHeader column in WatchListView.Columns)
{
sb.Append(GetColumnValue(column.Name, index)).Append('\t');
}
sb.Remove(sb.Length - 1, 1);
sb.AppendLine();
sb.AppendLine(Watch.ToString(watch, _watches.Domain));
}
if (sb.Length > 0)