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

Move geometry primitives to OpenNest.Geometry namespace

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-06 13:02:12 -05:00
parent 8d9aebb83f
commit 67a66e10fd
46 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenNest.Core/CNC/ArcMove.cs
View File

@@ -1,4 +1,5 @@

using OpenNest.Geometry;
namespace OpenNest.CNC
{
public class ArcMove : Motion

4
OpenNest.Core/CNC/LinearMove.cs
View File

@@ -1,4 +1,6 @@
namespace OpenNest.CNC
using OpenNest.Geometry;
namespace OpenNest.CNC
{
public class LinearMove : Motion
{

3
OpenNest.Core/CNC/Motion.cs
View File

@@ -1,4 +1,5 @@

using OpenNest.Geometry;
namespace OpenNest.CNC
{
public abstract class Motion : ICode

3
OpenNest.Core/CNC/RapidMove.cs
View File

@@ -1,4 +1,5 @@

using OpenNest.Geometry;
namespace OpenNest.CNC
{
public class RapidMove : Motion

1
OpenNest.Core/ConvertMode.cs
View File

@@ -1,4 +1,5 @@
using OpenNest.CNC;
using OpenNest.Geometry;
namespace OpenNest
{

1
OpenNest.Core/Drawing.cs
View File

@@ -1,6 +1,7 @@
using System.Drawing;
using System.Linq;
using OpenNest.CNC;
using OpenNest.Geometry;
namespace OpenNest
{

2
OpenNest.Core/BoundingBox.cs → OpenNest.Core/Geometry/BoundingBox.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Linq;
namespace OpenNest
namespace OpenNest.Geometry
{
public static class BoundingBox
{

2
OpenNest.Core/Box.cs → OpenNest.Core/Geometry/Box.cs
View File

@@ -1,6 +1,6 @@
using OpenNest.Math;
namespace OpenNest
namespace OpenNest.Geometry
{
public class Box
{

2
OpenNest.Core/BoxSplitter.cs → OpenNest.Core/Geometry/BoxSplitter.cs
View File

@@ -1,4 +1,4 @@
namespace OpenNest
namespace OpenNest.Geometry
{
public static class BoxSplitter
{

2
OpenNest.Core/IBoundable.cs → OpenNest.Core/Geometry/IBoundable.cs
View File

@@ -1,5 +1,5 @@

namespace OpenNest
namespace OpenNest.Geometry
{
public interface IBoundable
{

2
OpenNest.Core/Size.cs → OpenNest.Core/Geometry/Size.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace OpenNest
namespace OpenNest.Geometry
{
public struct Size
{

2
OpenNest.Core/Spacing.cs → OpenNest.Core/Geometry/Spacing.cs
View File

@@ -1,4 +1,4 @@
namespace OpenNest
namespace OpenNest.Geometry
{
public struct Spacing
{

2
OpenNest.Core/Vector.cs → OpenNest.Core/Geometry/Vector.cs
View File

@@ -1,7 +1,7 @@
using System;
using OpenNest.Math;
namespace OpenNest
namespace OpenNest.Geometry
{
public struct Vector
{

1
OpenNest.Core/Nest.cs
View File

@@ -1,5 +1,6 @@
using System;
using OpenNest.Collections;
using OpenNest.Geometry;
namespace OpenNest
{

14
OpenNest.Core/OpenNest.Core.csproj
View File

@@ -60,15 +60,15 @@
<Compile Include="CNC\SubProgramCall.cs" />
<Compile Include="Math\Generic.cs" />
<Compile Include="Geometry\Arc.cs" />
<Compile Include="BoundingBox.cs" />
<Compile Include="Box.cs" />
<Compile Include="BoxSplitter.cs" />
<Compile Include="Geometry\BoundingBox.cs" />
<Compile Include="Geometry\Box.cs" />
<Compile Include="Geometry\BoxSplitter.cs" />
<Compile Include="Geometry\Circle.cs" />
<Compile Include="Geometry\DefinedShape.cs" />
<Compile Include="Geometry\Entity.cs" />
<Compile Include="Geometry\EntityType.cs" />
<Compile Include="Helper.cs" />
<Compile Include="IBoundable.cs" />
<Compile Include="Geometry\IBoundable.cs" />
<Compile Include="Geometry\Layer.cs" />
<Compile Include="Geometry\Line.cs" />
<Compile Include="OffsetSide.cs" />
@@ -76,10 +76,10 @@
<Compile Include="RelativePosition.cs" />
<Compile Include="RotationType.cs" />
<Compile Include="Geometry\Shape.cs" />
<Compile Include="Size.cs" />
<Compile Include="Geometry\Size.cs" />
<Compile Include="Math\Tolerance.cs" />
<Compile Include="Units.cs" />
<Compile Include="Vector.cs" />
<Compile Include="Geometry\Vector.cs" />
<Compile Include="IPostProcessor.cs" />
<Compile Include="NestConstraints.cs" />
<Compile Include="Sequence.cs" />
@@ -94,7 +94,7 @@
<Compile Include="ConvertProgram.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="DwgQty.cs" />
<Compile Include="Spacing.cs" />
<Compile Include="Geometry\Spacing.cs" />
<Compile Include="Timing.cs" />
<Compile Include="TimingInfo.cs" />
<Compile Include="Math\Trigonometry.cs" />

1
OpenNest.Core/Part.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using OpenNest.CNC;
using OpenNest.Geometry;
namespace OpenNest
{

1
OpenNest.Core/Plate.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.Collections;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest

1
OpenNest.Core/Sequence.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry;
namespace OpenNest
{

1
OpenNest.Engine/CirclePacking/Bin.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.CirclePacking
{

1
OpenNest.Engine/CirclePacking/FillEndEven.cs
View File

@@ -1,4 +1,5 @@
using System;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.CirclePacking

1
OpenNest.Engine/CirclePacking/FillEndOdd.cs
View File

@@ -1,4 +1,5 @@
using System;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.CirclePacking

1
OpenNest.Engine/NestEngine.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using OpenNest.Geometry;
using OpenNest.Math;
using OpenNest.RectanglePacking;

1
OpenNest.Engine/RectanglePacking/Bin.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.RectanglePacking
{

1
OpenNest.Engine/RectanglePacking/FillBestFit.cs
View File

@@ -1,4 +1,5 @@
using System;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.RectanglePacking

1
OpenNest.Engine/RectanglePacking/FillEngine.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry;
namespace OpenNest.RectanglePacking
{

1
OpenNest.Engine/RectanglePacking/FillNoRotation.cs
View File

@@ -1,4 +1,5 @@
using System;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.RectanglePacking

3
OpenNest.Engine/RectanglePacking/FillSameRotation.cs
View File

@@ -1,4 +1,5 @@
using OpenNest.Math;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.RectanglePacking
{

1
OpenNest.Engine/RectanglePacking/Item.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.RectanglePacking

1
OpenNest.Engine/RectanglePacking/PackBottomLeft.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.RectanglePacking

1
OpenNest.Engine/RectanglePacking/PackEngine.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using OpenNest.Geometry;
namespace OpenNest.RectanglePacking
{

1
OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using OpenNest.Geometry;
namespace OpenNest.RectanglePacking
{

1
OpenNest/Actions/ActionAddPart.cs
View File

@@ -2,6 +2,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using OpenNest.Controls;
using OpenNest.Geometry;
namespace OpenNest.Actions
{

1
OpenNest/Actions/ActionClone.cs
View File

@@ -2,6 +2,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using OpenNest.Controls;
using OpenNest.Geometry;
namespace OpenNest.Actions
{

1
OpenNest/Actions/ActionSelect.cs
View File

@@ -2,6 +2,7 @@
using System.Drawing;
using System.Windows.Forms;
using OpenNest.Controls;
using OpenNest.Geometry;
namespace OpenNest.Actions
{

1
OpenNest/Actions/ActionSelectArea.cs
View File

@@ -5,6 +5,7 @@ using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using OpenNest.Controls;
using OpenNest.Geometry;
namespace OpenNest.Actions
{

1
OpenNest/Actions/ActionZoomWindow.cs
View File

@@ -2,6 +2,7 @@
using System.Drawing;
using System.Windows.Forms;
using OpenNest.Controls;
using OpenNest.Geometry;
namespace OpenNest.Actions
{

1
OpenNest/Controls/DrawControl.cs
View File

@@ -2,6 +2,7 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Windows.Forms;
using OpenNest.Geometry;
namespace OpenNest.Controls
{

1
OpenNest/Controls/LayoutViewGL.cs
View File

@@ -5,6 +5,7 @@ using OpenTK.Graphics.OpenGL;
using System;
using System.Drawing;
using System.Windows.Forms;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.Controls

1
OpenNest/Controls/PlateView.cs
View File

@@ -9,6 +9,7 @@ using System.Windows.Forms;
using OpenNest.Actions;
using OpenNest.CNC;
using OpenNest.Collections;
using OpenNest.Geometry;
using OpenNest.Math;
using Action = OpenNest.Actions.Action;
using Timer = System.Timers.Timer;

5
OpenNest/Forms/EditNestInfoForm.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Windows.Forms;
using OpenNest.Geometry;
using Timer = System.Timers.Timer;
namespace OpenNest.Forms
@@ -160,7 +161,7 @@ namespace OpenNest.Forms
{
Size size;
if (!OpenNest.Size.TryParse(sizeBox.Text, out size))
if (!OpenNest.Geometry.Size.TryParse(sizeBox.Text, out size))
{
applyButton.Enabled = false;
return;
@@ -209,7 +210,7 @@ namespace OpenNest.Forms
nest.DateCreated = DateCreated;
nest.DateLastModified = DateLastModified;
nest.PlateDefaults.Thickness = Thickness;
nest.PlateDefaults.Size = OpenNest.Size.Parse(SizeString);
nest.PlateDefaults.Size = OpenNest.Geometry.Size.Parse(SizeString);
nest.PlateDefaults.PartSpacing = PartSpacing;
nest.PlateDefaults.EdgeSpacing = new Spacing(LeftSpacing, BottomSpacing, RightSpacing, TopSpacing);
nest.PlateDefaults.Quadrant = Quadrant;

7
OpenNest/Forms/EditPlateForm.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Windows.Forms;
using OpenNest.Geometry;
using Timer = System.Timers.Timer;
namespace OpenNest.Forms
@@ -130,9 +131,9 @@ namespace OpenNest.Forms
public void EnableCheck()
{
OpenNest.Size size;
OpenNest.Geometry.Size size;
if (!OpenNest.Size.TryParse(SizeString, out size))
if (!OpenNest.Geometry.Size.TryParse(SizeString, out size))
{
applyButton.Enabled = false;
return;
@@ -168,7 +169,7 @@ namespace OpenNest.Forms
private void Save()
{
plate.Size = OpenNest.Size.Parse(SizeString);
plate.Size = OpenNest.Geometry.Size.Parse(SizeString);
plate.EdgeSpacing.Left = LeftSpacing;
plate.EdgeSpacing.Top = TopSpacing;
plate.EdgeSpacing.Right = RightSpacing;

3
OpenNest/Forms/FillPlateForm.cs
View File

@@ -2,6 +2,7 @@
using System.Windows.Forms;
using OpenNest.Collections;
using OpenNest.Controls;
using OpenNest.Geometry;
namespace OpenNest.Forms
{
@@ -36,7 +37,7 @@ namespace OpenNest.Forms
control.AllowSelect = false;
control.AllowZoom = false;
control.BackColor = Color.White;
control.Plate.Size = new OpenNest.Size(0, 0);
control.Plate.Size = new OpenNest.Geometry.Size(0, 0);
control.AddPartFromDrawing(dwg, Vector.Zero);
control.MouseDoubleClick += (sender, e) =>
{

3
OpenNest/Forms/MainForm.cs
View File

@@ -6,6 +6,7 @@ using System.Reflection;
using System.Windows.Forms;
using OpenNest.Actions;
using OpenNest.Collections;
using OpenNest.Geometry;
using OpenNest.IO;
using OpenNest.Properties;
@@ -314,7 +315,7 @@ namespace OpenNest.Forms
nest.Units = Properties.Settings.Default.DefaultUnit;
nest.PlateDefaults.EdgeSpacing = new Spacing(0, 0, 0, 0);
nest.PlateDefaults.PartSpacing = 0;
nest.PlateDefaults.Size = new OpenNest.Size(100, 100);
nest.PlateDefaults.Size = new OpenNest.Geometry.Size(100, 100);
nest.PlateDefaults.Quadrant = 1;
}

5
OpenNest/IO/NestReader.cs
View File

@@ -7,6 +7,7 @@ using System.Linq;
using System.Text.RegularExpressions;
using System.Xml;
using OpenNest.CNC;
using OpenNest.Geometry;
using OpenNest.Math;
namespace OpenNest.IO
@@ -138,7 +139,7 @@ namespace OpenNest.IO
break;
case "Size":
nest.PlateDefaults.Size = Size.Parse(reader.ReadString());
nest.PlateDefaults.Size = OpenNest.Geometry.Size.Parse(reader.ReadString());
break;
case "Thickness":
@@ -293,7 +294,7 @@ namespace OpenNest.IO
break;
case "Size":
plate.Size = Size.Parse(reader.ReadString());
plate.Size = OpenNest.Geometry.Size.Parse(reader.ReadString());
break;
case "Qty":

1
OpenNest/IO/ProgramReader.cs
View File

@@ -2,6 +2,7 @@
using System.IO;
using System.Text;
using OpenNest.CNC;
using OpenNest.Geometry;
namespace OpenNest.IO
{

1
OpenNest/LayoutPart.cs
View File

@@ -2,6 +2,7 @@
using System.Drawing.Drawing2D;
using System.Windows.Forms;
using OpenNest.Controls;
using OpenNest.Geometry;
namespace OpenNest
{