feat(shapes): generate unique drawing names from parameters and add toolbar button
Shape library drawings now get descriptive names based on their parameters (e.g. "Rectangle 12x6", "Circle 8 Dia") instead of generic type names, preventing silent duplicates in the DrawingCollection HashSet. Added a Shape Library button to the Drawings tab toolbar and removed separators between toolbar buttons for a cleaner look. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -7,6 +7,8 @@ namespace OpenNest.Shapes
|
||||
{
|
||||
public double Diameter { get; set; }
|
||||
|
||||
public override string GenerateName() => $"Circle {Dim(Diameter)} Dia";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Diameter = 8;
|
||||
|
||||
@@ -8,6 +8,8 @@ namespace OpenNest.Shapes
|
||||
public double Base { get; set; }
|
||||
public double Height { get; set; }
|
||||
|
||||
public override string GenerateName() => $"Isosceles Triangle {Dim(Base)}x{Dim(Height)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Base = 8;
|
||||
|
||||
@@ -10,6 +10,8 @@ namespace OpenNest.Shapes
|
||||
public double LegWidth { get; set; }
|
||||
public double LegHeight { get; set; }
|
||||
|
||||
public override string GenerateName() => $"L {Dim(Width)}x{Dim(Height)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Width = 8;
|
||||
|
||||
@@ -8,6 +8,8 @@ namespace OpenNest.Shapes
|
||||
public int Sides { get; set; }
|
||||
public double Width { get; set; }
|
||||
|
||||
public override string GenerateName() => $"{Sides}-Sided Polygon {Dim(Width)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Sides = 8;
|
||||
|
||||
@@ -13,6 +13,14 @@ namespace OpenNest.Shapes
|
||||
public double PipeClearance { get; set; }
|
||||
public bool Blind { get; set; }
|
||||
|
||||
public override string GenerateName()
|
||||
{
|
||||
var name = $"Pipe Flange {Dim(OD)} OD";
|
||||
if (!string.IsNullOrEmpty(PipeSize))
|
||||
name += $" {PipeSize} Pipe";
|
||||
return name;
|
||||
}
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
OD = 7.5;
|
||||
|
||||
@@ -8,6 +8,8 @@ namespace OpenNest.Shapes
|
||||
public double Length { get; set; }
|
||||
public double Width { get; set; }
|
||||
|
||||
public override string GenerateName() => $"Rectangle {Dim(Length)}x{Dim(Width)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Length = 12;
|
||||
|
||||
@@ -8,6 +8,8 @@ namespace OpenNest.Shapes
|
||||
public double Width { get; set; }
|
||||
public double Height { get; set; }
|
||||
|
||||
public override string GenerateName() => $"Right Triangle {Dim(Width)}x{Dim(Height)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Width = 8;
|
||||
|
||||
@@ -8,6 +8,8 @@ namespace OpenNest.Shapes
|
||||
public double OuterDiameter { get; set; }
|
||||
public double InnerDiameter { get; set; }
|
||||
|
||||
public override string GenerateName() => $"Ring {Dim(OuterDiameter)}x{Dim(InnerDiameter)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
OuterDiameter = 10;
|
||||
|
||||
@@ -10,6 +10,8 @@ namespace OpenNest.Shapes
|
||||
public double Width { get; set; }
|
||||
public double Radius { get; set; }
|
||||
|
||||
public override string GenerateName() => $"Rounded Rectangle {Dim(Length)}x{Dim(Width)} R{Dim(Radius)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Length = 12;
|
||||
|
||||
@@ -26,6 +26,14 @@ namespace OpenNest.Shapes
|
||||
|
||||
public abstract Drawing GetDrawing();
|
||||
|
||||
public virtual string GenerateName()
|
||||
{
|
||||
var typeName = GetType().Name;
|
||||
return typeName.EndsWith("Shape")
|
||||
? typeName.Substring(0, typeName.Length - 5)
|
||||
: typeName;
|
||||
}
|
||||
|
||||
public virtual void SetPreviewDefaults() { }
|
||||
|
||||
public static List<T> LoadFromJson<T>(string path) where T : ShapeDefinition
|
||||
@@ -34,6 +42,8 @@ namespace OpenNest.Shapes
|
||||
return JsonSerializer.Deserialize<List<T>>(json, JsonOptions);
|
||||
}
|
||||
|
||||
protected static string Dim(double value) => value.ToString("0.###");
|
||||
|
||||
protected Drawing CreateDrawing(List<Entity> entities)
|
||||
{
|
||||
var pgm = ConvertGeometry.ToProgram(entities);
|
||||
|
||||
@@ -10,6 +10,8 @@ namespace OpenNest.Shapes
|
||||
public double StemWidth { get; set; }
|
||||
public double BarHeight { get; set; }
|
||||
|
||||
public override string GenerateName() => $"T {Dim(Width)}x{Dim(Height)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
Width = 10;
|
||||
|
||||
@@ -9,6 +9,8 @@ namespace OpenNest.Shapes
|
||||
public double BottomWidth { get; set; }
|
||||
public double Height { get; set; }
|
||||
|
||||
public override string GenerateName() => $"Trapezoid {Dim(TopWidth)}x{Dim(BottomWidth)}x{Dim(Height)}";
|
||||
|
||||
public override void SetPreviewDefaults()
|
||||
{
|
||||
TopWidth = 6;
|
||||
|
||||
Reference in New Issue
Block a user