From 464cde5efa508d2315f271f160e7548bf6f4b0bf Mon Sep 17 00:00:00 2001 From: kylelyk Date: Thu, 21 Aug 2014 22:53:03 +0000 Subject: [PATCH] Fixed crash on copy rows in TAStudio. Replaced spaces with tabs in previous commits. --- .../movie/tasproj/TasMovie.Editing.cs | 10 +- .../movie/tasproj/TasMovieMarker.cs | 36 +++--- .../tools/TAStudio/TAStudio.ListView.cs | 8 +- .../tools/TAStudio/TAStudio.cs | 103 +++++++++--------- 4 files changed, 79 insertions(+), 78 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs index b08f3512d3..6124312189 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs @@ -25,10 +25,10 @@ namespace BizHawk.Client.Common StateManager.Capture(); } - /// - /// Truncate all frames including starting frame to end of movie. - /// - /// First frame to be truncated. + /// + /// Truncate all frames including starting frame to end of movie. + /// + /// First frame to be truncated. public override void Truncate(int frame) { base.Truncate(frame); @@ -46,7 +46,7 @@ namespace BizHawk.Client.Common } //Taseditor deletes markers that are in truncated portion of movie. - Markers.TruncateAt(frame); + Markers.TruncateAt(frame); } public override void PokeFrame(int frame, IController source) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs index 8e068d265b..aadb839fe1 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs @@ -72,7 +72,7 @@ namespace BizHawk.Client.Common } } - //Add functions as needed + //Add functions as needed public class TasMovieMarkerList : List { private readonly TasMovie _movie; @@ -129,23 +129,23 @@ namespace BizHawk.Client.Common this.Sort((m1, m2) => m1.Frame.CompareTo(m2.Frame)); } - /// - /// Deletes all markers at or below the given start frame. - /// - /// The first frame for markers to be deleted. - /// Number of markers deleted. - public int TruncateAt(int startFrame) - { - int deletedCount = 0; - for (int i = Count - 1; i > -1; i--) - { - if(this[i].Frame >= startFrame){ - RemoveAt(i); - deletedCount++; - } - } - return deletedCount; - } + /// + /// Deletes all markers at or below the given start frame. + /// + /// The first frame for markers to be deleted. + /// Number of markers deleted. + public int TruncateAt(int startFrame) + { + int deletedCount = 0; + for (int i = Count - 1; i > -1; i--) + { + if(this[i].Frame >= startFrame){ + RemoveAt(i); + deletedCount++; + } + } + return deletedCount; + } public TasMovieMarker Previous(int currentFrame) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 53d8ad9194..049c9e41f3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -326,10 +326,10 @@ namespace BizHawk.Client.EmuHawk SetSplicer(); } - private void TasView_VirtualItemsSelectionRangeChanged(object sender, ListViewVirtualItemsSelectionRangeChangedEventArgs e) - { - SetSplicer(); - } + private void TasView_VirtualItemsSelectionRangeChanged(object sender, ListViewVirtualItemsSelectionRangeChangedEventArgs e) + { + SetSplicer(); + } private void TasView_KeyDown(object sender, KeyEventArgs e) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 578fe581fa..c6b4e7fc7e 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -583,6 +583,7 @@ namespace BizHawk.Client.EmuHawk var input = _currentTasMovie.GetInputState(list[i]); _tasClipboard.Add(new TasClipboardEntry(list[i], input)); var lg = _currentTasMovie.LogGeneratorInstance(); + lg.SetSource(input); sb.AppendLine(lg.GenerateLogEntry()); } @@ -904,62 +905,62 @@ namespace BizHawk.Client.EmuHawk base.OnShown(e); } - private void Tastudio_Load(object sender, EventArgs e) - { - // Start Scenario 1: A regular movie is active - if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie)) - { - var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); - if (result == DialogResult.OK) - { - ConvertCurrentMovieToTasproj(); - } - else - { - Close(); - return; - } - } + private void Tastudio_Load(object sender, EventArgs e) + { + // Start Scenario 1: A regular movie is active + if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie)) + { + var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); + if (result == DialogResult.OK) + { + ConvertCurrentMovieToTasproj(); + } + else + { + Close(); + return; + } + } - // Start Scenario 2: A tasproj is already active - else if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie) - { - // Nothing to do - } + // Start Scenario 2: A tasproj is already active + else if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie) + { + // Nothing to do + } - // Start Scenario 3: No movie, but user wants to autload their last project - else if (Global.Config.AutoloadTAStudioProject && !string.IsNullOrEmpty(Global.Config.RecentTas.MostRecent)) - { - LoadProject(Global.Config.RecentTas.MostRecent); - } + // Start Scenario 3: No movie, but user wants to autload their last project + else if (Global.Config.AutoloadTAStudioProject && !string.IsNullOrEmpty(Global.Config.RecentTas.MostRecent)) + { + LoadProject(Global.Config.RecentTas.MostRecent); + } - // Start Scenario 4: No movie, default behavior of engaging tastudio with a new default project - else - { - NewTasMovie(); - GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true); - _currentTasMovie.CaptureCurrentState(); - } + // Start Scenario 4: No movie, default behavior of engaging tastudio with a new default project + else + { + NewTasMovie(); + GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true); + _currentTasMovie.CaptureCurrentState(); + } - EngageTastudio(); - SetUpColumns(); - LoadConfigSettings(); - RefreshDialog(); - } + EngageTastudio(); + SetUpColumns(); + LoadConfigSettings(); + RefreshDialog(); + } - private void Tastudio_Closing(object sender, FormClosingEventArgs e) - { - if (AskSaveChanges()) - { - SaveConfigSettings(); - GlobalWin.MainForm.StopMovie(saveChanges: false); - DisengageTastudio(); - } - else - { - e.Cancel = true; - } - } + private void Tastudio_Closing(object sender, FormClosingEventArgs e) + { + if (AskSaveChanges()) + { + SaveConfigSettings(); + GlobalWin.MainForm.StopMovie(saveChanges: false); + DisengageTastudio(); + } + else + { + e.Cancel = true; + } + } #endregion