feat: add SubPrograms dictionary to Program with deep-copy support
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -12,6 +12,8 @@ namespace OpenNest.CNC
|
|||||||
|
|
||||||
public Dictionary<string, VariableDefinition> Variables { get; } = new(StringComparer.OrdinalIgnoreCase);
|
public Dictionary<string, VariableDefinition> Variables { get; } = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
public Dictionary<int, Program> SubPrograms { get; } = new();
|
||||||
|
|
||||||
private Mode mode;
|
private Mode mode;
|
||||||
|
|
||||||
public Program(Mode mode = Mode.Absolute)
|
public Program(Mode mode = Mode.Absolute)
|
||||||
@@ -460,6 +462,9 @@ namespace OpenNest.CNC
|
|||||||
foreach (var kvp in Variables)
|
foreach (var kvp in Variables)
|
||||||
pgm.Variables[kvp.Key] = kvp.Value;
|
pgm.Variables[kvp.Key] = kvp.Value;
|
||||||
|
|
||||||
|
foreach (var kvp in SubPrograms)
|
||||||
|
pgm.SubPrograms[kvp.Key] = (Program)kvp.Value.Clone();
|
||||||
|
|
||||||
return pgm;
|
return pgm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,4 +40,40 @@ public class HoleSubProgramTests
|
|||||||
Assert.Contains("X1.5", str);
|
Assert.Contains("X1.5", str);
|
||||||
Assert.Contains("Y2.5", str);
|
Assert.Contains("Y2.5", str);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Program_SubPrograms_EmptyByDefault()
|
||||||
|
{
|
||||||
|
var pgm = new Program();
|
||||||
|
Assert.NotNull(pgm.SubPrograms);
|
||||||
|
Assert.Empty(pgm.SubPrograms);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Program_SubPrograms_StoresAndRetrieves()
|
||||||
|
{
|
||||||
|
var pgm = new Program();
|
||||||
|
var sub = new Program(Mode.Incremental);
|
||||||
|
sub.Codes.Add(new LinearMove(0.1, 0.2));
|
||||||
|
|
||||||
|
pgm.SubPrograms[1] = sub;
|
||||||
|
|
||||||
|
Assert.Single(pgm.SubPrograms);
|
||||||
|
Assert.Same(sub, pgm.SubPrograms[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Program_Clone_DeepCopiesSubPrograms()
|
||||||
|
{
|
||||||
|
var pgm = new Program();
|
||||||
|
var sub = new Program(Mode.Incremental);
|
||||||
|
sub.Codes.Add(new LinearMove(0.1, 0.2));
|
||||||
|
pgm.SubPrograms[1] = sub;
|
||||||
|
|
||||||
|
var clone = (Program)pgm.Clone();
|
||||||
|
|
||||||
|
Assert.Single(clone.SubPrograms);
|
||||||
|
Assert.NotSame(sub, clone.SubPrograms[1]);
|
||||||
|
Assert.Equal(Mode.Incremental, clone.SubPrograms[1].Mode);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user