From b527b91252d53210f17db2a5b1a521de514f71d9 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 11 Jun 2011 22:59:21 +0000 Subject: [PATCH] TAStudio - show input log of movie, very buggy atm --- BizHawk.MultiClient/MainForm.cs | 1 + .../tools/TAStudio.Designer.cs | 9 ++++- BizHawk.MultiClient/tools/TAStudio.cs | 18 +++++++++- BizHawk.MultiClient/tools/TAStudio.resx | 36 +++++++++---------- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 03789b9bc3..b918fbd08d 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1252,6 +1252,7 @@ namespace BizHawk.MultiClient HexEditor1.UpdateValues(); NESNameTableViewer1.UpdateValues(); NESPPU1.UpdateValues(); + TAStudio1.UpdateValues(); if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD) UserMovie.GetMnemonic(); diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.MultiClient/tools/TAStudio.Designer.cs index 9f8d2b3354..348fa7783f 100644 --- a/BizHawk.MultiClient/tools/TAStudio.Designer.cs +++ b/BizHawk.MultiClient/tools/TAStudio.Designer.cs @@ -62,6 +62,7 @@ this.ReadOnlyCheckBox = new System.Windows.Forms.CheckBox(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.Frame = new System.Windows.Forms.ColumnHeader(); this.menuStrip1.SuspendLayout(); this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); this.toolStripContainer1.SuspendLayout(); @@ -215,10 +216,11 @@ // TASView // this.TASView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.Frame, this.Log}); this.TASView.GridLines = true; this.TASView.ItemCount = 0; - this.TASView.Location = new System.Drawing.Point(12, 38); + this.TASView.Location = new System.Drawing.Point(22, 38); this.TASView.Name = "TASView"; this.TASView.selectedItem = -1; this.TASView.Size = new System.Drawing.Size(399, 424); @@ -345,6 +347,10 @@ this.toolStripButton1.ToolTipText = "Rewind to Beginning"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // Frame + // + this.Frame.Text = "Frame"; + // // TAStudio // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -408,5 +414,6 @@ private System.Windows.Forms.CheckBox ReadOnlyCheckBox; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ColumnHeader Frame; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs index adbe14360a..90c1234529 100644 --- a/BizHawk.MultiClient/tools/TAStudio.cs +++ b/BizHawk.MultiClient/tools/TAStudio.cs @@ -23,20 +23,36 @@ namespace BizHawk.MultiClient TASView.VirtualMode = true; } + public void UpdateValues() + { + DisplayList(); + } + private void TASView_QueryItemBkColor(int index, int column, ref Color color) { - + if (index == Global.Emulator.Frame) + color = Color.LightGreen; } private void TASView_QueryItemText(int index, int column, out string text) { text = ""; + if (column == 0) + text = String.Format("{0:#,##0}", index); + if (column == 1) + text = Global.MainForm.UserMovie.GetInputFrame(index); + } + + private void DisplayList() + { + TASView.ItemCount = Global.MainForm.UserMovie.GetMovieLength(); } private void TAStudio_Load(object sender, EventArgs e) { LoadConfigSettings(); ReadOnlyCheckBox.Checked = Global.MainForm.ReadOnly; + DisplayList(); } private void LoadConfigSettings() diff --git a/BizHawk.MultiClient/tools/TAStudio.resx b/BizHawk.MultiClient/tools/TAStudio.resx index 0389c42511..e5b7b5992d 100644 --- a/BizHawk.MultiClient/tools/TAStudio.resx +++ b/BizHawk.MultiClient/tools/TAStudio.resx @@ -123,22 +123,10 @@ 126, 17 + + 225, 17 + - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL - U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI - VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ - QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 - /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 - cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j - 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR - dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb - NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE - s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -154,15 +142,27 @@ s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC - - 225, 17 - 324, 17 324, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL + U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI + VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ + QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 + /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 + cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j + 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR + dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb + NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE + s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC + + AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA