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

feat(ui): wire strip engine into UI auto-nest flow

Browse Source 
When Strip is selected in the engine dropdown, RunAutoNest_Click
calls StripNestEngine.Nest() instead of sequential FillExact+Pack.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-15 22:09:29 -04:00
parent 7462d1bdca
commit bb703ef8eb
1 changed files with 81 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest/Forms/MainForm.cs
+81 -57
View File
@@ -785,80 +785,104 @@ namespace OpenNest.Forms
if (plate != activeForm.PlateView.Plate) if (plate != activeForm.PlateView.Plate)
activeForm.LoadLastPlate(); activeForm.LoadLastPlate();
// Split items: Fill produces great results for qty > 1,
// Pack is fast for single-quantity items.
var fillItems = remaining
.Where(i => i.Quantity > 1)
.OrderBy(i => i.Priority)
.ThenByDescending(i => i.Drawing.Area)
.ToList();
var packItems = remaining
.Where(i => i.Quantity == 1)
.ToList();
var workArea = plate.WorkArea();
var anyPlaced = false; var anyPlaced = false;
// Phase 1: Fill each multi-quantity drawing with NestEngine. // Strip engine: use Nest() for multi-drawing strategy.
foreach (var item in fillItems) if (NestEngineRegistry.Create(plate) is StripNestEngine)
{ {
if (item.Quantity <= 0 || token.IsCancellationRequested) var stripEngine = new StripNestEngine(plate);
continue; var stripParts = await Task.Run(() =>
stripEngine.Nest(remaining, progress, token));
if (workArea.Width <= 0 || workArea.Length <= 0)
break;
var engine = NestEngineRegistry.Create(plate);
engine.PlateNumber = plateCount;
var parts = await Task.Run(() =>
engine.FillExact(item, workArea, progress, token));
activeForm.PlateView.ClearTemporaryParts(); activeForm.PlateView.ClearTemporaryParts();
if (token.IsCancellationRequested) if (stripParts.Count > 0 && !token.IsCancellationRequested)
break;
if (parts.Count > 0)
{ {
plate.Parts.AddRange(parts); plate.Parts.AddRange(stripParts);
// TODO: Compactor.Compact(parts, plate);
activeForm.PlateView.Invalidate(); activeForm.PlateView.Invalidate();
anyPlaced = true; anyPlaced = true;
item.Quantity = System.Math.Max(0, item.Quantity - parts.Count); // Deduct placed quantities.
foreach (var item in remaining)
// Compute remainder within the current work area based on {
// what was just placed — not the full plate bounding box. var placed = stripParts.Count(p =>
var placedBox = parts.Cast<IBoundable>().GetBoundingBox(); p.BaseDrawing.Name == item.Drawing.Name);
workArea = ComputeRemainderWithin(workArea, placedBox, plate.PartSpacing); item.Quantity = System.Math.Max(0, item.Quantity - placed);
}
} }
} }
else
// Phase 2: Pack single-quantity items into remaining space.
packItems = packItems.Where(i => i.Quantity > 0).ToList();
if (packItems.Count > 0 && workArea.Width > 0 && workArea.Length > 0
&& !token.IsCancellationRequested)
{ {
var engine = NestEngineRegistry.Create(plate); // Default: sequential Fill + Pack.
var packParts = engine.PackArea(workArea, packItems, null, CancellationToken.None); var fillItems = remaining
plate.Parts.AddRange(packParts); .Where(i => i.Quantity > 1)
var packed = packParts.Count; .OrderBy(i => i.Priority)
.ThenByDescending(i => i.Drawing.Area)
.ToList();
if (packed > 0) var packItems = remaining
.Where(i => i.Quantity == 1)
.ToList();
var workArea = plate.WorkArea();
// Phase 1: Fill each multi-quantity drawing with NestEngine.
foreach (var item in fillItems)
{ {
activeForm.PlateView.Invalidate(); if (item.Quantity <= 0 || token.IsCancellationRequested)
anyPlaced = true; continue;
// Deduct packed quantities. if (workArea.Width <= 0 || workArea.Length <= 0)
foreach (var item in packItems) break;
var engine = NestEngineRegistry.Create(plate);
engine.PlateNumber = plateCount;
var parts = await Task.Run(() =>
engine.FillExact(item, workArea, progress, token));
activeForm.PlateView.ClearTemporaryParts();
if (token.IsCancellationRequested)
break;
if (parts.Count > 0)
{ {
var placed = plate.Parts.Count(p => plate.Parts.AddRange(parts);
p.BaseDrawing.Name == item.Drawing.Name); // TODO: Compactor.Compact(parts, plate);
item.Quantity = System.Math.Max(0, activeForm.PlateView.Invalidate();
item.Quantity - placed); anyPlaced = true;
item.Quantity = System.Math.Max(0, item.Quantity - parts.Count);
var placedBox = parts.Cast<IBoundable>().GetBoundingBox();
workArea = ComputeRemainderWithin(workArea, placedBox, plate.PartSpacing);
}
}
// Phase 2: Pack single-quantity items into remaining space.
packItems = packItems.Where(i => i.Quantity > 0).ToList();
if (packItems.Count > 0 && workArea.Width > 0 && workArea.Length > 0
&& !token.IsCancellationRequested)
{
var engine = NestEngineRegistry.Create(plate);
var packParts = engine.PackArea(workArea, packItems, null, CancellationToken.None);
plate.Parts.AddRange(packParts);
var packed = packParts.Count;
if (packed > 0)
{
activeForm.PlateView.Invalidate();
anyPlaced = true;
foreach (var item in packItems)
{
var placed = plate.Parts.Count(p =>
p.BaseDrawing.Name == item.Drawing.Name);
item.Quantity = System.Math.Max(0,
item.Quantity - placed);
}
} }
} }
} }