diff --git a/OpenNest.Core/CNC/ArcMove.cs b/OpenNest.Core/CNC/ArcMove.cs index af0e9ec..06773f1 100644 --- a/OpenNest.Core/CNC/ArcMove.cs +++ b/OpenNest.Core/CNC/ArcMove.cs @@ -1,4 +1,5 @@ - +using OpenNest.Geometry; + namespace OpenNest.CNC { public class ArcMove : Motion diff --git a/OpenNest.Core/CNC/LinearMove.cs b/OpenNest.Core/CNC/LinearMove.cs index 37905ba..beebca5 100644 --- a/OpenNest.Core/CNC/LinearMove.cs +++ b/OpenNest.Core/CNC/LinearMove.cs @@ -1,4 +1,6 @@ -namespace OpenNest.CNC +using OpenNest.Geometry; + +namespace OpenNest.CNC { public class LinearMove : Motion { diff --git a/OpenNest.Core/CNC/Motion.cs b/OpenNest.Core/CNC/Motion.cs index 427e0e0..6dcfbd5 100644 --- a/OpenNest.Core/CNC/Motion.cs +++ b/OpenNest.Core/CNC/Motion.cs @@ -1,4 +1,5 @@ - +using OpenNest.Geometry; + namespace OpenNest.CNC { public abstract class Motion : ICode diff --git a/OpenNest.Core/CNC/RapidMove.cs b/OpenNest.Core/CNC/RapidMove.cs index 24fe08e..4999254 100644 --- a/OpenNest.Core/CNC/RapidMove.cs +++ b/OpenNest.Core/CNC/RapidMove.cs @@ -1,4 +1,5 @@ - +using OpenNest.Geometry; + namespace OpenNest.CNC { public class RapidMove : Motion diff --git a/OpenNest.Core/ConvertMode.cs b/OpenNest.Core/ConvertMode.cs index 8e98859..f0e14f2 100644 --- a/OpenNest.Core/ConvertMode.cs +++ b/OpenNest.Core/ConvertMode.cs @@ -1,4 +1,5 @@ using OpenNest.CNC; +using OpenNest.Geometry; namespace OpenNest { diff --git a/OpenNest.Core/Drawing.cs b/OpenNest.Core/Drawing.cs index c1d7efd..0dd2dff 100644 --- a/OpenNest.Core/Drawing.cs +++ b/OpenNest.Core/Drawing.cs @@ -1,6 +1,7 @@ using System.Drawing; using System.Linq; using OpenNest.CNC; +using OpenNest.Geometry; namespace OpenNest { diff --git a/OpenNest.Core/BoundingBox.cs b/OpenNest.Core/Geometry/BoundingBox.cs similarity index 98% rename from OpenNest.Core/BoundingBox.cs rename to OpenNest.Core/Geometry/BoundingBox.cs index 5c94b75..de057c3 100644 --- a/OpenNest.Core/BoundingBox.cs +++ b/OpenNest.Core/Geometry/BoundingBox.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace OpenNest +namespace OpenNest.Geometry { public static class BoundingBox { diff --git a/OpenNest.Core/Box.cs b/OpenNest.Core/Geometry/Box.cs similarity index 99% rename from OpenNest.Core/Box.cs rename to OpenNest.Core/Geometry/Box.cs index 58d5418..e7a9755 100644 --- a/OpenNest.Core/Box.cs +++ b/OpenNest.Core/Geometry/Box.cs @@ -1,6 +1,6 @@ using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Geometry { public class Box { diff --git a/OpenNest.Core/BoxSplitter.cs b/OpenNest.Core/Geometry/BoxSplitter.cs similarity index 97% rename from OpenNest.Core/BoxSplitter.cs rename to OpenNest.Core/Geometry/BoxSplitter.cs index 30a2d7c..bc09e80 100644 --- a/OpenNest.Core/BoxSplitter.cs +++ b/OpenNest.Core/Geometry/BoxSplitter.cs @@ -1,4 +1,4 @@ -namespace OpenNest +namespace OpenNest.Geometry { public static class BoxSplitter { diff --git a/OpenNest.Core/IBoundable.cs b/OpenNest.Core/Geometry/IBoundable.cs similarity index 89% rename from OpenNest.Core/IBoundable.cs rename to OpenNest.Core/Geometry/IBoundable.cs index 2b95ead..7d1724e 100644 --- a/OpenNest.Core/IBoundable.cs +++ b/OpenNest.Core/Geometry/IBoundable.cs @@ -1,5 +1,5 @@  -namespace OpenNest +namespace OpenNest.Geometry { public interface IBoundable { diff --git a/OpenNest.Core/Size.cs b/OpenNest.Core/Geometry/Size.cs similarity index 97% rename from OpenNest.Core/Size.cs rename to OpenNest.Core/Geometry/Size.cs index 0a497b4..8d96063 100644 --- a/OpenNest.Core/Size.cs +++ b/OpenNest.Core/Geometry/Size.cs @@ -1,6 +1,6 @@ using System; -namespace OpenNest +namespace OpenNest.Geometry { public struct Size { diff --git a/OpenNest.Core/Spacing.cs b/OpenNest.Core/Geometry/Spacing.cs similarity index 94% rename from OpenNest.Core/Spacing.cs rename to OpenNest.Core/Geometry/Spacing.cs index 918fa7b..2fa2d79 100644 --- a/OpenNest.Core/Spacing.cs +++ b/OpenNest.Core/Geometry/Spacing.cs @@ -1,4 +1,4 @@ -namespace OpenNest +namespace OpenNest.Geometry { public struct Spacing { diff --git a/OpenNest.Core/Vector.cs b/OpenNest.Core/Geometry/Vector.cs similarity index 99% rename from OpenNest.Core/Vector.cs rename to OpenNest.Core/Geometry/Vector.cs index 481efdb..64dae7f 100644 --- a/OpenNest.Core/Vector.cs +++ b/OpenNest.Core/Geometry/Vector.cs @@ -1,7 +1,7 @@ using System; using OpenNest.Math; -namespace OpenNest +namespace OpenNest.Geometry { public struct Vector { diff --git a/OpenNest.Core/Nest.cs b/OpenNest.Core/Nest.cs index 5abb743..00a61b7 100644 --- a/OpenNest.Core/Nest.cs +++ b/OpenNest.Core/Nest.cs @@ -1,5 +1,6 @@ using System; using OpenNest.Collections; +using OpenNest.Geometry; namespace OpenNest { diff --git a/OpenNest.Core/OpenNest.Core.csproj b/OpenNest.Core/OpenNest.Core.csproj index bd2d247..cb6ae36 100644 --- a/OpenNest.Core/OpenNest.Core.csproj +++ b/OpenNest.Core/OpenNest.Core.csproj @@ -60,15 +60,15 @@ - - - + + + - + @@ -76,10 +76,10 @@ - + - + @@ -94,7 +94,7 @@ - + diff --git a/OpenNest.Core/Part.cs b/OpenNest.Core/Part.cs index 2a8ac44..6fcf7dd 100644 --- a/OpenNest.Core/Part.cs +++ b/OpenNest.Core/Part.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using OpenNest.CNC; +using OpenNest.Geometry; namespace OpenNest { diff --git a/OpenNest.Core/Plate.cs b/OpenNest.Core/Plate.cs index a3ea9e4..5e01d5b 100644 --- a/OpenNest.Core/Plate.cs +++ b/OpenNest.Core/Plate.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using OpenNest.Collections; +using OpenNest.Geometry; using OpenNest.Math; namespace OpenNest diff --git a/OpenNest.Core/Sequence.cs b/OpenNest.Core/Sequence.cs index e1f1833..250bd76 100644 --- a/OpenNest.Core/Sequence.cs +++ b/OpenNest.Core/Sequence.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OpenNest.Geometry; namespace OpenNest { diff --git a/OpenNest.Engine/CirclePacking/Bin.cs b/OpenNest.Engine/CirclePacking/Bin.cs index 742be22..f191714 100644 --- a/OpenNest.Engine/CirclePacking/Bin.cs +++ b/OpenNest.Engine/CirclePacking/Bin.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using OpenNest.Geometry; namespace OpenNest.CirclePacking { diff --git a/OpenNest.Engine/CirclePacking/FillEndEven.cs b/OpenNest.Engine/CirclePacking/FillEndEven.cs index d0bc0b6..e3d6786 100644 --- a/OpenNest.Engine/CirclePacking/FillEndEven.cs +++ b/OpenNest.Engine/CirclePacking/FillEndEven.cs @@ -1,4 +1,5 @@ using System; +using OpenNest.Geometry; using OpenNest.Math; namespace OpenNest.CirclePacking diff --git a/OpenNest.Engine/CirclePacking/FillEndOdd.cs b/OpenNest.Engine/CirclePacking/FillEndOdd.cs index 6744325..f048da8 100644 --- a/OpenNest.Engine/CirclePacking/FillEndOdd.cs +++ b/OpenNest.Engine/CirclePacking/FillEndOdd.cs @@ -1,4 +1,5 @@ using System; +using OpenNest.Geometry; using OpenNest.Math; namespace OpenNest.CirclePacking diff --git a/OpenNest.Engine/NestEngine.cs b/OpenNest.Engine/NestEngine.cs index cb7f1f4..7d38fcf 100644 --- a/OpenNest.Engine/NestEngine.cs +++ b/OpenNest.Engine/NestEngine.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using OpenNest.Geometry; using OpenNest.Math; using OpenNest.RectanglePacking; diff --git a/OpenNest.Engine/RectanglePacking/Bin.cs b/OpenNest.Engine/RectanglePacking/Bin.cs index 65dfc4d..5ecff28 100644 --- a/OpenNest.Engine/RectanglePacking/Bin.cs +++ b/OpenNest.Engine/RectanglePacking/Bin.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using OpenNest.Geometry; namespace OpenNest.RectanglePacking { diff --git a/OpenNest.Engine/RectanglePacking/FillBestFit.cs b/OpenNest.Engine/RectanglePacking/FillBestFit.cs index 1c127ff..c90e292 100644 --- a/OpenNest.Engine/RectanglePacking/FillBestFit.cs +++ b/OpenNest.Engine/RectanglePacking/FillBestFit.cs @@ -1,4 +1,5 @@ using System; +using OpenNest.Geometry; using OpenNest.Math; namespace OpenNest.RectanglePacking diff --git a/OpenNest.Engine/RectanglePacking/FillEngine.cs b/OpenNest.Engine/RectanglePacking/FillEngine.cs index d071e31..8ed460c 100644 --- a/OpenNest.Engine/RectanglePacking/FillEngine.cs +++ b/OpenNest.Engine/RectanglePacking/FillEngine.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OpenNest.Geometry; namespace OpenNest.RectanglePacking { diff --git a/OpenNest.Engine/RectanglePacking/FillNoRotation.cs b/OpenNest.Engine/RectanglePacking/FillNoRotation.cs index 0d87085..14ba44c 100644 --- a/OpenNest.Engine/RectanglePacking/FillNoRotation.cs +++ b/OpenNest.Engine/RectanglePacking/FillNoRotation.cs @@ -1,4 +1,5 @@ using System; +using OpenNest.Geometry; using OpenNest.Math; namespace OpenNest.RectanglePacking diff --git a/OpenNest.Engine/RectanglePacking/FillSameRotation.cs b/OpenNest.Engine/RectanglePacking/FillSameRotation.cs index a7b5a64..a7c1504 100644 --- a/OpenNest.Engine/RectanglePacking/FillSameRotation.cs +++ b/OpenNest.Engine/RectanglePacking/FillSameRotation.cs @@ -1,4 +1,5 @@ -using OpenNest.Math; +using OpenNest.Geometry; +using OpenNest.Math; namespace OpenNest.RectanglePacking { diff --git a/OpenNest.Engine/RectanglePacking/Item.cs b/OpenNest.Engine/RectanglePacking/Item.cs index 82fd908..d1c25e2 100644 --- a/OpenNest.Engine/RectanglePacking/Item.cs +++ b/OpenNest.Engine/RectanglePacking/Item.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OpenNest.Geometry; using OpenNest.Math; namespace OpenNest.RectanglePacking diff --git a/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs b/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs index 15b1e5a..cfe99a3 100644 --- a/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs +++ b/OpenNest.Engine/RectanglePacking/PackBottomLeft.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using OpenNest.Geometry; using OpenNest.Math; namespace OpenNest.RectanglePacking diff --git a/OpenNest.Engine/RectanglePacking/PackEngine.cs b/OpenNest.Engine/RectanglePacking/PackEngine.cs index 9c4f7b3..c8459a0 100644 --- a/OpenNest.Engine/RectanglePacking/PackEngine.cs +++ b/OpenNest.Engine/RectanglePacking/PackEngine.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OpenNest.Geometry; namespace OpenNest.RectanglePacking { diff --git a/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs b/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs index dc7678e..2e3ebbf 100644 --- a/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs +++ b/OpenNest.Engine/RectanglePacking/PackFirstFitDecreasing.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using OpenNest.Geometry; namespace OpenNest.RectanglePacking { diff --git a/OpenNest/Actions/ActionAddPart.cs b/OpenNest/Actions/ActionAddPart.cs index 069a33a..145293a 100644 --- a/OpenNest/Actions/ActionAddPart.cs +++ b/OpenNest/Actions/ActionAddPart.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Windows.Forms; using OpenNest.Controls; +using OpenNest.Geometry; namespace OpenNest.Actions { diff --git a/OpenNest/Actions/ActionClone.cs b/OpenNest/Actions/ActionClone.cs index 7cc73ed..39ba338 100644 --- a/OpenNest/Actions/ActionClone.cs +++ b/OpenNest/Actions/ActionClone.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Windows.Forms; using OpenNest.Controls; +using OpenNest.Geometry; namespace OpenNest.Actions { diff --git a/OpenNest/Actions/ActionSelect.cs b/OpenNest/Actions/ActionSelect.cs index 3ffb488..4ed0eff 100644 --- a/OpenNest/Actions/ActionSelect.cs +++ b/OpenNest/Actions/ActionSelect.cs @@ -2,6 +2,7 @@ using System.Drawing; using System.Windows.Forms; using OpenNest.Controls; +using OpenNest.Geometry; namespace OpenNest.Actions { diff --git a/OpenNest/Actions/ActionSelectArea.cs b/OpenNest/Actions/ActionSelectArea.cs index 692a624..631db37 100644 --- a/OpenNest/Actions/ActionSelectArea.cs +++ b/OpenNest/Actions/ActionSelectArea.cs @@ -5,6 +5,7 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; using OpenNest.Controls; +using OpenNest.Geometry; namespace OpenNest.Actions { diff --git a/OpenNest/Actions/ActionZoomWindow.cs b/OpenNest/Actions/ActionZoomWindow.cs index ec2032d..51736fb 100644 --- a/OpenNest/Actions/ActionZoomWindow.cs +++ b/OpenNest/Actions/ActionZoomWindow.cs @@ -2,6 +2,7 @@ using System.Drawing; using System.Windows.Forms; using OpenNest.Controls; +using OpenNest.Geometry; namespace OpenNest.Actions { diff --git a/OpenNest/Controls/DrawControl.cs b/OpenNest/Controls/DrawControl.cs index 8d1c94c..98ebaf6 100644 --- a/OpenNest/Controls/DrawControl.cs +++ b/OpenNest/Controls/DrawControl.cs @@ -2,6 +2,7 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Windows.Forms; +using OpenNest.Geometry; namespace OpenNest.Controls { diff --git a/OpenNest/Controls/LayoutViewGL.cs b/OpenNest/Controls/LayoutViewGL.cs index 19a7d2a..ae08d9e 100644 --- a/OpenNest/Controls/LayoutViewGL.cs +++ b/OpenNest/Controls/LayoutViewGL.cs @@ -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 diff --git a/OpenNest/Controls/PlateView.cs b/OpenNest/Controls/PlateView.cs index 447297d..73603ca 100644 --- a/OpenNest/Controls/PlateView.cs +++ b/OpenNest/Controls/PlateView.cs @@ -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; diff --git a/OpenNest/Forms/EditNestInfoForm.cs b/OpenNest/Forms/EditNestInfoForm.cs index 76b26f4..1c9c950 100644 --- a/OpenNest/Forms/EditNestInfoForm.cs +++ b/OpenNest/Forms/EditNestInfoForm.cs @@ -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; diff --git a/OpenNest/Forms/EditPlateForm.cs b/OpenNest/Forms/EditPlateForm.cs index 112afad..4349cc5 100644 --- a/OpenNest/Forms/EditPlateForm.cs +++ b/OpenNest/Forms/EditPlateForm.cs @@ -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; diff --git a/OpenNest/Forms/FillPlateForm.cs b/OpenNest/Forms/FillPlateForm.cs index 4663d33..f838b4e 100644 --- a/OpenNest/Forms/FillPlateForm.cs +++ b/OpenNest/Forms/FillPlateForm.cs @@ -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) => { diff --git a/OpenNest/Forms/MainForm.cs b/OpenNest/Forms/MainForm.cs index 4bdda22..29bb428 100644 --- a/OpenNest/Forms/MainForm.cs +++ b/OpenNest/Forms/MainForm.cs @@ -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; } diff --git a/OpenNest/IO/NestReader.cs b/OpenNest/IO/NestReader.cs index d860f07..e498bf1 100644 --- a/OpenNest/IO/NestReader.cs +++ b/OpenNest/IO/NestReader.cs @@ -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": diff --git a/OpenNest/IO/ProgramReader.cs b/OpenNest/IO/ProgramReader.cs index 28b0da3..1ffb031 100644 --- a/OpenNest/IO/ProgramReader.cs +++ b/OpenNest/IO/ProgramReader.cs @@ -2,6 +2,7 @@ using System.IO; using System.Text; using OpenNest.CNC; +using OpenNest.Geometry; namespace OpenNest.IO { diff --git a/OpenNest/LayoutPart.cs b/OpenNest/LayoutPart.cs index e34b92d..ea9b7d8 100644 --- a/OpenNest/LayoutPart.cs +++ b/OpenNest/LayoutPart.cs @@ -2,6 +2,7 @@ using System.Drawing.Drawing2D; using System.Windows.Forms; using OpenNest.Controls; +using OpenNest.Geometry; namespace OpenNest {