chore: sort using directives

Auto-formatter reordering of using statements across the solution.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-03-18 16:47:42 -04:00
parent 6102dd5b85
commit 1d9bcc63d2
144 changed files with 378 additions and 426 deletions
+4 -4
View File
@@ -1,13 +1,13 @@
using OpenNest;
using OpenNest.Converters;
using OpenNest.Geometry;
using OpenNest.IO;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using OpenNest;
using OpenNest.Converters;
using OpenNest.Geometry;
using OpenNest.IO;
return NestConsole.Run(args); return NestConsole.Run(args);
+2 -2
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic; using OpenNest.Geometry;
using OpenNest.Geometry; using System.Collections.Generic;
namespace OpenNest namespace OpenNest
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,4 +1,3 @@
using OpenNest.CNC;
using OpenNest.Geometry; using OpenNest.Geometry;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.CNC.CuttingStrategy namespace OpenNest.CNC.CuttingStrategy
{ {
+1 -2
View File
@@ -1,8 +1,7 @@
using System;
using System.Collections.Generic;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.CNC namespace OpenNest.CNC
{ {
+2 -3
View File
@@ -1,7 +1,6 @@
using System.Collections.Generic; using OpenNest.CNC;
using OpenNest;
using OpenNest.CNC;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Converters namespace OpenNest.Converters
{ {
+2 -4
View File
@@ -1,9 +1,7 @@
using System; using OpenNest.CNC;
using System.Collections.Generic;
using OpenNest;
using OpenNest.CNC;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.Converters namespace OpenNest.Converters
{ {
+4 -4
View File
@@ -1,9 +1,9 @@
using System.Drawing; using OpenNest.CNC;
using System.Linq;
using System.Threading;
using OpenNest.CNC;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Drawing;
using System.Linq;
using System.Threading;
namespace OpenNest namespace OpenNest
{ {
+1 -1
View File
@@ -11,7 +11,7 @@
get get
{ {
var x = Required - Nested; var x = Required - Nested;
return x < 0 ? 0: x; return x < 0 ? 0 : x;
} }
} }
} }
+2 -2
View File
@@ -1,6 +1,6 @@
using System; using OpenNest.Math;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+1 -2
View File
@@ -1,6 +1,5 @@
using System; using OpenNest.Math;
using System.Collections.Generic; using System.Collections.Generic;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic; using OpenNest.Math;
using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+1 -1
View File
@@ -1,7 +1,7 @@
using OpenNest.Math;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+1 -1
View File
@@ -1,6 +1,6 @@
using OpenNest.Math;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System; using OpenNest.Math;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+1 -2
View File
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Clipper2Lib; using Clipper2Lib;
using System.Collections.Generic;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
-1
View File
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenNest.Geometry namespace OpenNest.Geometry
+2 -2
View File
@@ -1,7 +1,7 @@
using System; using OpenNest.Math;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+1 -2
View File
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+1 -1
View File
@@ -1,6 +1,6 @@
using OpenNest.Math;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+40 -41
View File
@@ -1,7 +1,6 @@
using System; using OpenNest.Math;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenNest.Math;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
@@ -30,41 +29,41 @@ namespace OpenNest.Geometry
{ {
case PushDirection.Left: case PushDirection.Left:
case PushDirection.Right: case PushDirection.Right:
{ {
var dy = p2y - p1y; var dy = p2y - p1y;
if (System.Math.Abs(dy) < Tolerance.Epsilon) if (System.Math.Abs(dy) < Tolerance.Epsilon)
return double.MaxValue;
var t = (vy - p1y) / dy;
if (t < -Tolerance.Epsilon || t > 1.0 + Tolerance.Epsilon)
return double.MaxValue;
var ix = p1x + t * (p2x - p1x);
var dist = direction == PushDirection.Left ? vx - ix : ix - vx;
if (dist > Tolerance.Epsilon) return dist;
if (dist >= -Tolerance.Epsilon) return 0;
return double.MaxValue; return double.MaxValue;
}
var t = (vy - p1y) / dy;
if (t < -Tolerance.Epsilon || t > 1.0 + Tolerance.Epsilon)
return double.MaxValue;
var ix = p1x + t * (p2x - p1x);
var dist = direction == PushDirection.Left ? vx - ix : ix - vx;
if (dist > Tolerance.Epsilon) return dist;
if (dist >= -Tolerance.Epsilon) return 0;
return double.MaxValue;
}
case PushDirection.Down: case PushDirection.Down:
case PushDirection.Up: case PushDirection.Up:
{ {
var dx = p2x - p1x; var dx = p2x - p1x;
if (System.Math.Abs(dx) < Tolerance.Epsilon) if (System.Math.Abs(dx) < Tolerance.Epsilon)
return double.MaxValue;
var t = (vx - p1x) / dx;
if (t < -Tolerance.Epsilon || t > 1.0 + Tolerance.Epsilon)
return double.MaxValue;
var iy = p1y + t * (p2y - p1y);
var dist = direction == PushDirection.Down ? vy - iy : iy - vy;
if (dist > Tolerance.Epsilon) return dist;
if (dist >= -Tolerance.Epsilon) return 0;
return double.MaxValue; return double.MaxValue;
}
var t = (vx - p1x) / dx;
if (t < -Tolerance.Epsilon || t > 1.0 + Tolerance.Epsilon)
return double.MaxValue;
var iy = p1y + t * (p2y - p1y);
var dist = direction == PushDirection.Down ? vy - iy : iy - vy;
if (dist > Tolerance.Epsilon) return dist;
if (dist >= -Tolerance.Epsilon) return 0;
return double.MaxValue;
}
default: default:
return double.MaxValue; return double.MaxValue;
@@ -363,10 +362,10 @@ namespace OpenNest.Geometry
{ {
switch (direction) switch (direction)
{ {
case PushDirection.Left: return box.Left - boundary.Left; case PushDirection.Left: return box.Left - boundary.Left;
case PushDirection.Right: return boundary.Right - box.Right; case PushDirection.Right: return boundary.Right - box.Right;
case PushDirection.Up: return boundary.Top - box.Top; case PushDirection.Up: return boundary.Top - box.Top;
case PushDirection.Down: return box.Bottom - boundary.Bottom; case PushDirection.Down: return box.Bottom - boundary.Bottom;
default: return double.MaxValue; default: return double.MaxValue;
} }
} }
@@ -375,10 +374,10 @@ namespace OpenNest.Geometry
{ {
switch (direction) switch (direction)
{ {
case PushDirection.Left: return new Vector(-distance, 0); case PushDirection.Left: return new Vector(-distance, 0);
case PushDirection.Right: return new Vector(distance, 0); case PushDirection.Right: return new Vector(distance, 0);
case PushDirection.Up: return new Vector(0, distance); case PushDirection.Up: return new Vector(0, distance);
case PushDirection.Down: return new Vector(0, -distance); case PushDirection.Down: return new Vector(0, -distance);
default: return new Vector(); default: return new Vector();
} }
} }
@@ -387,10 +386,10 @@ namespace OpenNest.Geometry
{ {
switch (direction) switch (direction)
{ {
case PushDirection.Left: return from.Left - to.Right; case PushDirection.Left: return from.Left - to.Right;
case PushDirection.Right: return to.Left - from.Right; case PushDirection.Right: return to.Left - from.Right;
case PushDirection.Up: return to.Bottom - from.Top; case PushDirection.Up: return to.Bottom - from.Top;
case PushDirection.Down: return from.Bottom - to.Top; case PushDirection.Down: return from.Bottom - to.Top;
default: return double.MaxValue; default: return double.MaxValue;
} }
} }
+2 -2
View File
@@ -1,5 +1,5 @@
using System; using OpenNest.Math;
using OpenNest.Math; using System;
namespace OpenNest.Geometry namespace OpenNest.Geometry
{ {
+1 -3
View File
@@ -1,6 +1,4 @@
using System; namespace OpenNest.Math
namespace OpenNest.Math
{ {
public static class Angle public static class Angle
{ {
+1 -3
View File
@@ -1,6 +1,4 @@
using System; namespace OpenNest.Math
namespace OpenNest.Math
{ {
public static class Tolerance public static class Tolerance
{ {
+1 -3
View File
@@ -1,6 +1,4 @@
using System; namespace OpenNest.Math
namespace OpenNest.Math
{ {
public static class Trigonometry public static class Trigonometry
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System; using OpenNest.Collections;
using OpenNest.Collections;
using OpenNest.Geometry; using OpenNest.Geometry;
using System;
namespace OpenNest namespace OpenNest
{ {
+1 -2
View File
@@ -1,5 +1,4 @@
using System; using OpenNest.Math;
using OpenNest.Math;
namespace OpenNest namespace OpenNest
{ {
+3 -3
View File
@@ -1,8 +1,8 @@
using System.Collections.Generic; using OpenNest.CNC;
using System.Linq;
using OpenNest.CNC;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
using System.Linq;
namespace OpenNest namespace OpenNest
{ {
+6 -6
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
using System.Linq;
namespace OpenNest namespace OpenNest
{ {
@@ -174,10 +174,10 @@ namespace OpenNest
switch (facingDirection) switch (facingDirection)
{ {
case PushDirection.Left: keep = -sign * dy > 0; break; case PushDirection.Left: keep = -sign * dy > 0; break;
case PushDirection.Right: keep = sign * dy > 0; break; case PushDirection.Right: keep = sign * dy > 0; break;
case PushDirection.Up: keep = -sign * dx > 0; break; case PushDirection.Up: keep = -sign * dx > 0; break;
case PushDirection.Down: keep = sign * dx > 0; break; case PushDirection.Down: keep = sign * dx > 0; break;
default: keep = true; break; default: keep = true; break;
} }
+4 -4
View File
@@ -1,9 +1,9 @@
using System; using OpenNest.Collections;
using System.Collections.Generic;
using System.Linq;
using OpenNest.Collections;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System;
using System.Collections.Generic;
using System.Linq;
namespace OpenNest namespace OpenNest
{ {
+2 -2
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic; using OpenNest.Geometry;
using OpenNest.Geometry; using System.Collections.Generic;
namespace OpenNest namespace OpenNest
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -2
View File
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+2 -2
View File
@@ -1,9 +1,9 @@
using OpenNest.Converters;
using OpenNest.Geometry;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text.Json; using System.Text.Json;
using OpenNest.Converters;
using OpenNest.Geometry;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Shapes namespace OpenNest.Shapes
{ {
+3 -3
View File
@@ -1,8 +1,8 @@
using System; using OpenNest.CNC;
using System.Linq;
using OpenNest.CNC;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Geometry; using OpenNest.Geometry;
using System;
using System.Linq;
namespace OpenNest namespace OpenNest
{ {
+4 -4
View File
@@ -1,11 +1,11 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Engine.BestFit.Tiling; using OpenNest.Engine.BestFit.Tiling;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace OpenNest.Engine.BestFit namespace OpenNest.Engine.BestFit
{ {
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.Engine.BestFit namespace OpenNest.Engine.BestFit
{ {
@@ -1,6 +1,6 @@
using OpenNest.Geometry;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.Engine.BestFit namespace OpenNest.Engine.BestFit
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.Engine.BestFit.Tiling namespace OpenNest.Engine.BestFit.Tiling
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Engine.BestFit.Tiling namespace OpenNest.Engine.BestFit.Tiling
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic; using OpenNest.Geometry;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.CirclePacking namespace OpenNest.CirclePacking
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System; using OpenNest.Geometry;
using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System;
namespace OpenNest.CirclePacking namespace OpenNest.CirclePacking
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System; using OpenNest.Geometry;
using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System;
namespace OpenNest.CirclePacking namespace OpenNest.CirclePacking
{ {
+1 -2
View File
@@ -1,5 +1,4 @@
using System; using OpenNest.Math;
using OpenNest.Math;
namespace OpenNest namespace OpenNest
{ {
+3 -3
View File
@@ -1,11 +1,11 @@
using Microsoft.ML.OnnxRuntime;
using Microsoft.ML.OnnxRuntime.Tensors;
using OpenNest.Math;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using Microsoft.ML.OnnxRuntime;
using Microsoft.ML.OnnxRuntime.Tensors;
using OpenNest.Math;
namespace OpenNest.Engine.ML namespace OpenNest.Engine.ML
{ {
-1
View File
@@ -1,7 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.Engine.ML namespace OpenNest.Engine.ML
{ {
+1 -3
View File
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Linq;
namespace OpenNest.Engine.ML namespace OpenNest.Engine.ML
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest namespace OpenNest
{ {
+2 -2
View File
@@ -1,10 +1,10 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.CNC; using OpenNest.CNC;
using OpenNest.CNC.CuttingStrategy; using OpenNest.CNC.CuttingStrategy;
using OpenNest.Engine.RapidPlanning; using OpenNest.Engine.RapidPlanning;
using OpenNest.Engine.Sequencing; using OpenNest.Engine.Sequencing;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
using System.Linq;
namespace OpenNest.Engine namespace OpenNest.Engine
{ {
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.CNC; using OpenNest.CNC;
using OpenNest.Engine.RapidPlanning; using OpenNest.Engine.RapidPlanning;
using System.Collections.Generic;
namespace OpenNest.Engine namespace OpenNest.Engine
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Engine.RapidPlanning namespace OpenNest.Engine.RapidPlanning
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Engine.RapidPlanning namespace OpenNest.Engine.RapidPlanning
{ {
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Engine.RapidPlanning namespace OpenNest.Engine.RapidPlanning
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
namespace OpenNest.Engine.RapidPlanning namespace OpenNest.Engine.RapidPlanning
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic; using OpenNest.Geometry;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
@@ -1,5 +1,5 @@
using System.Collections.Generic; using OpenNest.Geometry;
using OpenNest.Geometry; using System.Collections.Generic;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
@@ -1,5 +1,4 @@
using System; using OpenNest.Geometry;
using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
@@ -1,5 +1,4 @@
using OpenNest.Geometry; using OpenNest.Math;
using OpenNest.Math;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
+2 -2
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic; using OpenNest.Geometry;
using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
@@ -1,7 +1,7 @@
using System.Collections.Generic; using OpenNest.Geometry;
using System.Linq;
using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
using System.Linq;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
@@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenNest.Geometry;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
@@ -1,6 +1,6 @@
using System.Collections.Generic; using OpenNest.Geometry;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.RectanglePacking namespace OpenNest.RectanglePacking
{ {
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.CNC.CuttingStrategy; using OpenNest.CNC.CuttingStrategy;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
using System.Linq;
namespace OpenNest.Engine.Sequencing namespace OpenNest.Engine.Sequencing
{ {
@@ -25,10 +25,10 @@ namespace OpenNest.Engine.Sequencing
private static double MinEdgeDistance(OpenNest.Geometry.Vector center, OpenNest.Geometry.Box plateBox) private static double MinEdgeDistance(OpenNest.Geometry.Vector center, OpenNest.Geometry.Box plateBox)
{ {
var distLeft = center.X - plateBox.Left; var distLeft = center.X - plateBox.Left;
var distRight = plateBox.Right - center.X; var distRight = plateBox.Right - center.X;
var distBottom = center.Y - plateBox.Bottom; var distBottom = center.Y - plateBox.Bottom;
var distTop = plateBox.Top - center.Y; var distTop = plateBox.Top - center.Y;
return System.Math.Min(System.Math.Min(distLeft, distRight), System.Math.Min(distBottom, distTop)); return System.Math.Min(System.Math.Min(distLeft, distRight), System.Math.Min(distBottom, distTop));
} }
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using OpenNest.Math; using OpenNest.Math;
using System.Collections.Generic;
namespace OpenNest.Engine.Sequencing namespace OpenNest.Engine.Sequencing
{ {
@@ -1,5 +1,5 @@
using System;
using OpenNest.CNC.CuttingStrategy; using OpenNest.CNC.CuttingStrategy;
using System;
namespace OpenNest.Engine.Sequencing namespace OpenNest.Engine.Sequencing
{ {
@@ -9,12 +9,12 @@ namespace OpenNest.Engine.Sequencing
{ {
return parameters.Method switch return parameters.Method switch
{ {
SequenceMethod.RightSide => new RightSideSequencer(), SequenceMethod.RightSide => new RightSideSequencer(),
SequenceMethod.LeftSide => new LeftSideSequencer(), SequenceMethod.LeftSide => new LeftSideSequencer(),
SequenceMethod.BottomSide => new BottomSideSequencer(), SequenceMethod.BottomSide => new BottomSideSequencer(),
SequenceMethod.EdgeStart => new EdgeStartSequencer(), SequenceMethod.EdgeStart => new EdgeStartSequencer(),
SequenceMethod.LeastCode => new LeastCodeSequencer(), SequenceMethod.LeastCode => new LeastCodeSequencer(),
SequenceMethod.Advanced => new AdvancedSequencer(parameters), SequenceMethod.Advanced => new AdvancedSequencer(parameters),
_ => throw new NotSupportedException( _ => throw new NotSupportedException(
$"Sequence method '{parameters.Method}' is not supported.") $"Sequence method '{parameters.Method}' is not supported.")
}; };
+2 -2
View File
@@ -1,8 +1,8 @@
using System;
using System.Diagnostics;
using ILGPU; using ILGPU;
using ILGPU.Runtime; using ILGPU.Runtime;
using OpenNest.Engine.BestFit; using OpenNest.Engine.BestFit;
using System;
using System.Diagnostics;
namespace OpenNest.Gpu namespace OpenNest.Gpu
{ {
+4 -5
View File
@@ -1,13 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using ILGPU; using ILGPU;
using ILGPU.Runtime; using ILGPU.Runtime;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Engine.BestFit; using OpenNest.Engine.BestFit;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace OpenNest.Gpu namespace OpenNest.Gpu
{ {
+5 -5
View File
@@ -1,8 +1,8 @@
using System;
using ILGPU; using ILGPU;
using ILGPU.Runtime;
using ILGPU.Algorithms; using ILGPU.Algorithms;
using ILGPU.Runtime;
using OpenNest.Engine.BestFit; using OpenNest.Engine.BestFit;
using System;
namespace OpenNest.Gpu namespace OpenNest.Gpu
{ {
@@ -178,9 +178,9 @@ namespace OpenNest.Gpu
private void EnsureMoving(double[] data, int count) private void EnsureMoving(double[] data, int count)
{ {
if (_gpuMovingPrep != null && if (_gpuMovingPrep != null &&
_lastMovingData != null && _lastMovingData != null &&
_lastMovingData.Length == data.Length) _lastMovingData.Length == data.Length)
{ {
if (_lastMovingData == data || if (_lastMovingData == data ||
new ReadOnlySpan<double>(_lastMovingData).SequenceEqual(new ReadOnlySpan<double>(data))) new ReadOnlySpan<double>(_lastMovingData).SequenceEqual(new ReadOnlySpan<double>(data)))
+3 -3
View File
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Geometry; using OpenNest.Geometry;
using OpenNest.Math; using OpenNest.Math;
using System;
using System.Collections.Generic;
using System.Linq;
namespace OpenNest.Gpu namespace OpenNest.Gpu
{ {
+2 -5
View File
@@ -1,13 +1,10 @@
using System;
using System.Diagnostics;
using System.IO;
using ACadSharp; using ACadSharp;
using ACadSharp.Entities;
using ACadSharp.IO; using ACadSharp.IO;
using ACadSharp.Tables;
using CSMath; using CSMath;
using OpenNest.CNC; using OpenNest.CNC;
using OpenNest.Math; using OpenNest.Math;
using System.Diagnostics;
using System.IO;
namespace OpenNest.IO namespace OpenNest.IO
{ {
+3 -3
View File
@@ -1,10 +1,10 @@
using ACadSharp;
using ACadSharp.IO;
using OpenNest.Geometry;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using ACadSharp;
using ACadSharp.IO;
using OpenNest.Geometry;
namespace OpenNest.IO namespace OpenNest.IO
{ {
+36 -21
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using ACadSharp.Entities; using ACadSharp.Entities;
using CSMath; using CSMath;
using OpenNest.Geometry; using OpenNest.Geometry;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
namespace OpenNest.IO namespace OpenNest.IO
{ {
@@ -26,9 +25,9 @@ namespace OpenNest.IO
arc.Center.X, arc.Center.Y, arc.Radius, arc.Center.X, arc.Center.Y, arc.Radius,
arc.StartAngle, arc.StartAngle,
arc.EndAngle) arc.EndAngle)
{ {
Layer = arc.Layer.ToOpenNest() Layer = arc.Layer.ToOpenNest()
}; };
result.ApplyDxfProperties(arc); result.ApplyDxfProperties(arc);
return result; return result;
} }
@@ -38,9 +37,9 @@ namespace OpenNest.IO
var result = new Geometry.Circle( var result = new Geometry.Circle(
circle.Center.X, circle.Center.Y, circle.Center.X, circle.Center.Y,
circle.Radius) circle.Radius)
{ {
Layer = circle.Layer.ToOpenNest() Layer = circle.Layer.ToOpenNest()
}; };
result.ApplyDxfProperties(circle); result.ApplyDxfProperties(circle);
return result; return result;
} }
@@ -50,9 +49,9 @@ namespace OpenNest.IO
var result = new Geometry.Line( var result = new Geometry.Line(
line.StartPoint.X, line.StartPoint.Y, line.StartPoint.X, line.StartPoint.Y,
line.EndPoint.X, line.EndPoint.Y) line.EndPoint.X, line.EndPoint.Y)
{ {
Layer = line.Layer.ToOpenNest() Layer = line.Layer.ToOpenNest()
}; };
result.ApplyDxfProperties(line); result.ApplyDxfProperties(line);
return result; return result;
} }
@@ -76,7 +75,9 @@ namespace OpenNest.IO
lines.Add(new Geometry.Line(lastPoint, nextPoint) lines.Add(new Geometry.Line(lastPoint, nextPoint)
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
lastPoint = nextPoint; lastPoint = nextPoint;
@@ -85,7 +86,9 @@ namespace OpenNest.IO
if (spline.IsClosed) if (spline.IsClosed)
lines.Add(new Geometry.Line(lastPoint, pts[0].ToOpenNest()) lines.Add(new Geometry.Line(lastPoint, pts[0].ToOpenNest())
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
return lines; return lines;
@@ -109,7 +112,9 @@ namespace OpenNest.IO
lines.Add(new Geometry.Line(lastPoint, nextPoint) lines.Add(new Geometry.Line(lastPoint, nextPoint)
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
lastPoint = nextPoint; lastPoint = nextPoint;
@@ -120,7 +125,9 @@ namespace OpenNest.IO
if (isClosed) if (isClosed)
lines.Add(new Geometry.Line(lastPoint, polyline.Vertices[0].Location.ToOpenNest()) lines.Add(new Geometry.Line(lastPoint, polyline.Vertices[0].Location.ToOpenNest())
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
return lines; return lines;
@@ -144,7 +151,9 @@ namespace OpenNest.IO
lines.Add(new Geometry.Line(lastPoint, nextPoint) lines.Add(new Geometry.Line(lastPoint, nextPoint)
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
lastPoint = nextPoint; lastPoint = nextPoint;
@@ -155,7 +164,9 @@ namespace OpenNest.IO
if (isClosed) if (isClosed)
lines.Add(new Geometry.Line(lastPoint, polyline.Vertices[0].ToOpenNest()) lines.Add(new Geometry.Line(lastPoint, polyline.Vertices[0].ToOpenNest())
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
return lines; return lines;
@@ -204,7 +215,9 @@ namespace OpenNest.IO
{ {
lines.Add(new Geometry.Line(points[i], points[i + 1]) lines.Add(new Geometry.Line(points[i], points[i + 1])
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
} }
@@ -215,7 +228,9 @@ namespace OpenNest.IO
var last = lines.Last(); var last = lines.Last();
lines.Add(new Geometry.Line(last.EndPoint, first.StartPoint) lines.Add(new Geometry.Line(last.EndPoint, first.StartPoint)
{ {
Layer = layer, Color = color, LineTypeName = lineTypeName Layer = layer,
Color = color,
LineTypeName = lineTypeName
}); });
} }
+3 -3
View File
@@ -1,3 +1,6 @@
using OpenNest.CNC;
using OpenNest.Engine.BestFit;
using OpenNest.Geometry;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
@@ -5,9 +8,6 @@ using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
using OpenNest.CNC;
using OpenNest.Engine.BestFit;
using OpenNest.Geometry;
using static OpenNest.IO.NestFormat; using static OpenNest.IO.NestFormat;
namespace OpenNest.IO namespace OpenNest.IO

Some files were not shown because too many files have changed in this diff Show More