Skip to content

[DYN-8528] Can't undo changes to curve mapper #16173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonstratton merged 2 commits into from
May 12, 2025
Merged

[DYN-8528] Can't undo changes to curve mapper #16173

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a539011
undo enabled
ivaylo-matov Apr 28, 2025
39e20e7
Merge remote-tracking branch 'upstream/master' into DYN-8528-Can't-un…
ivaylo-matov May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 189 additions & 1 deletion src/Libraries/CoreNodeModels/CurveMapperNodeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using DSCore.CurveMapper;
using Dynamo.Graph;
using Dynamo.Graph.Nodes;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
Expand All @@ -8,6 +9,7 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Xml;

namespace CoreNodeModels
{
Expand Down Expand Up @@ -78,9 +80,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; }
Expand Down Expand Up @@ -334,6 +337,7 @@ public GraphTypes SelectedGraphType
selectedGraphType = value;
GenerateRenderValues();
RaisePropertyChanged(nameof(SelectedGraphType));
RaisePropertyChanged(nameof(SelectedGraphTypeDescription));
}
}

Expand Down Expand Up @@ -367,10 +371,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()
Expand Down Expand Up @@ -927,6 +946,175 @@ public override IEnumerable<AssociativeNode> BuildOutputAst(List<AssociativeNode
}

#endregion

#region Serialization/Deserialization Methods

protected override void SerializeCore(XmlElement element, SaveContext context)
{
base.SerializeCore(element, context);

element.SetAttribute(nameof(SelectedGraphType), SelectedGraphType.ToString());
element.SetAttribute(nameof(IsLocked), IsLocked.ToString());
element.SetAttribute(nameof(DynamicCanvasSize), DynamicCanvasSize.ToString());

// Save only the points needed for the current curve
switch (SelectedGraphType)
{
case GraphTypes.LinearCurve:
SavePointData(element, "Linear1", LinearCurveControlPointData1);
SavePointData(element, "Linear2", LinearCurveControlPointData2);
break;
case GraphTypes.BezierCurve:
SavePointData(element, "Bezier1", BezierCurveControlPointData1);
SavePointData(element, "Bezier2", BezierCurveControlPointData2);
SavePointData(element, "Bezier3", BezierCurveControlPointData3);
SavePointData(element, "Bezier4", BezierCurveControlPointData4);
break;
case GraphTypes.SineWave:
SavePointData(element, "Sine1", SineWaveControlPointData1);
SavePointData(element, "Sine2", SineWaveControlPointData2);
break;
case GraphTypes.CosineWave:
SavePointData(element, "Cosine1", CosineWaveControlPointData1);
SavePointData(element, "Cosine2", CosineWaveControlPointData2);
break;
case GraphTypes.ParabolicCurve:
SavePointData(element, "Parabolic1", ParabolicCurveControlPointData1);
SavePointData(element, "Parabolic2", ParabolicCurveControlPointData2);
break;
case GraphTypes.PerlinNoiseCurve:
SavePointData(element, "Perlin1", PerlinNoiseControlPointData1);
SavePointData(element, "Perlin2", PerlinNoiseControlPointData2);
SavePointData(element, "Perlin3", PerlinNoiseControlPointData3);
break;
case GraphTypes.PowerCurve:
SavePointData(element, "Power1", PowerCurveControlPointData1);
break;
case GraphTypes.SquareRootCurve:
SavePointData(element, "SquareRoot1", SquareRootCurveControlPointData1);
SavePointData(element, "SquareRoot2", SquareRootCurveControlPointData2);
break;
case GraphTypes.GaussianCurve:
SavePointData(element, "Gaussian1", GaussianCurveControlPointData1);
SavePointData(element, "Gaussian2", GaussianCurveControlPointData2);
SavePointData(element, "Gaussian3", GaussianCurveControlPointData3);
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))
{
if (SelectedGraphType != parsedType)
{
SelectedGraphType = parsedType;
RaisePropertyChanged(nameof(SelectedGraphType));
}
}

// Restore locked state
if (bool.TryParse(element.GetAttribute(nameof(IsLocked)), out var locked))
{
if (IsLocked != locked)
{
IsLocked = locked;
RaisePropertyChanged(nameof(IsLocked));
}
}

// Restore canvas size
if (double.TryParse(element.GetAttribute(nameof(DynamicCanvasSize)), out var canvasSize))
{
if (DynamicCanvasSize != canvasSize)
{
DynamicCanvasSize = canvasSize;
RaisePropertyChanged(nameof(DynamicCanvasSize));
}
}

IsRestoringUndo = false;

switch (SelectedGraphType)
{
case GraphTypes.LinearCurve:
LinearCurveControlPointData1 = LoadPointData(element, "Linear1");
LinearCurveControlPointData2 = LoadPointData(element, "Linear2");
break;
case GraphTypes.BezierCurve:
BezierCurveControlPointData1 = LoadPointData(element, "Bezier1");
BezierCurveControlPointData2 = LoadPointData(element, "Bezier2");
BezierCurveControlPointData3 = LoadPointData(element, "Bezier3");
BezierCurveControlPointData4 = LoadPointData(element, "Bezier4");
break;
case GraphTypes.SineWave:
SineWaveControlPointData1 = LoadPointData(element, "Sine1");
SineWaveControlPointData2 = LoadPointData(element, "Sine2");
break;
case GraphTypes.CosineWave:
CosineWaveControlPointData1 = LoadPointData(element, "Cosine1");
CosineWaveControlPointData2 = LoadPointData(element, "Cosine2");
break;
case GraphTypes.ParabolicCurve:
ParabolicCurveControlPointData1 = LoadPointData(element, "Parabolic1");
ParabolicCurveControlPointData2 = LoadPointData(element, "Parabolic2");
break;
case GraphTypes.PerlinNoiseCurve:
PerlinNoiseControlPointData1 = LoadPointData(element, "Perlin1");
PerlinNoiseControlPointData2 = LoadPointData(element, "Perlin2");
PerlinNoiseControlPointData3 = LoadPointData(element, "Perlin3");
break;
case GraphTypes.PowerCurve:
PowerCurveControlPointData1 = LoadPointData(element, "Power1");
break;
case GraphTypes.SquareRootCurve:
SquareRootCurveControlPointData1 = LoadPointData(element, "SquareRoot1");
SquareRootCurveControlPointData2 = LoadPointData(element, "SquareRoot2");
break;
case GraphTypes.GaussianCurve:
GaussianCurveControlPointData1 = LoadPointData(element, "Gaussian1");
GaussianCurveControlPointData2 = LoadPointData(element, "Gaussian2");
GaussianCurveControlPointData3 = LoadPointData(element, "Gaussian3");
GaussianCurveControlPointData4 = LoadPointData(element, "Gaussian4");
break;
}

GenerateRenderValues();
RaisePropertyChanged("ControlPointsDeserialized");
}

private void SavePointData(XmlElement parent, string name, ControlPointData point)
{
if (point == null) return;

var pointElement = parent.OwnerDocument.CreateElement(name);
pointElement.SetAttribute("X", point.X.ToString());
pointElement.SetAttribute("Y", point.Y.ToString());
pointElement.SetAttribute("Tag", point.Tag ?? "");
parent.AppendChild(pointElement);
}

private ControlPointData LoadPointData(XmlElement parent, string name)
{
var node = parent[name];
if (node == null) return null;

double.TryParse(node.GetAttribute("X"), out var x);
double.TryParse(node.GetAttribute("Y"), out var y);
var tag = node.GetAttribute("Tag");

return new ControlPointData(x, y, tag);
}

#endregion
}

/// <summary>
Expand Down
7 changes: 3 additions & 4 deletions src/Libraries/CoreNodeModelsWpf/CurveMapper/CurveMapperControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
Expand Down
Loading
Loading