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

refactor: migrate NestingTools to NestEngineRegistry

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-15 21:09:46 -04:00
parent 4baeb57e84
commit a26ab2ba28
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenNest.Mcp/Tools/NestingTools.cs
View File

@@ -34,7 +34,7 @@ namespace OpenNest.Mcp.Tools
return $"Error: drawing '{drawingName}' not found"; return $"Error: drawing '{drawingName}' not found";
var countBefore = plate.Parts.Count; var countBefore = plate.Parts.Count;
var engine = new NestEngine(plate); var engine = NestEngineRegistry.Create(plate);
var item = new NestItem { Drawing = drawing, Quantity = quantity }; var item = new NestItem { Drawing = drawing, Quantity = quantity };
var success = engine.Fill(item); var success = engine.Fill(item);
@@ -70,7 +70,7 @@ namespace OpenNest.Mcp.Tools
return $"Error: drawing '{drawingName}' not found"; return $"Error: drawing '{drawingName}' not found";
var countBefore = plate.Parts.Count; var countBefore = plate.Parts.Count;
var engine = new NestEngine(plate); var engine = NestEngineRegistry.Create(plate);
var item = new NestItem { Drawing = drawing, Quantity = quantity }; var item = new NestItem { Drawing = drawing, Quantity = quantity };
var area = new Box(x, y, width, height); var area = new Box(x, y, width, height);
var success = engine.Fill(item, area); var success = engine.Fill(item, area);
@@ -111,7 +111,7 @@ namespace OpenNest.Mcp.Tools
sb.AppendLine($"Found {remnants.Count} remnant area(s) on plate {plateIndex}"); sb.AppendLine($"Found {remnants.Count} remnant area(s) on plate {plateIndex}");
var totalAdded = 0; var totalAdded = 0;
var engine = new NestEngine(plate); var engine = NestEngineRegistry.Create(plate);
for (var i = 0; i < remnants.Count; i++) for (var i = 0; i < remnants.Count; i++)
{ {
@@ -173,7 +173,7 @@ namespace OpenNest.Mcp.Tools
} }
var countBefore = plate.Parts.Count; var countBefore = plate.Parts.Count;
var engine = new NestEngine(plate); var engine = NestEngineRegistry.Create(plate);
var success = engine.Pack(items); var success = engine.Pack(items);
var countAfter = plate.Parts.Count; var countAfter = plate.Parts.Count;
var added = countAfter - countBefore; var added = countAfter - countBefore;
@@ -252,7 +252,7 @@ namespace OpenNest.Mcp.Tools
if (item.Quantity <= 0 || workArea.Width <= 0 || workArea.Length <= 0) if (item.Quantity <= 0 || workArea.Width <= 0 || workArea.Length <= 0)
continue; continue;
var engine = new NestEngine(plate); var engine = NestEngineRegistry.Create(plate);
var parts = engine.FillExact(item, workArea, null, CancellationToken.None); var parts = engine.FillExact(item, workArea, null, CancellationToken.None);
if (parts.Count > 0) if (parts.Count > 0)
@@ -271,10 +271,13 @@ namespace OpenNest.Mcp.Tools
if (packItems.Count > 0 && workArea.Width > 0 && workArea.Length > 0) if (packItems.Count > 0 && workArea.Width > 0 && workArea.Length > 0)
{ {
var before = plate.Parts.Count; var engine = NestEngineRegistry.Create(plate);
var engine = new NestEngine(plate); var packParts = engine.PackArea(workArea, packItems, null, CancellationToken.None);
engine.PackArea(workArea, packItems); if (packParts.Count > 0)
totalPlaced += plate.Parts.Count - before; {
plate.Parts.AddRange(packParts);
totalPlaced += packParts.Count;
}
} }
var sb = new StringBuilder(); var sb = new StringBuilder();