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

Rename CircularMove to ArcMove

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
AJ Isaacs
2026-03-05 08:16:43 -05:00
parent 2d956fd3f7
commit 255d3962a6
9 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenNest.Core/CNC/CircularMove.cs → OpenNest.Core/CNC/ArcMove.cs
View File

@@ -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
};

2
OpenNest.Core/CNC/CodeType.cs
View File

@@ -3,7 +3,7 @@ namespace OpenNest.CNC
{
public enum CodeType
{
CircularMove,
ArcMove,
Comment,
LinearMove,
RapidMove,

8
OpenNest.Core/CNC/Program.cs
View File

@@ -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;

14
OpenNest.Core/ConvertProgram.cs
View File

@@ -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<Entity> geometry)
private static void AddArcMove(ArcMove arcMove, ref Mode mode, ref Vector curpos, ref List<Entity> 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;
}

2
OpenNest.Core/OpenNest.Core.csproj
View File

@@ -49,7 +49,7 @@
<Compile Include="Collections\DrawingCollection.cs" />
<Compile Include="EvenOdd.cs" />
<Compile Include="ConvertGeometry.cs" />
<Compile Include="CNC\CircularMove.cs" />
<Compile Include="CNC\ArcMove.cs" />
<Compile Include="CNC\Comment.cs" />
<Compile Include="CNC\ICode.cs" />
<Compile Include="CNC\LinearMove.cs" />

6
OpenNest/GraphicsHelper.cs
View File

@@ -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:

8
OpenNest/IO/DxfExporter.cs
View File

@@ -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();

26
OpenNest/IO/NestWriter.cs
View File

@@ -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();
}

2
OpenNest/IO/ProgramReader.cs
View File

@@ -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),