diff --git a/OpenNest.Tests/CincinnatiCIFiber/CIFiberPostProcessorTests.cs b/OpenNest.Tests/CincinnatiCIFiber/CIFiberPostProcessorTests.cs index c06ce18..41454c1 100644 --- a/OpenNest.Tests/CincinnatiCIFiber/CIFiberPostProcessorTests.cs +++ b/OpenNest.Tests/CincinnatiCIFiber/CIFiberPostProcessorTests.cs @@ -329,4 +329,17 @@ public class CIFiberPostProcessorTests Assert.Equal("SSN", config.ResolveMaterialCode(" STAINLESS ")); Assert.Equal("MSN", config.ResolveMaterialCode("Aluminum")); } + + [Fact] + public void SavedConfigWithRetiredPartComment_StillLoads() + { + const string json = """ + { "PartComment": "OLD", "MaxTableX": 120.0, "DefaultMaterialCode": "SSN" } + """; + + var config = System.Text.Json.JsonSerializer.Deserialize(json)!; + + Assert.Equal(120.0, config.MaxTableX); + Assert.Equal("SSN", config.DefaultMaterialCode); + } } diff --git a/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberPostConfig.cs b/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberPostConfig.cs index ead1ccc..452acfe 100644 --- a/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberPostConfig.cs +++ b/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberPostConfig.cs @@ -91,12 +91,6 @@ namespace OpenNest.Posts.CincinnatiCIFiber [PostSetting(MachineSection, 2, Minimum = 0, Maximum = 10000, DecimalPlaces = 3)] public double MaxTableY { get; set; } = 81.25; - /// Comment text after the "( PART:" prefix for each part. - [DisplayName("Part comment")] - [Description("Text after \"( PART:\" for each part. Blank uses the source file or drawing name.")] - [PostSetting(OutputSection, 5)] - public string PartComment { get; set; } = ""; - /// Skippable global subroutine used to cancel comp / park between features. [DisplayName("Layer: cancel (L0)")] [Description("Called before each contour and at the end to cancel compensation and park.")] diff --git a/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberProgramWriter.cs b/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberProgramWriter.cs index 8afb783..64c680e 100644 --- a/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberProgramWriter.cs +++ b/Posts/OpenNest.Posts.CincinnatiCIFiber/CIFiberProgramWriter.cs @@ -155,7 +155,7 @@ namespace OpenNest.Posts.CincinnatiCIFiber { CIFiberFormatter.Line(w, $"( Part #{partNumber} )"); - var partComment = ResolvePartComment(part); + var partComment = PartName(part); CIFiberFormatter.Line(w, $"( PART:{partComment} )"); CIFiberFormatter.Line(w, $"V.E.R4={partNumber}"); @@ -269,11 +269,9 @@ namespace OpenNest.Posts.CincinnatiCIFiber CIFiberFormatter.Line(w, SkippableLine(_config.LayerCutEnd)); } - private string ResolvePartComment(Part part) + /// Source file name without extension, else the drawing name. + private static string PartName(Part part) { - if (!string.IsNullOrWhiteSpace(_config.PartComment)) - return _config.PartComment; - var name = part.BaseDrawing?.Name ?? ""; var source = part.BaseDrawing?.Source?.Path; if (!string.IsNullOrEmpty(source)) diff --git a/Posts/OpenNest.Posts.CincinnatiCIFiber/OpenNest.Posts.CincinnatiCIFiber.json b/Posts/OpenNest.Posts.CincinnatiCIFiber/OpenNest.Posts.CincinnatiCIFiber.json index be27667..56077bf 100644 --- a/Posts/OpenNest.Posts.CincinnatiCIFiber/OpenNest.Posts.CincinnatiCIFiber.json +++ b/Posts/OpenNest.Posts.CincinnatiCIFiber/OpenNest.Posts.CincinnatiCIFiber.json @@ -7,7 +7,6 @@ "SkipScribe": true, "MaxTableX": 160.25, "MaxTableY": 81.25, - "PartComment": "", "LayerCancel": "L0", "LayerInteriorLeadin": "L2", "LayerExteriorLeadin": "L4",