Undo multiple actions at once in history

Author: ernstaii

DsmSuite.DsmViewer.Application/Actions/Management/ActionManager.cs

@@ -88,7 +88,7 @@ public void Undo()
                     _redoActionStack.Push(action);
                     action.Undo();
                     ActionPerformed?.Invoke(this, EventArgs.Empty);
-                    Logger.LogInfo("Undo :{action.Description}");
+                    Logger.LogInfo($"Undo :{action.Description}");
                 }
             }
         }
@@ -118,11 +118,37 @@ public void Redo()
                     _undoActionStack.Push(action);
                     action.Do();
                     ActionPerformed?.Invoke(this, EventArgs.Empty);
-                    Logger.LogInfo("Redo :{action.Description}");
+                    Logger.LogInfo($"Redo :{action.Description}");
                 }
             }
         }
 
+        /// <summary>
+        /// Undo/redo actions up to an including <c>action</c>.
+        /// </summary>
+        /// <param name="action"></param>
+        public void Goto(IAction action)
+        {
+            if (_undoActionStack.Contains(action))
+            {
+                do
+                {
+                    Undo();
+                }
+                while (_redoActionStack.Peek() != action);
+            }
+            else if (_redoActionStack.Contains(action))
+            {
+                do
+                {
+                    Redo();
+                }
+                while (_undoActionStack.Peek() != action);
+            }
+            else
+                Logger.LogError($"Action {action} not in ActionManager");
+        }
+
         public void Clear()
         {
             _undoActionStack.Clear();

DsmSuite.DsmViewer.Application/ApplicationClasses.cd

@@ -22,7 +22,7 @@
       </MemberNameLabel>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>ApE2RAoAJoyABAiDABIbREkhoAhopYCERlAgBIUAQIA=</HashCode>
+      <HashCode>ApE2RAoAJoyABAiDABIbREkhoIhopYCERlAgBIUAQIA=</HashCode>
       <FileName>Core\DsmApplication.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -38,7 +38,7 @@
   <Class Name="DsmSuite.DsmViewer.Application.Actions.Management.ActionManager" Collapsed="true">
     <Position X="0.75" Y="2.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAIQAAQABACABASAAIAAEAIBAAAAAAAAECACAAFAAAA=</HashCode>
+      <HashCode>AAIQAAQABACABASAAIAAEAIBAAAAAAAAECACAAFAAIA=</HashCode>
       <FileName>Actions\Management\ActionManager.cs</FileName>
     </TypeIdentifier>
     <Lollipop Orientation="Right" Position="0.2" Collapsed="true" />

DsmSuite.DsmViewer.Application/Core/DsmApplication.cs

@@ -65,6 +65,10 @@ public void Undo()
         {
             _actionManager.Undo();
         }
+        public void GotoAction(IAction action)
+        {
+            _actionManager.Goto(action);
+        }
 
         public bool CanRedo()
         {

DsmSuite.DsmViewer.Application/Interfaces/IDsmApplication.cs

@@ -20,6 +20,7 @@ public interface IDsmApplication
         bool CanUndo();
         string GetUndoActionDescription();
         void Undo();
+        void GotoAction(IAction action);
         bool CanRedo();
         string GetRedoActionDescription();
         void Redo();

DsmSuite.DsmViewer.View/Lists/ActionListView.xaml

@@ -15,21 +15,24 @@
             <RowDefinition Height="{StaticResource BottomRowHeight}" />
         </Grid.RowDefinitions>
         <TextBlock Grid.Row="0" Grid.Column="0" Style="{StaticResource DialogTitle}" Text="{Binding Title}" Margin="5"/>
-        <ListView Grid.Row="1" ItemsSource="{Binding Actions}" Style="{StaticResource DialogListView}">
+        <ListView Name="actionList" Grid.Row="1" SelectionMode="Single" ItemsSource="{Binding Actions}" Style="{StaticResource DialogListView}">
             <ListView.View>
                 <GridView>
                     <GridViewColumn Header="Index" Width="20" DisplayMemberBinding="{Binding Index}" />
-                    <GridViewColumn Header="Action" Width="200" DisplayMemberBinding="{Binding Action}" />
+                    <GridViewColumn Header="Action" Width="200" DisplayMemberBinding="{Binding Title}" />
                     <GridViewColumn Header="Details" Width="600" DisplayMemberBinding="{Binding Details}" />
                 </GridView>
             </ListView.View>
         </ListView>
         <DockPanel Grid.Row="2">
-            <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" HorizontalAlignment="Left">
-                <Button Style="{StaticResource DialogButton}" Content="Clear" ToolTip="Clear action list" Command="{Binding ClearCommand}"/>
+            <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" HorizontalAlignment="Left" >
+                <Button Style="{StaticResource DialogButton}" Content="Clear all" ToolTip="Clear action list" Command="{Binding ClearCommand}"/>
+                <Button Style="{StaticResource DialogButton}" Content="Copy all" ToolTip="Copy action list to clipboard" Command="{Binding CopyToClipboardCommand}"/>
             </StackPanel>
-            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Style="{StaticResource DialogButton}" Content="Copy" ToolTip="Copy action list to clipboard" Command="{Binding CopyToClipboardCommand}"/>
+            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" HorizontalAlignment="Right" >
+                <Button Style="{StaticResource DialogButton}" Content="Goto" ToolTip="Undo up to the selected action"
+                        Command="{Binding GotoCommand}"
+                        CommandParameter="{Binding ElementName=actionList,Path=SelectedItem}"/>
             </StackPanel>
         </DockPanel>
     </Grid>

DsmSuite.DsmViewer.ViewModel/Lists/ActionListItemViewModel.cs

@@ -5,15 +5,17 @@ namespace DsmSuite.DsmViewer.ViewModel.Lists
 {
     public class ActionListItemViewModel : ViewModelBase
     {
+        private IAction _action;
+
         public ActionListItemViewModel(int index, IAction action)
         {
             Index = index;
-            Action = action.Title;
-            Details = action.Description;
+            _action = action;
         }
 
         public int Index { get; }
-        public string Action { get; }
-        public string Details { get; }
+        public IAction Action => _action;
+        public string Title => _action.Title;
+        public string Details => _action.Description;
     }
 }

DsmSuite.DsmViewer.ViewModel/Lists/ActionListViewModel.cs

@@ -4,6 +4,7 @@
 using System.Windows.Input;
 using System.Windows;
 using System.Text;
+using System;
 
 namespace DsmSuite.DsmViewer.ViewModel.Lists
 {
@@ -23,6 +24,7 @@ public ActionListViewModel(IDsmApplication application)
 
             CopyToClipboardCommand =  new RelayCommand<object>(CopyToClipboardExecute);
             ClearCommand = new RelayCommand<object>(ClearExecute);
+            GotoCommand = new RelayCommand<object>(GotoExecute, GotoCanExecute);
         }
 
         private void OnActionPerformed(object sender, System.EventArgs e)
@@ -41,17 +43,28 @@ public IEnumerable<ActionListItemViewModel> Actions
 
         public ICommand CopyToClipboardCommand { get; }
         public ICommand ClearCommand { get; }
+        public ICommand GotoCommand { get; }
 
         private void CopyToClipboardExecute(object parameter)
         {
             StringBuilder builder = new StringBuilder();
             foreach(ActionListItemViewModel viewModel in Actions)
             {
-                builder.AppendLine($"{viewModel.Index, -5}, {viewModel.Action, -30}, {viewModel.Details}");
+                builder.AppendLine($"{viewModel.Index, -5}, {viewModel.Title, -30}, {viewModel.Details}");
             }
             Clipboard.SetText(builder.ToString());
         }
 
+        private void GotoExecute(object parameter)
+        {
+            _application.GotoAction(((ActionListItemViewModel)parameter).Action);
+        }
+
+        private bool GotoCanExecute(object parameter)
+        {
+            return parameter != null;
+        }
+
         private void ClearExecute(object parameter)
         {
             _application.ClearActions();