aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(ui): use CadImporter in BomImportForm

Browse Source 
Replaces the hand-rolled DXF->Drawing pipeline (Dxf.Import + bend
detection + normalize + ConvertGeometry + pierce offset extraction)
with a single CadImporter.ImportDrawing call. Brings BomImportForm's
output in line with the rest of the callers: drawings now carry
Source.Offset, SourceEntities, SuppressedEntityIds, and detected bends,
and round-trip cleanly through nest files.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-04-10 14:11:49 -04:00
parent 08f60690a7
commit 87b965f895
1 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest/Forms/BomImportForm.cs
+2 -30
View File
@@ -1,9 +1,5 @@
using OpenNest.Bending;
using OpenNest.CNC;
using OpenNest.Converters;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.IO; using OpenNest.IO;
using OpenNest.IO.Bending;
using OpenNest.IO.Bom; using OpenNest.IO.Bom;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -470,33 +466,9 @@ namespace OpenNest.Forms
try try
{ {
var result = Dxf.Import(part.DxfPath); var drawing = CadImporter.ImportDrawing(part.DxfPath,
new CadImportOptions { Quantity = part.Qty ?? 1 });
var bends = new List<Bend>();
if (result.Document != null)
bends = BendDetectorRegistry.AutoDetect(result.Document);
Bend.UpdateEtchEntities(result.Entities, bends);
var drawingName = Path.GetFileNameWithoutExtension(part.DxfPath);
var drawing = new Drawing(drawingName);
drawing.Color = Drawing.GetNextColor();
drawing.Source.Path = part.DxfPath;
drawing.Quantity.Required = part.Qty ?? 1;
drawing.Material = new Material(material); drawing.Material = new Material(material);
if (bends.Count > 0)
drawing.Bends.AddRange(bends);
var normalized = ShapeProfile.NormalizeEntities(result.Entities);
var pgm = ConvertGeometry.ToProgram(normalized);
if (pgm.Codes.Count > 0 && pgm[0].Type == CodeType.RapidMove)
{
var rapid = (RapidMove)pgm[0];
drawing.Source.Offset = rapid.EndPoint;
pgm.Offset(-rapid.EndPoint);
}
drawing.Program = pgm;
nest.Drawings.Add(drawing); nest.Drawings.Add(drawing);
} }
catch (Exception ex) catch (Exception ex)