From 4625bdce0fbf2379452e7de98d197abf68bf07ea Mon Sep 17 00:00:00 2001 From: feos Date: Sun, 4 Oct 2015 13:39:14 +0300 Subject: [PATCH] tastudio: a bunch of fixes. - update branches per RefreshDialog() - clear selection per right click if it's beyond movie length - fix crash when load branch is called with null selection (can't stably reproduce, but it happens) - assign guid to branches from the right place. this required setting some statics, don't know if it was right, but it works. --- BizHawk.Client.Common/movie/tasproj/TasBranch.cs | 8 ++++++++ BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 10 ++-------- .../movie/tasproj/TasStateManager.cs | 2 +- .../tools/TAStudio/BookmarksBranchesBox.cs | 7 +++---- .../tools/TAStudio/TAStudio.ListView.cs | 14 ++++++++++++-- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 3 +++ 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs index 47e416a9e4..fcb03c296b 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs @@ -9,6 +9,14 @@ namespace BizHawk.Client.Common { public class TasBranch { + public TasBranch() + { + do + { + UniqueIdentifier = Guid.NewGuid(); + } while (TasMovie.BranchIndexByHash(UniqueIdentifier.GetHashCode()) != -1); + } + public int Frame { get; set; } public byte[] CoreData { get; set; } public List InputLog { get; set; } diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 960723ccd6..b50eec82e2 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -22,7 +22,7 @@ namespace BizHawk.Client.Common private readonly Dictionary InputStateCache = new Dictionary(); public readonly List VerificationLog = new List(); // For movies that do not begin with power-on, this is the input required to get into the initial state - private readonly TasBranchCollection Branches = new TasBranchCollection(); + public static readonly TasBranchCollection Branches = new TasBranchCollection(); private BackgroundWorker _progressReportWorker = null; public void NewBGWorker(BackgroundWorker newWorker) @@ -85,7 +85,7 @@ namespace BizHawk.Client.Common public TasBranch GetBranch(int index) { return Branches[index]; } public int BranchHashByIndex(int index) { return Branches[index].UniqueIdentifier.GetHashCode(); } - public int BranchIndexByHash(int hash) + public static int BranchIndexByHash(int hash) { TasBranch branch = Branches.Where(b => b.UniqueIdentifier.GetHashCode() == hash).SingleOrDefault(); if (branch == null) @@ -524,12 +524,6 @@ namespace BizHawk.Client.Common public void AddBranch(TasBranch branch) { - // before adding, make sure guid hash is unique too, we can't afford branch id clashes - do - { - branch.UniqueIdentifier = Guid.NewGuid(); - } while (BranchIndexByHash(branch.UniqueIdentifier.GetHashCode()) != -1); - Branches.Add(branch); TasStateManager.AddBranch(); Changes = true; diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs index e40785fc73..d0a804b4cf 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs @@ -710,7 +710,7 @@ namespace BizHawk.Client.Common SortedList stateList = BranchStates[frame]; for (int i = 0; i < _movie.BranchCount; i++) { - if (i == _movie.BranchIndexByHash(branchHash)) + if (i == TasMovie.BranchIndexByHash(branchHash)) continue; if (stateList != null && stateList.ContainsKey(i) && stateList[i] == stateToMatch) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 98394e1793..ada9c4147a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -141,12 +141,11 @@ namespace BizHawk.Client.EmuHawk private void LoadSelectedBranch() { - int index = BranchView.SelectedRows.First(); - //if (CurrentBranch == index) // if the current branch was edited, we should allow loading it. some day there might be a proper check - // return; - if (SelectedBranch != null) { + int index = BranchView.SelectedRows.First(); + //if (CurrentBranch == index) // if the current branch was edited, we should allow loading it. some day there might be a proper check + // return; CurrentBranch = index; LoadBranch(SelectedBranch); BranchView.Refresh(); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 81118050ef..81d249fda8 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -271,7 +271,6 @@ namespace BizHawk.Client.EmuHawk { CurrentTasMovie.Markers.Add(TasView.LastSelectedIndex.Value, ""); RefreshDialog(); - } else if (columnName != CursorColumnName) // TODO: what about float? { @@ -541,7 +540,18 @@ namespace BizHawk.Client.EmuHawk { if (e.Button == MouseButtons.Right && !TasView.IsPointingAtColumnHeader && !_supressContextMenu) { - RightClickMenu.Show(TasView, e.X, e.Y); + if (Global.MovieSession.Movie.FrameCount < TasView.SelectedRows.Max()) + { + // trying to be smart here + // if a loaded branch log is shorter than selection, keep selection until you attempt to call context menu + // you might need it when you load again the branch where this frame exists + TasView.DeselectAll(); + RefreshTasView(); + } + else + { + RightClickMenu.Show(TasView, e.X, e.Y); + } } else if (e.Button == MouseButtons.Left) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 85ced34cad..2995d1cc8e 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -594,6 +594,9 @@ namespace BizHawk.Client.EmuHawk if (MarkerControl != null) MarkerControl.UpdateValues(); + if (BookMarkControl != null) + BookMarkControl.UpdateValues(); + if (undoForm != null && !undoForm.IsDisposed) undoForm.UpdateValues(); }