TAStudio - input display

This commit is contained in:
adelikat 2014-07-10 02:45:56 +00:00
parent 655207d79a
commit 80d5e8a7be
3 changed files with 28 additions and 7 deletions
BizHawk.Client.Common/movie/tasproj
BizHawk.Client.EmuHawk/tools/TAStudio

View File

@ -60,5 +60,29 @@ namespace BizHawk.Client.Common
{
Markers.Remove(frame);
}
private readonly Bk2MnemonicConstants Mnemonics = new Bk2MnemonicConstants();
/// <summary>
/// Returns the mnemonic value for boolean buttons, and actual value for floats,
/// for a given frame and button
/// </summary>
public string DisplayValue(int frame, string buttonName)
{
var adapter = GetInputState(frame);
if (adapter.Type.BoolButtons.Contains(buttonName))
{
return adapter.IsPressed(buttonName) ?
Mnemonics[buttonName].ToString() :
string.Empty;
}
if (adapter.Type.FloatControls.Contains(buttonName))
{
adapter.GetFloat(buttonName);
}
return "!";
}
}
}

View File

@ -32,7 +32,6 @@ namespace BizHawk.Client.EmuHawk
try
{
var columnName = TasView.Columns[column].Name;
//var columnText = TasView.Columns[column].Text;
if (columnName == MarkerColumnName)
{
@ -44,9 +43,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
//Serialize TODO
//text = _tas[index].IsPressed(columnName) ? columnText : string.Empty;
text = string.Empty;
text = _tas.DisplayValue(index, columnName);
}
}
catch (Exception ex)

View File

@ -93,7 +93,7 @@ namespace BizHawk.Client.EmuHawk
else
{
NewTasMovie();
StartSessionFromTasMovie();
GlobalWin.MainForm.StartNewMovie(_tas, record: true);
}
EngageTastudio();
@ -279,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
private void FileSubMenu_DropDownOpened(object sender, EventArgs e)
{
ToBk2MenuItem.Enabled =
ToBk2MenuItem.Enabled =
SaveTASMenuItem.Enabled =
!string.IsNullOrWhiteSpace(_tas.Filename);
}
@ -344,7 +344,7 @@ namespace BizHawk.Client.EmuHawk
var bk2 = _tas.ToBk2();
bk2.Save();
MessageStatusLabel.Text = Path.GetFileName(bk2.Filename) + " created.";
}
private void ExitMenuItem_Click(object sender, EventArgs e)