fix: correct Width/Length axis mapping and add spiral center-fill
Box constructor and derived properties (Right, Top, Center, Translate, Offset) had Width and Length swapped — Length is X axis, Width is Y axis. Corrected across Core geometry, plate bounding box, rectangle packing, fill algorithms, tests, and UI renderers. Added FillSpiral with center remnant detection and recursive FillBest on the gap between the 4 spiral quadrants. RectFill.FillBest now compares spiral+center vs full best-fit fairly. BestCombination returns a CombinationResult record instead of out params. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -2,13 +2,15 @@
|
||||
|
||||
namespace OpenNest
|
||||
{
|
||||
internal record CombinationResult(bool Found, int Count1, int Count2);
|
||||
|
||||
internal static class BestCombination
|
||||
{
|
||||
public static bool FindFrom2(double length1, double length2, double overallLength, out int count1, out int count2)
|
||||
public static CombinationResult FindFrom2(double length1, double length2, double overallLength)
|
||||
{
|
||||
overallLength += Tolerance.Epsilon;
|
||||
count1 = 0;
|
||||
count2 = 0;
|
||||
var count1 = 0;
|
||||
var count2 = 0;
|
||||
|
||||
var maxCount1 = (int)System.Math.Floor(overallLength / length1);
|
||||
var bestRemnant = overallLength + 1;
|
||||
@@ -30,7 +32,7 @@ namespace OpenNest
|
||||
break;
|
||||
}
|
||||
|
||||
return count1 > 0 || count2 > 0;
|
||||
return new CombinationResult(count1 > 0 || count2 > 0, count1, count2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user