[Cherry-pick] [DYN-8528] Can't undo changes to curve mapper (#16229)

Co-authored-by: Ivo Petrov <[email protected]>

Author: github-actions[bot]

src/Libraries/CoreNodeModels/CurveMapperNodeModel.cs

@@ -78,9 +78,10 @@ public class CurveMapperNodeModel : NodeModel
         private double dynamicCanvasSize = defaultCanvasSize;
         private bool isLocked;
         private bool isResizing;
+        private bool isRestoringUndo;
 
         #region Curves & Point Data
-        
+
         /// <summary> Point data for the 1st control point of the linear curve. </summary>
         [JsonProperty]
         public ControlPointData LinearCurveControlPointData1 { get; private set; }
@@ -334,6 +335,7 @@ public GraphTypes SelectedGraphType
                 selectedGraphType = value;
                 GenerateRenderValues();
                 RaisePropertyChanged(nameof(SelectedGraphType));
+                RaisePropertyChanged(nameof(SelectedGraphTypeDescription));
             }
         }
 
@@ -367,10 +369,25 @@ public bool IsResizing
             }
         }
 
+        /// <summary> Indicates whether the node is currently restoring its state during undo. </summary>
+        [JsonIgnore]
+        public bool IsRestoringUndo
+        {
+            get => isRestoringUndo;
+            private set
+            {
+                if (isRestoringUndo != value)
+                {
+                    isRestoringUndo = value;
+                }
+            }
+        }
+
         /// <summary> Indicates that this node supports resizing via UI. </summary>
         [JsonIgnore]
         public override bool IsResizable => true;
 
+
         #region Constructors
 
         public CurveMapperNodeModel()
@@ -980,22 +997,47 @@ protected override void SerializeCore(XmlElement element, SaveContext context)
                     SavePointData(element, "Gaussian4", GaussianCurveControlPointData4);
                     break;
             }
-        }        
+        }
 
         protected override void DeserializeCore(XmlElement element, SaveContext context)
         {
             base.DeserializeCore(element, context);
 
+            // Suppress undo-related reactions
+            IsRestoringUndo = true;
+
             // Restore the selected graph type
             var typeAttr = element.GetAttribute(nameof(SelectedGraphType));
             if (!string.IsNullOrEmpty(typeAttr) && Enum.TryParse(typeAttr, out GraphTypes parsedType))
-                SelectedGraphType = parsedType;
+            {
+                if (SelectedGraphType != parsedType)
+                {
+                    SelectedGraphType = parsedType;
+                    RaisePropertyChanged(nameof(SelectedGraphType));
+                }
+            }
 
+            // Restore locked state
             if (bool.TryParse(element.GetAttribute(nameof(IsLocked)), out var locked))
-                IsLocked = locked;
+            {
+                if (IsLocked != locked)
+                {
+                    IsLocked = locked;
+                    RaisePropertyChanged(nameof(IsLocked));
+                }
+            }
 
+            // Restore canvas size
             if (double.TryParse(element.GetAttribute(nameof(DynamicCanvasSize)), out var canvasSize))
-                DynamicCanvasSize = canvasSize;
+            {
+                if (DynamicCanvasSize != canvasSize)
+                {
+                    DynamicCanvasSize = canvasSize;
+                    RaisePropertyChanged(nameof(DynamicCanvasSize));
+                }
+            }
+
+            IsRestoringUndo = false;
 
             switch (SelectedGraphType)
             {

src/Libraries/CoreNodeModelsWpf/CurveMapper/CurveMapperControl.xaml

@@ -39,9 +39,7 @@
     <Grid>
         <Grid x:Name="MainGrid"
           MinWidth="325"
-          MinHeight="340"
-          Width="{Binding MainGridWidth, Mode=TwoWay}"
-          Height="{Binding MainGridHeight, Mode=TwoWay}">
+          MinHeight="340">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="35" />
@@ -156,7 +154,8 @@
                           Margin="10,0,0,0"
                           VerticalAlignment="Center"
                           ItemsSource="{Binding GraphTypesList}"
-                          SelectedItem="{Binding SelectedGraphTypeDescription, Mode=TwoWay}">
+                          SelectedItem="{Binding SelectedGraphTypeDescription, Mode=TwoWay}"
+                          DropDownOpened="GraphTypeComboBox_DropDownOpened">
                     <ComboBox.Style>
                         <Style BasedOn="{StaticResource RefreshComboBox}" TargetType="ComboBox">
                             <Style.Triggers>

src/Libraries/CoreNodeModelsWpf/CurveMapper/CurveMapperControl.xaml.cs

@@ -105,29 +105,28 @@ public CurveMapperControl(CurveMapperNodeModel model, double canvasSize, NodeVie
             Width = canvasSize + controlLabelsWidth;
             Height = canvasSize + controlLabelsHeight;
 
-
             model.PropertyChanged += NodeModel_PropertyChanged;
-            this.Unloaded += Unload;
+            resizeThumb.DragStarted += ResizeThumb_DragStarted;
+            Unloaded += Unload;
 
             DrawGrid();
 
             // Dictionary to map UI control points to their corresponding data
-            var controlPointsMap = BuildControlPointsDictionary();
-            RecreateControlPoints(controlPointsMap);
-
-            RenderCurve();
-
+            UpdateUIFromModel();
             ToggleControlPointsLock();
             UpdateLockButton();
         }
 
-        private void OnControlPointDragCompleted()
+        private void RecordUndo()
         {
-            var workspace = nodeViewModel?.WorkspaceViewModel?.Model;
-            if (workspace != null)
-            {
-                WorkspaceModel.RecordModelForModification(curveMapperNodeModel, workspace.UndoRecorder);
-            }
+            var undoRecorder = nodeViewModel.WorkspaceViewModel.Model.UndoRecorder;
+            WorkspaceModel.RecordModelForModification(curveMapperNodeModel, undoRecorder);
+        }
+
+        private void OnControlPointDragStarted()
+        {
+            if (!curveMapperNodeModel.IsLocked)
+                RecordUndo();
         }
 
         private void RenderCurve()
@@ -201,23 +200,30 @@ private void ResetButton_Click(object sender, RoutedEventArgs e)
         {
             if (curveMapperNodeModel.IsLocked) return;
 
+            RecordUndo();
+
             curveMapperNodeModel.ResetControlPointData();
 
-            // Dictionary to map UI control points to their corresponding data
-            var controlPointsResetMap = BuildControlPointsDictionary();
-            RecreateControlPoints(controlPointsResetMap);
-            RenderCurve();
+            UpdateUIFromModel();
         }
 
         private void LockButton_Click(object sender, RoutedEventArgs e)
         {
-            var button = sender as Button;
-            if (button != null)
-            {
-                curveMapperNodeModel.IsLocked = !curveMapperNodeModel.IsLocked;
-                UpdateLockButton();
-                ToggleControlPointsLock();
-            }
+            RecordUndo();
+
+            curveMapperNodeModel.IsLocked = !curveMapperNodeModel.IsLocked;
+            UpdateLockButton();
+            ToggleControlPointsLock();
+        }
+
+        private void GraphTypeComboBox_DropDownOpened(object sender, EventArgs e)
+        {
+            RecordUndo();
+        }
+
+        private void ResizeThumb_DragStarted(object sender, DragStartedEventArgs e)
+        {
+            RecordUndo();
         }
 
         private void NodeModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -245,14 +251,24 @@ private void NodeModel_PropertyChanged(object sender, PropertyChangedEventArgs e
                 }
 
                 RenderCurve();
+
+                if (curveMapperNodeModel.IsRestoringUndo)
+                {
+                    double canvasSize = curveMapperNodeModel.DynamicCanvasSize;
+                    Width = canvasSize + controlLabelsWidth;
+                    Height = canvasSize + controlLabelsHeight;
+                    DrawGrid();
+                }
             }
 
             if (e.PropertyName == nameof(curveMapperNodeModel.SelectedGraphType))
             {
-                var controlPointsMap = BuildControlPointsDictionary();
-                RecreateControlPoints(controlPointsMap);
-                RenderCurve();
-                ToggleControlPointsLock();
+                UpdateUIFromModel();
+
+                if (!curveMapperNodeModel.IsRestoringUndo)
+                {
+                    ToggleControlPointsLock();
+                }
             }
 
             if (e.PropertyName == nameof(curveMapperNodeModel.RenderValuesX) ||
@@ -272,9 +288,13 @@ private void NodeModel_PropertyChanged(object sender, PropertyChangedEventArgs e
 
             if (e.PropertyName == "ControlPointsDeserialized")
             {
-                var controlPointsMap = BuildControlPointsDictionary();
-                RecreateControlPoints(controlPointsMap);
-                RenderCurve();
+                UpdateUIFromModel();
+            }
+
+            if (e.PropertyName == nameof(curveMapperNodeModel.IsLocked))
+            {
+                UpdateLockButton();
+                ToggleControlPointsLock();
             }
         }
 
@@ -320,7 +340,7 @@ private void RecreateControlPoints(Dictionary<GraphTypes, (List<string> pointNam
                         isOrthogonal,
                         isVertical);
 
-                    newPoint.DragCompleted += (s, e) => OnControlPointDragCompleted();
+                    newPoint.DragStarted += (s, e) => OnControlPointDragStarted();
 
                     pointField?.SetValue(this, newPoint);
                     GraphCanvas.Children.Add(newPoint);
@@ -339,6 +359,13 @@ private void RecreateControlPoints(Dictionary<GraphTypes, (List<string> pointNam
             }
         }
 
+        private void UpdateUIFromModel()
+        {
+            var controlPointsMap = BuildControlPointsDictionary();
+            RecreateControlPoints(controlPointsMap);
+            RenderCurve();
+        }
+
         private void UpdateControlPointPosition(UIElement controlPoint, ControlPointData dataPoint, double newSize)
         {
             if (controlPoint != null && dataPoint != null)