Move geometry primitives to OpenNest.Geometry namespace
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
using System.ComponentModel;
|
||||
using System.Windows.Forms;
|
||||
using OpenNest.Controls;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest.Actions
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.ComponentModel;
|
||||
using System.Windows.Forms;
|
||||
using OpenNest.Controls;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest.Actions
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using OpenNest.Controls;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest.Actions
|
||||
{
|
||||
|
||||
@@ -5,6 +5,7 @@ using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using OpenNest.Controls;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest.Actions
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using OpenNest.Controls;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest.Actions
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.Windows.Forms;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest.Controls
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) =>
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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":
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using OpenNest.CNC;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest.IO
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.Windows.Forms;
|
||||
using OpenNest.Controls;
|
||||
using OpenNest.Geometry;
|
||||
|
||||
namespace OpenNest
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user