diff --git a/OpenNest.Core/CNC/CircularMove.cs b/OpenNest.Core/CNC/ArcMove.cs similarity index 83% rename from OpenNest.Core/CNC/CircularMove.cs rename to OpenNest.Core/CNC/ArcMove.cs index d1a4044..af0e9ec 100644 --- a/OpenNest.Core/CNC/CircularMove.cs +++ b/OpenNest.Core/CNC/ArcMove.cs @@ -1,18 +1,18 @@  namespace OpenNest.CNC { - public class CircularMove : Motion + public class ArcMove : Motion { - public CircularMove() + public ArcMove() { } - public CircularMove(double x, double y, double i, double j, RotationType rotation = RotationType.CCW) + public ArcMove(double x, double y, double i, double j, RotationType rotation = RotationType.CCW) : this(new Vector(x, y), new Vector(i, j), rotation) { } - public CircularMove(Vector endPoint, Vector centerPoint, RotationType rotation = RotationType.CCW) + public ArcMove(Vector endPoint, Vector centerPoint, RotationType rotation = RotationType.CCW) { EndPoint = endPoint; CenterPoint = centerPoint; @@ -57,12 +57,12 @@ namespace OpenNest.CNC public override CodeType Type { - get { return CodeType.CircularMove; } + get { return CodeType.ArcMove; } } public override ICode Clone() { - return new CircularMove(EndPoint, CenterPoint, Rotation) + return new ArcMove(EndPoint, CenterPoint, Rotation) { Layer = Layer }; diff --git a/OpenNest.Core/CNC/CodeType.cs b/OpenNest.Core/CNC/CodeType.cs index f79b4c7..c2962ef 100644 --- a/OpenNest.Core/CNC/CodeType.cs +++ b/OpenNest.Core/CNC/CodeType.cs @@ -3,7 +3,7 @@ namespace OpenNest.CNC { public enum CodeType { - CircularMove, + ArcMove, Comment, LinearMove, RapidMove, diff --git a/OpenNest.Core/CNC/Program.cs b/OpenNest.Core/CNC/Program.cs index 094894a..008367b 100644 --- a/OpenNest.Core/CNC/Program.cs +++ b/OpenNest.Core/CNC/Program.cs @@ -180,12 +180,12 @@ namespace OpenNest.CNC public void ArcTo(double x, double y, double i, double j, RotationType rotation) { - Codes.Add(new CircularMove(x, y, i, j, rotation)); + Codes.Add(new ArcMove(x, y, i, j, rotation)); } public void ArcTo(Vector endpt, Vector center, RotationType rotation) { - Codes.Add(new CircularMove(endpt, center, rotation)); + Codes.Add(new ArcMove(endpt, center, rotation)); } public void AddSubProgram(Program program) @@ -339,9 +339,9 @@ namespace OpenNest.CNC break; } - case CodeType.CircularMove: + case CodeType.ArcMove: { - var arc = (CircularMove)code; + var arc = (ArcMove)code; var radius = arc.CenterPoint.DistanceTo(arc.EndPoint); Vector endpt; diff --git a/OpenNest.Core/ConvertProgram.cs b/OpenNest.Core/ConvertProgram.cs index 8be5f57..2562f73 100644 --- a/OpenNest.Core/ConvertProgram.cs +++ b/OpenNest.Core/ConvertProgram.cs @@ -28,8 +28,8 @@ namespace OpenNest switch (code.Type) { - case CodeType.CircularMove: - AddCircularMove((CircularMove)code, ref mode, ref curpos, ref geometry); + case CodeType.ArcMove: + AddArcMove((ArcMove)code, ref mode, ref curpos, ref geometry); break; case CodeType.LinearMove: @@ -82,10 +82,10 @@ namespace OpenNest curpos = pt; } - private static void AddCircularMove(CircularMove circularMove, ref Mode mode, ref Vector curpos, ref List geometry) + private static void AddArcMove(ArcMove arcMove, ref Mode mode, ref Vector curpos, ref List geometry) { - var center = circularMove.CenterPoint; - var endpt = circularMove.EndPoint; + var center = arcMove.CenterPoint; + var endpt = arcMove.EndPoint; if (mode == Mode.Incremental) { @@ -100,12 +100,12 @@ namespace OpenNest var dy = endpt.Y - center.Y; var radius = Math.Sqrt(dx * dx + dy * dy); - var layer = ConvertLayer(circularMove.Layer); + var layer = ConvertLayer(arcMove.Layer); if (startAngle.IsEqualTo(endAngle)) geometry.Add(new Circle(center, radius) { Layer = layer }); else - geometry.Add(new Arc(center, radius, startAngle, endAngle, circularMove.Rotation == RotationType.CW) { Layer = layer }); + geometry.Add(new Arc(center, radius, startAngle, endAngle, arcMove.Rotation == RotationType.CW) { Layer = layer }); curpos = endpt; } diff --git a/OpenNest.Core/OpenNest.Core.csproj b/OpenNest.Core/OpenNest.Core.csproj index e05b119..18bae4b 100644 --- a/OpenNest.Core/OpenNest.Core.csproj +++ b/OpenNest.Core/OpenNest.Core.csproj @@ -49,7 +49,7 @@ - + diff --git a/OpenNest/GraphicsHelper.cs b/OpenNest/GraphicsHelper.cs index ebb954f..12c7382 100644 --- a/OpenNest/GraphicsHelper.cs +++ b/OpenNest/GraphicsHelper.cs @@ -85,7 +85,7 @@ namespace OpenNest return img; } - private static void AddArc(GraphicsPath path, CircularMove arc, Mode mode, ref Vector curpos) + private static void AddArc(GraphicsPath path, ArcMove arc, Mode mode, ref Vector curpos) { var endpt = arc.EndPoint; var center = arc.CenterPoint; @@ -186,8 +186,8 @@ namespace OpenNest switch (code.Type) { - case CodeType.CircularMove: - AddArc(path, (CircularMove)code, mode, ref curpos); + case CodeType.ArcMove: + AddArc(path, (ArcMove)code, mode, ref curpos); break; case CodeType.LinearMove: diff --git a/OpenNest/IO/DxfExporter.cs b/OpenNest/IO/DxfExporter.cs index 4a9fbe6..ea56723 100644 --- a/OpenNest/IO/DxfExporter.cs +++ b/OpenNest/IO/DxfExporter.cs @@ -184,9 +184,9 @@ namespace OpenNest.IO switch (code.Type) { - case CodeType.CircularMove: - var arc = (CircularMove)code; - AddCircularMove(arc); + case CodeType.ArcMove: + var arc = (ArcMove)code; + AddArcMove(arc); break; case CodeType.LinearMove: @@ -235,7 +235,7 @@ namespace OpenNest.IO curpos = pt; } - private void AddCircularMove(CircularMove arc) + private void AddArcMove(ArcMove arc) { var center = arc.CenterPoint.ToNetDxf(); var endpt = arc.EndPoint.ToNetDxf(); diff --git a/OpenNest/IO/NestWriter.cs b/OpenNest/IO/NestWriter.cs index 69e976a..6425676 100644 --- a/OpenNest/IO/NestWriter.cs +++ b/OpenNest/IO/NestWriter.cs @@ -311,30 +311,30 @@ namespace OpenNest.IO { switch (code.Type) { - case CodeType.CircularMove: + case CodeType.ArcMove: { var sb = new StringBuilder(); - var circularMove = (CircularMove)code; + var arcMove = (ArcMove)code; - if (circularMove.Rotation == RotationType.CW) + if (arcMove.Rotation == RotationType.CW) { sb.Append(string.Format("G02X{0}Y{1}I{2}J{3}", - Math.Round(circularMove.EndPoint.X, OutputPrecision), - Math.Round(circularMove.EndPoint.Y, OutputPrecision), - Math.Round(circularMove.CenterPoint.X, OutputPrecision), - Math.Round(circularMove.CenterPoint.Y, OutputPrecision))); + Math.Round(arcMove.EndPoint.X, OutputPrecision), + Math.Round(arcMove.EndPoint.Y, OutputPrecision), + Math.Round(arcMove.CenterPoint.X, OutputPrecision), + Math.Round(arcMove.CenterPoint.Y, OutputPrecision))); } else { sb.Append(string.Format("G03X{0}Y{1}I{2}J{3}", - Math.Round(circularMove.EndPoint.X, OutputPrecision), - Math.Round(circularMove.EndPoint.Y, OutputPrecision), - Math.Round(circularMove.CenterPoint.X, OutputPrecision), - Math.Round(circularMove.CenterPoint.Y, OutputPrecision))); + Math.Round(arcMove.EndPoint.X, OutputPrecision), + Math.Round(arcMove.EndPoint.Y, OutputPrecision), + Math.Round(arcMove.CenterPoint.X, OutputPrecision), + Math.Round(arcMove.CenterPoint.Y, OutputPrecision))); } - if (circularMove.Layer != LayerType.Cut) - sb.Append(GetLayerString(circularMove.Layer)); + if (arcMove.Layer != LayerType.Cut) + sb.Append(GetLayerString(arcMove.Layer)); return sb.ToString(); } diff --git a/OpenNest/IO/ProgramReader.cs b/OpenNest/IO/ProgramReader.cs index 3f7b182..28b0da3 100644 --- a/OpenNest/IO/ProgramReader.cs +++ b/OpenNest/IO/ProgramReader.cs @@ -263,7 +263,7 @@ namespace OpenNest.IO break; } } - program.Codes.Add(new CircularMove() + program.Codes.Add(new ArcMove() { EndPoint = new Vector(x, y), CenterPoint = new Vector(i, j),