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

style(io): apply consistent formatting and remove unused usings

Browse Source 
Whitespace/indentation cleanup (formatter pass) plus unused using
directives. No behavior change.
This commit is contained in:
aj
2026-09-22 09:51:18 -04:00
parent a0417a6077
commit b14cb9d10a
6 changed files with 149 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.IO/Bending/SolidWorksBendDetector.cs
-1
View File
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
OpenNest.IO/ChrFont.cs
-1
View File
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
OpenNest.IO/Extensions.cs
-1
View File
@@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq;
using ACadSharp.Entities; using ACadSharp.Entities;
using CSMath; using CSMath;
using OpenNest.Geometry; using OpenNest.Geometry;
OpenNest.IO/NestWriter.cs
+104 -105
View File
@@ -5,7 +5,6 @@ using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.Json; using System.Text.Json;
using OpenNest.Bending;
using OpenNest.CNC; using OpenNest.CNC;
using OpenNest.Engine.BestFit; using OpenNest.Engine.BestFit;
using static OpenNest.IO.NestFormat; using static OpenNest.IO.NestFormat;
@@ -92,11 +91,11 @@ namespace OpenNest.IO
Plates = BuildPlateDtos(), Plates = BuildPlateDtos(),
PlateOptions = PlateOptions =
nest.PlateOptions?.Select(o => new PlateOptionDto nest.PlateOptions?.Select(o => new PlateOptionDto
{ {
Width = o.Width, Width = o.Width,
Length = o.Length, Length = o.Length,
Cost = o.Cost, Cost = o.Cost,
}) })
.ToList() .ToList()
?? new(), ?? new(),
SalvageRate = nest.SalvageRate, SalvageRate = nest.SalvageRate,
@@ -169,16 +168,16 @@ namespace OpenNest.IO
}, },
Bends = Bends =
d.Bends?.Select(b => new BendDto d.Bends?.Select(b => new BendDto
{ {
StartX = b.StartPoint.X, StartX = b.StartPoint.X,
StartY = b.StartPoint.Y, StartY = b.StartPoint.Y,
EndX = b.EndPoint.X, EndX = b.EndPoint.X,
EndY = b.EndPoint.Y, EndY = b.EndPoint.Y,
Direction = b.Direction.ToString(), Direction = b.Direction.ToString(),
Angle = b.Angle, Angle = b.Angle,
Radius = b.Radius, Radius = b.Radius,
NoteText = b.NoteText ?? "", NoteText = b.NoteText ?? "",
}) })
.ToList() .ToList()
?? new List<BendDto>(), ?? new List<BendDto>(),
} }
@@ -436,100 +435,100 @@ namespace OpenNest.IO
switch (code.Type) switch (code.Type)
{ {
case CodeType.ArcMove: case CodeType.ArcMove:
{
var sb = new StringBuilder();
var arcMove = (ArcMove)code;
var refs = arcMove.VariableRefs;
var x = FormatCoord(arcMove.EndPoint.X, "X", refs);
var y = FormatCoord(arcMove.EndPoint.Y, "Y", refs);
var i = FormatCoord(arcMove.CenterPoint.X, "I", refs);
var j = FormatCoord(arcMove.CenterPoint.Y, "J", refs);
sb.Append(
arcMove.Rotation == RotationType.CW
? $"G02X{x}Y{y}I{i}J{j}"
: $"G03X{x}Y{y}I{i}J{j}"
);
if (arcMove.Layer != LayerType.Cut)
sb.Append(GetLayerString(arcMove.Layer));
if (arcMove.Suppressed)
sb.Append(":SUPPRESSED");
return sb.ToString();
}
case CodeType.Comment:
{
var comment = (Comment)code;
return ":" + comment.Value;
}
case CodeType.LinearMove:
{
var sb = new StringBuilder();
var linearMove = (LinearMove)code;
var refs = linearMove.VariableRefs;
sb.Append(
$"G01X{FormatCoord(linearMove.EndPoint.X, "X", refs)}Y{FormatCoord(linearMove.EndPoint.Y, "Y", refs)}"
);
if (linearMove.Layer != LayerType.Cut)
sb.Append(GetLayerString(linearMove.Layer));
if (linearMove.Suppressed)
sb.Append(":SUPPRESSED");
return sb.ToString();
}
case CodeType.RapidMove:
{
var rapidMove = (RapidMove)code;
var refs = rapidMove.VariableRefs;
return $"G00X{FormatCoord(rapidMove.EndPoint.X, "X", refs)}Y{FormatCoord(rapidMove.EndPoint.Y, "Y", refs)}";
}
case CodeType.SetFeedrate:
{
var setFeedrate = (Feedrate)code;
if (setFeedrate.VariableRef != null)
return $"F${setFeedrate.VariableRef}";
return "F" + setFeedrate.Value;
}
case CodeType.SetKerf:
{
var setKerf = (Kerf)code;
switch (setKerf.Value)
{ {
case KerfType.None: var sb = new StringBuilder();
return "G40"; var arcMove = (ArcMove)code;
case KerfType.Left: var refs = arcMove.VariableRefs;
return "G41";
case KerfType.Right: var x = FormatCoord(arcMove.EndPoint.X, "X", refs);
return "G42"; var y = FormatCoord(arcMove.EndPoint.Y, "Y", refs);
var i = FormatCoord(arcMove.CenterPoint.X, "I", refs);
var j = FormatCoord(arcMove.CenterPoint.Y, "J", refs);
sb.Append(
arcMove.Rotation == RotationType.CW
? $"G02X{x}Y{y}I{i}J{j}"
: $"G03X{x}Y{y}I{i}J{j}"
);
if (arcMove.Layer != LayerType.Cut)
sb.Append(GetLayerString(arcMove.Layer));
if (arcMove.Suppressed)
sb.Append(":SUPPRESSED");
return sb.ToString();
} }
break; case CodeType.Comment:
} {
var comment = (Comment)code;
return ":" + comment.Value;
}
case CodeType.LinearMove:
{
var sb = new StringBuilder();
var linearMove = (LinearMove)code;
var refs = linearMove.VariableRefs;
sb.Append(
$"G01X{FormatCoord(linearMove.EndPoint.X, "X", refs)}Y{FormatCoord(linearMove.EndPoint.Y, "Y", refs)}"
);
if (linearMove.Layer != LayerType.Cut)
sb.Append(GetLayerString(linearMove.Layer));
if (linearMove.Suppressed)
sb.Append(":SUPPRESSED");
return sb.ToString();
}
case CodeType.RapidMove:
{
var rapidMove = (RapidMove)code;
var refs = rapidMove.VariableRefs;
return $"G00X{FormatCoord(rapidMove.EndPoint.X, "X", refs)}Y{FormatCoord(rapidMove.EndPoint.Y, "Y", refs)}";
}
case CodeType.SetFeedrate:
{
var setFeedrate = (Feedrate)code;
if (setFeedrate.VariableRef != null)
return $"F${setFeedrate.VariableRef}";
return "F" + setFeedrate.Value;
}
case CodeType.SetKerf:
{
var setKerf = (Kerf)code;
switch (setKerf.Value)
{
case KerfType.None:
return "G40";
case KerfType.Left:
return "G41";
case KerfType.Right:
return "G42";
}
break;
}
case CodeType.SubProgramCall: case CodeType.SubProgramCall:
{ {
var subProgramCall = (SubProgramCall)code; var subProgramCall = (SubProgramCall)code;
var x = System var x = System
.Math.Round(subProgramCall.Offset.X, OutputPrecision) .Math.Round(subProgramCall.Offset.X, OutputPrecision)
.ToString(CoordinateFormat); .ToString(CoordinateFormat);
var y = System var y = System
.Math.Round(subProgramCall.Offset.Y, OutputPrecision) .Math.Round(subProgramCall.Offset.Y, OutputPrecision)
.ToString(CoordinateFormat); .ToString(CoordinateFormat);
return $"G65P{subProgramCall.Id}X{x}Y{y}"; return $"G65P{subProgramCall.Id}X{x}Y{y}";
} }
} }
return string.Empty; return string.Empty;
OpenNest.IO/ProgramReader.cs
+45 -45
View File
@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
@@ -257,36 +257,36 @@ namespace OpenNest.IO
break; break;
case ':': case ':':
{
var tags = code.Value.Trim().ToUpper().Split(':');
foreach (var tag in tags)
{ {
switch (tag) var tags = code.Value.Trim().ToUpper().Split(':');
foreach (var tag in tags)
{ {
case "DISPLAY": switch (tag)
layer = LayerType.Display; {
break; case "DISPLAY":
layer = LayerType.Display;
break;
case "LEADIN": case "LEADIN":
layer = LayerType.Leadin; layer = LayerType.Leadin;
break; break;
case "LEADOUT": case "LEADOUT":
layer = LayerType.Leadout; layer = LayerType.Leadout;
break; break;
case "SCRIBE": case "SCRIBE":
layer = LayerType.Scribe; layer = LayerType.Scribe;
break; break;
case "SUPPRESSED": case "SUPPRESSED":
suppressed = true; suppressed = true;
break; break;
}
} }
break;
} }
break;
}
default: default:
section = CodeSection.Unknown; section = CodeSection.Unknown;
@@ -355,36 +355,36 @@ namespace OpenNest.IO
break; break;
case ':': case ':':
{
var tags = code.Value.Trim().ToUpper().Split(':');
foreach (var tag in tags)
{ {
switch (tag) var tags = code.Value.Trim().ToUpper().Split(':');
foreach (var tag in tags)
{ {
case "DISPLAY": switch (tag)
layer = LayerType.Display; {
break; case "DISPLAY":
layer = LayerType.Display;
break;
case "LEADIN": case "LEADIN":
layer = LayerType.Leadin; layer = LayerType.Leadin;
break; break;
case "LEADOUT": case "LEADOUT":
layer = LayerType.Leadout; layer = LayerType.Leadout;
break; break;
case "SCRIBE": case "SCRIBE":
layer = LayerType.Scribe; layer = LayerType.Scribe;
break; break;
case "SUPPRESSED": case "SUPPRESSED":
suppressed = true; suppressed = true;
break; break;
}
} }
break;
} }
break;
}
default: default:
section = CodeSection.Unknown; section = CodeSection.Unknown;
OpenNest.IO/SplitDxfWriter.cs
-1
View File
@@ -7,7 +7,6 @@ using ACadSharp.Tables;
using CSMath; using CSMath;
using OpenNest.Bending; using OpenNest.Bending;
using OpenNest.Converters; using OpenNest.Converters;
using OpenNest.Geometry;
// Disambiguate Entity — both ACadSharp.Entities and OpenNest.Geometry define it // Disambiguate Entity — both ACadSharp.Entities and OpenNest.Geometry define it
using GeoEntity = OpenNest.Geometry.Entity; using GeoEntity = OpenNest.Geometry.Entity;