Fixed undo&redo bugs

EX3exp · Dec 16, 2024 · 7bc94ae · 7bc94ae
1 parent 2b94e7c
commit 7bc94ae
Show file tree

Hide file tree

Showing 14 changed files with 143 additions and 19 deletions.
diff --git a/Mirivoice/Commands/AddLineBoxCommand.cs b/Mirivoice/Commands/AddLineBoxCommand.cs
@@ -1,4 +1,5 @@
-using Mirivoice.ViewModels;
+using Avalonia.Controls;
+using Mirivoice.ViewModels;
 using Mirivoice.Views;
 
 namespace Mirivoice.Commands
@@ -7,13 +8,30 @@ public class AddLineBoxCommand : ICommand
     {
         private readonly MainViewModel v;
         private int LineBoxIndexLastAdded;
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public AddLineBoxCommand(MainViewModel mainViewModel)
         {
             v = mainViewModel;
         }
 
+        UserControl lastCurrentEdit;
+        SingleLineEditorView lastSingleLineEditor;
         public void Execute(bool isRedoing)
         {
+            if (isRedoing)
+            {
+                v.CurrentEdit = lastCurrentEdit;
+                v.CurrentSingleLineEditor = lastSingleLineEditor;
+
+            }
             var lineBox = new LineBoxView(v);
             int LineNoToBeAdded = v.LineBoxCollection.Count + 1;
 
@@ -23,6 +41,8 @@ public void Execute(bool isRedoing)
             v.LineBoxCollection.Add(lineBox);
             LineBoxIndexLastAdded = v.LineBoxCollection.Count - 1;
             lineBox.ScrollToEnd();
+            lastCurrentEdit = v.CurrentEdit;
+            lastSingleLineEditor = v.CurrentSingleLineEditor;
         }
 
         public void UnExecute()
@@ -31,6 +51,9 @@ public void UnExecute()
                 return;
 
             v.LineBoxCollection.RemoveAt(LineBoxIndexLastAdded);
+
+            v.CurrentEdit = null;
+            v.CurrentSingleLineEditor = null;
             LineBoxIndexLastAdded -= 1;
 
         }

diff --git a/Mirivoice/Commands/AddLineBoxesCommand.cs b/Mirivoice/Commands/AddLineBoxesCommand.cs
@@ -18,8 +18,15 @@ public class AddLineBoxesCommand : ICommand
         private string script = string.Empty;
         int DefaultVoicerOriginal;
         int DefaultVoicerMetaOriginal;
-
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public AddLineBoxesCommand(MainViewModel mainViewModel)
         {
             v = mainViewModel;

diff --git a/Mirivoice/Commands/DelLineBoxCommand.cs b/Mirivoice/Commands/DelLineBoxCommand.cs
@@ -17,10 +17,16 @@ public class DelLineBoxCommand : ICommand
         private ItemsControl control;
         private ObservableCollection<MResult> lastResults;
 
-
-
         private SingleLineEditorView lastEditor;
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public DelLineBoxCommand(MainViewModel mainViewModel, LineBoxView l)
         {
             this.l = l;

diff --git a/Mirivoice/Commands/DuplicateLineBoxCommand.cs b/Mirivoice/Commands/DuplicateLineBoxCommand.cs
@@ -10,6 +10,15 @@ public class DuplicateLineBoxCommand : ICommand
     {
         private LineBoxView l;
         private int LineBoxIndexLastAdded;
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public DuplicateLineBoxCommand(LineBoxView l)
         {
             this.l = l;

diff --git a/Mirivoice/Commands/ICommand.cs b/Mirivoice/Commands/ICommand.cs
@@ -4,6 +4,7 @@ namespace Mirivoice.Commands
     public interface ICommand
     {
         public void Execute(bool isRedoing);
+        public bool CanUndo { get; set; }
 
         public void UnExecute();
     }

diff --git a/Mirivoice/Commands/LockLineBoxCommand.cs b/Mirivoice/Commands/LockLineBoxCommand.cs
@@ -8,7 +8,15 @@ public class LockLineBoxCommand : ICommand
     {
         // Still implementing 
         LineBoxView l;
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public LockLineBoxCommand(LineBoxView lineBoxView)
         {
             l = lineBoxView;

diff --git a/Mirivoice/Commands/MCommand.cs b/Mirivoice/Commands/MCommand.cs
@@ -6,7 +6,15 @@ namespace Mirivoice.Commands
     public class MCommand : ICommand
     {
         private readonly MReceiver _receiver;
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public MCommand (MReceiver receiver)
         {
             _receiver = receiver;

diff --git a/Mirivoice/Commands/MementoCommand.cs b/Mirivoice/Commands/MementoCommand.cs
@@ -12,7 +12,15 @@ public class MementoCommand<T> : ICommand
 
         public T changedValue;
         private bool redoBlocked;
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public MementoCommand(MOriginator<T> originator)
         {
             _originator = originator;

diff --git a/Mirivoice/Commands/SetProsodyCommand.cs b/Mirivoice/Commands/SetProsodyCommand.cs
@@ -10,32 +10,47 @@ public class SetProsodyCommand : ICommand
 
         int undoMem;
         int redoMem;
+        private bool _canUndo = true ;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
 
         bool isFirstExec = true;
+
+
         public void Execute(bool isRedoing)
         {
+
+
             if (isRedoing)
             {
                 Log.Debug($"Redo: {redoMem}");
                 v.DonotExecCommand = true;
                 v.Prosody = redoMem;
                 v.DonotExecCommand = false;
-
             }
             else
             {
+
+
                 if (!isFirstExec)
                 {
                     undoMem = v.Prosody;
                 }
+
                 isFirstExec = false;
+
                 Log.Debug($"Execute: undo: {undoMem}, redo: {redoMem}");
             }
         }
 
         public void UnExecute()
         {
-
             redoMem = v.Prosody;
             v.DonotExecCommand = true;
             v.Prosody = undoMem;

diff --git a/Mirivoice/Commands/SwapLineBoxCommand.cs b/Mirivoice/Commands/SwapLineBoxCommand.cs
@@ -10,7 +10,15 @@ public class SwapLineBoxCommand: ICommand
         private int i1;
         private int i2;
 
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         public SwapLineBoxCommand(MainViewModel mainViewModel)
         {
             v = mainViewModel;

diff --git a/Mirivoice/Commands/TextBoxEditCommand.cs b/Mirivoice/Commands/TextBoxEditCommand.cs
@@ -10,7 +10,15 @@ public class TextBoxEditCommand : ICommand
 
         Memento<string> undoMem = new Memento<string>();
         Memento<string> redoMem = new Memento<string>();
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
 
         bool isFirstExec = true;
         public void Execute(bool isRedoing)

diff --git a/Mirivoice/Commands/VITS2SetExpCommand.cs b/Mirivoice/Commands/VITS2SetExpCommand.cs
@@ -16,7 +16,15 @@ public class VITS2SetExpCommand : ICommand
     {
         int undoMem;
         int redoMem;
-
+        private bool _canUndo = true;
+        public bool CanUndo
+        {
+            get => _canUndo;
+            set
+            {
+                _canUndo = value;
+            }
+        }
         readonly ExpressionEditViewModelVITS2 viewModel;
         readonly ExpVITS2 mode;
         public VITS2SetExpCommand(ExpressionEditViewModelVITS2 viewModel, ExpVITS2 mode)

diff --git a/Mirivoice/Mirivoice.Core/Format/MResult.cs b/Mirivoice/Mirivoice.Core/Format/MResult.cs
@@ -112,19 +112,23 @@ public int Prosody
                 {
                     return;
                 }
+
+                setProsodyCommand = new SetProsodyCommand(this);
+                this.RaiseAndSetIfChanged(ref _prosody, value);
                 if (IsFirstExec)
                 {
-
+                    setProsodyCommand.CanUndo = false;
                     IsFirstExec = false;
                 }
 
-                setProsodyCommand = new SetProsodyCommand(this);
-                this.RaiseAndSetIfChanged(ref _prosody, value);
                 if (!DonotExecCommand)
-                    
+                {
                     MainManager.Instance.cmd.ExecuteCommand(setProsodyCommand);
+                }
+
+
 
-                
+
                 OnPropertyChanged(nameof(Prosody));
 
                 if (l is not null)
@@ -138,6 +142,7 @@ public int Prosody
         public bool IsEditable { get; set; } = false;
 
         private readonly LineBoxView l;
+
         public MResult(string word, string phoneme, bool isEditable, ProsodyType prosodyType, LineBoxView l=null): base(phoneme, false)
         {
             this.Word = word;

diff --git a/Mirivoice/Mirivoice.Core/Managers/CommandManager.cs b/Mirivoice/Mirivoice.Core/Managers/CommandManager.cs
@@ -77,9 +77,19 @@ public void ExecuteCommand(ICommand command)
         public void Undo()
         {
             //Log.Debug("======== Undo ========");
+
+
             if (_undoStack.Count > 0)
             {
                 var command = _undoStack.Pop();
+                while (!command.CanUndo)
+                {
+                    command = _undoStack.Pop(); // skip this undo and jump to previous one
+                    if (_undoStack.Count == 0)
+                    {
+                        break;
+                    }
+                }
                 command.UnExecute();
                 _redoStack.Push(command);
                 IsNeedSave = true;