From 9088af52dec3ed4583c7dcf9fffe41f20b177fb2 Mon Sep 17 00:00:00 2001 From: AJ Isaacs Date: Fri, 23 Jan 2026 09:29:13 -0500 Subject: [PATCH] refactor(PepLib.Core): reorganize files into logical folder structure Move 38 files from root directory into organized subfolders: - Enums/ (7 files): StatusType, ApplicationType, DrawingType, etc. - Geometry/ (5 files): Vector, Box, Size, Spacing, Node - Models/ (15 files): Nest, Plate, Part, Program, Report, etc. - Utilities/ (7 files): MathHelper, Tolerance, ZipHelper, etc. - Extensions/ (2 files): PartListExtensions, PlateListExtensions - Interfaces/ (1 file): IMovable Update namespaces to follow folder hierarchy (e.g., PepLib.Models). Add GlobalUsings.cs for internal backward compatibility. Update Codes/ and IO/ files with new using statements. Update PepApi.Core consumers to reference new namespaces. Co-Authored-By: Claude Opus 4.5 --- PepApi.Core/Controllers/NestsController.cs | 2 +- PepApi.Core/Extensions.cs | 2 +- PepApi.Core/PepHelper.cs | 12 ++++++------ PepLib.Core/Codes/CircularMove.cs | 4 +++- PepLib.Core/Codes/LinearMove.cs | 3 ++- PepLib.Core/Codes/Motion.cs | 4 +++- PepLib.Core/Codes/RapidMove.cs | 4 +++- PepLib.Core/Codes/SetKerf.cs | 3 ++- PepLib.Core/Codes/SubProgramCall.cs | 4 +++- PepLib.Core/{ => Enums}/ApplicationType.cs | 4 ++-- PepLib.Core/{ => Enums}/DrawingType.cs | 4 ++-- PepLib.Core/{ => Enums}/GrainType.cs | 4 ++-- PepLib.Core/{ => Enums}/KerfType.cs | 4 ++-- PepLib.Core/{ => Enums}/ProgrammingMode.cs | 2 +- PepLib.Core/{ => Enums}/RotationType.cs | 4 ++-- PepLib.Core/{ => Enums}/StatusType.cs | 4 ++-- PepLib.Core/{ => Extensions}/PartListExtensions.cs | 5 ++++- PepLib.Core/{ => Extensions}/PlateListExtensions.cs | 4 +++- PepLib.Core/{ => Geometry}/Box.cs | 4 ++-- PepLib.Core/{ => Geometry}/Node.cs | 2 +- PepLib.Core/{ => Geometry}/Size.cs | 4 ++-- PepLib.Core/{ => Geometry}/Spacing.cs | 4 ++-- PepLib.Core/{ => Geometry}/Vector.cs | 4 +++- PepLib.Core/GlobalUsings.cs | 6 ++++++ PepLib.Core/IO/DrawingInfoReader.cs | 5 ++++- PepLib.Core/IO/DrawingReader.cs | 1 + PepLib.Core/IO/LoopReader.cs | 2 ++ PepLib.Core/IO/NestInfoReader.cs | 5 ++++- PepLib.Core/IO/NestReader.cs | 1 + PepLib.Core/IO/PlateReader.cs | 3 +++ PepLib.Core/IO/ProgramReader.cs | 3 +++ PepLib.Core/IO/ReportReader.cs | 4 +++- PepLib.Core/{ => Interfaces}/IMovable.cs | 4 +++- PepLib.Core/{ => Models}/Drawing.cs | 5 +++-- PepLib.Core/{ => Models}/DrawingInfo.cs | 4 ++-- PepLib.Core/{ => Models}/Loop.cs | 6 ++++-- PepLib.Core/{ => Models}/Machine.cs | 2 +- PepLib.Core/{ => Models}/Material.cs | 2 +- PepLib.Core/{ => Models}/Nest.cs | 4 ++-- PepLib.Core/{ => Models}/NestDrawing.cs | 2 +- PepLib.Core/{ => Models}/NestIndex.cs | 4 ++-- PepLib.Core/{ => Models}/NestInfo.cs | 7 ++++--- PepLib.Core/{ => Models}/Part.cs | 6 +++++- PepLib.Core/{ => Models}/Plate.cs | 7 ++++++- PepLib.Core/{ => Models}/Program.cs | 8 ++++++-- PepLib.Core/{ => Models}/Report.Drawing.cs | 2 +- PepLib.Core/{ => Models}/Report.Plate.cs | 4 ++-- PepLib.Core/{ => Models}/Report.cs | 6 +++--- PepLib.Core/{ => Utilities}/AngleConverter.cs | 2 +- PepLib.Core/{ => Utilities}/Generic.cs | 2 +- PepLib.Core/{ => Utilities}/IniConfig.cs | 4 +++- PepLib.Core/{ => Utilities}/MathHelper.cs | 2 +- PepLib.Core/{ => Utilities}/Tolerance.cs | 2 +- PepLib.Core/{ => Utilities}/Util.cs | 4 ++-- PepLib.Core/{ => Utilities}/ZipHelper.cs | 3 +-- 55 files changed, 137 insertions(+), 76 deletions(-) rename PepLib.Core/{ => Enums}/ApplicationType.cs (90%) rename PepLib.Core/{ => Enums}/DrawingType.cs (86%) rename PepLib.Core/{ => Enums}/GrainType.cs (83%) rename PepLib.Core/{ => Enums}/KerfType.cs (77%) rename PepLib.Core/{ => Enums}/ProgrammingMode.cs (78%) rename PepLib.Core/{ => Enums}/RotationType.cs (89%) rename PepLib.Core/{ => Enums}/StatusType.cs (81%) rename PepLib.Core/{ => Extensions}/PartListExtensions.cs (93%) rename PepLib.Core/{ => Extensions}/PlateListExtensions.cs (95%) rename PepLib.Core/{ => Geometry}/Box.cs (97%) rename PepLib.Core/{ => Geometry}/Node.cs (98%) rename PepLib.Core/{ => Geometry}/Size.cs (97%) rename PepLib.Core/{ => Geometry}/Spacing.cs (94%) rename PepLib.Core/{ => Geometry}/Vector.cs (98%) create mode 100644 PepLib.Core/GlobalUsings.cs rename PepLib.Core/{ => Interfaces}/IMovable.cs (80%) rename PepLib.Core/{ => Models}/Drawing.cs (99%) rename PepLib.Core/{ => Models}/DrawingInfo.cs (98%) rename PepLib.Core/{ => Models}/Loop.cs (93%) rename PepLib.Core/{ => Models}/Machine.cs (83%) rename PepLib.Core/{ => Models}/Material.cs (87%) rename PepLib.Core/{ => Models}/Nest.cs (98%) rename PepLib.Core/{ => Models}/NestDrawing.cs (84%) rename PepLib.Core/{ => Models}/NestIndex.cs (97%) rename PepLib.Core/{ => Models}/NestInfo.cs (97%) rename PepLib.Core/{ => Models}/Part.cs (97%) rename PepLib.Core/{ => Models}/Plate.cs (98%) rename PepLib.Core/{ => Models}/Program.cs (98%) rename PepLib.Core/{ => Models}/Report.Drawing.cs (98%) rename PepLib.Core/{ => Models}/Report.Plate.cs (96%) rename PepLib.Core/{ => Models}/Report.cs (98%) rename PepLib.Core/{ => Utilities}/AngleConverter.cs (91%) rename PepLib.Core/{ => Utilities}/Generic.cs (86%) rename PepLib.Core/{ => Utilities}/IniConfig.cs (98%) rename PepLib.Core/{ => Utilities}/MathHelper.cs (98%) rename PepLib.Core/{ => Utilities}/Tolerance.cs (90%) rename PepLib.Core/{ => Utilities}/Util.cs (93%) rename PepLib.Core/{ => Utilities}/ZipHelper.cs (99%) diff --git a/PepApi.Core/Controllers/NestsController.cs b/PepApi.Core/Controllers/NestsController.cs index 9b0c00c..0121fa7 100644 --- a/PepApi.Core/Controllers/NestsController.cs +++ b/PepApi.Core/Controllers/NestsController.cs @@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; using PepApi.Core.Configuration; using PepApi.Core.Models; -using PepLib; using PepLib.Data; +using PepLib.Models; using Plate = PepApi.Core.Models.Plate; namespace PepApi.Core.Controllers; diff --git a/PepApi.Core/Extensions.cs b/PepApi.Core/Extensions.cs index 271448e..0457a42 100644 --- a/PepApi.Core/Extensions.cs +++ b/PepApi.Core/Extensions.cs @@ -1,5 +1,5 @@ using PepApi.Core.Models; -using PepLib; +using PepLib.Models; namespace PepApi.Core { diff --git a/PepApi.Core/PepHelper.cs b/PepApi.Core/PepHelper.cs index db24f65..c106549 100644 --- a/PepApi.Core/PepHelper.cs +++ b/PepApi.Core/PepHelper.cs @@ -1,4 +1,4 @@ -using PepLib; +using PepLib.Models; using Material = PepApi.Core.Models.Material; using Part = PepApi.Core.Models.Part; using Plate = PepApi.Core.Models.Plate; @@ -8,7 +8,7 @@ namespace PepApi.Core { internal static class PepHelper { - public static bool IsTestSquare(PepLib.Part part) + public static bool IsTestSquare(PepLib.Models.Part part) { if (part == null || part.DrawingName == null) return false; @@ -39,7 +39,7 @@ namespace PepApi.Core return count; } - public static bool AreTestSquaresInCorrectOrder(PepLib.Plate plate) + public static bool AreTestSquaresInCorrectOrder(PepLib.Models.Plate plate) { var partsStarted = false; @@ -68,7 +68,7 @@ namespace PepApi.Core return true; } - public static bool AreTestSquaresInCorrectOrder(PepLib.Nest nest) + public static bool AreTestSquaresInCorrectOrder(PepLib.Models.Nest nest) { foreach (var plate in nest.Plates) { @@ -229,7 +229,7 @@ namespace PepApi.Core .ToList(); } - public static Material GetMaterial(PepLib.Plate plate) + public static Material GetMaterial(PepLib.Models.Plate plate) { return new Material { @@ -240,7 +240,7 @@ namespace PepApi.Core }; } - public static Material GetMaterial(PepLib.Nest nest) + public static Material GetMaterial(PepLib.Models.Nest nest) { return GetMaterial(nest.Plates.First()); } diff --git a/PepLib.Core/Codes/CircularMove.cs b/PepLib.Core/Codes/CircularMove.cs index 7032fa5..323795d 100644 --- a/PepLib.Core/Codes/CircularMove.cs +++ b/PepLib.Core/Codes/CircularMove.cs @@ -1,4 +1,6 @@ - +using PepLib.Enums; +using PepLib.Geometry; + namespace PepLib.Codes { public class CircularMove : Motion diff --git a/PepLib.Core/Codes/LinearMove.cs b/PepLib.Core/Codes/LinearMove.cs index f4c92a8..a626a2f 100644 --- a/PepLib.Core/Codes/LinearMove.cs +++ b/PepLib.Core/Codes/LinearMove.cs @@ -1,4 +1,5 @@ - +using PepLib.Geometry; + namespace PepLib.Codes { public class LinearMove : Motion diff --git a/PepLib.Core/Codes/Motion.cs b/PepLib.Core/Codes/Motion.cs index 220418d..ed1b778 100644 --- a/PepLib.Core/Codes/Motion.cs +++ b/PepLib.Core/Codes/Motion.cs @@ -1,4 +1,6 @@ - +using PepLib.Geometry; +using PepLib.Interfaces; + namespace PepLib.Codes { public abstract class Motion : IMovable, ICode diff --git a/PepLib.Core/Codes/RapidMove.cs b/PepLib.Core/Codes/RapidMove.cs index 746e99c..fcca058 100644 --- a/PepLib.Core/Codes/RapidMove.cs +++ b/PepLib.Core/Codes/RapidMove.cs @@ -1,4 +1,6 @@ -namespace PepLib.Codes +using PepLib.Geometry; + +namespace PepLib.Codes { public class RapidMove : Motion { diff --git a/PepLib.Core/Codes/SetKerf.cs b/PepLib.Core/Codes/SetKerf.cs index 97d2c99..3a92a7c 100644 --- a/PepLib.Core/Codes/SetKerf.cs +++ b/PepLib.Core/Codes/SetKerf.cs @@ -1,4 +1,5 @@ - +using PepLib.Enums; + namespace PepLib.Codes { public class SetKerf : ICode diff --git a/PepLib.Core/Codes/SubProgramCall.cs b/PepLib.Core/Codes/SubProgramCall.cs index 47eaebd..39b517f 100644 --- a/PepLib.Core/Codes/SubProgramCall.cs +++ b/PepLib.Core/Codes/SubProgramCall.cs @@ -1,4 +1,6 @@ - +using PepLib.Models; +using PepLib.Utilities; + namespace PepLib.Codes { public class SubProgramCall : ICode diff --git a/PepLib.Core/ApplicationType.cs b/PepLib.Core/Enums/ApplicationType.cs similarity index 90% rename from PepLib.Core/ApplicationType.cs rename to PepLib.Core/Enums/ApplicationType.cs index 3c26574..55246da 100644 --- a/PepLib.Core/ApplicationType.cs +++ b/PepLib.Core/Enums/ApplicationType.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Enums { public enum ApplicationType { diff --git a/PepLib.Core/DrawingType.cs b/PepLib.Core/Enums/DrawingType.cs similarity index 86% rename from PepLib.Core/DrawingType.cs rename to PepLib.Core/Enums/DrawingType.cs index 84319cc..692f2c4 100644 --- a/PepLib.Core/DrawingType.cs +++ b/PepLib.Core/Enums/DrawingType.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Enums { public enum DrawingType { diff --git a/PepLib.Core/GrainType.cs b/PepLib.Core/Enums/GrainType.cs similarity index 83% rename from PepLib.Core/GrainType.cs rename to PepLib.Core/Enums/GrainType.cs index 42caa4a..9030ccd 100644 --- a/PepLib.Core/GrainType.cs +++ b/PepLib.Core/Enums/GrainType.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Enums { public enum GrainType { diff --git a/PepLib.Core/KerfType.cs b/PepLib.Core/Enums/KerfType.cs similarity index 77% rename from PepLib.Core/KerfType.cs rename to PepLib.Core/Enums/KerfType.cs index 90e9b53..1393406 100644 --- a/PepLib.Core/KerfType.cs +++ b/PepLib.Core/Enums/KerfType.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Enums { public enum KerfType { diff --git a/PepLib.Core/ProgrammingMode.cs b/PepLib.Core/Enums/ProgrammingMode.cs similarity index 78% rename from PepLib.Core/ProgrammingMode.cs rename to PepLib.Core/Enums/ProgrammingMode.cs index 937eb32..fe0fc05 100644 --- a/PepLib.Core/ProgrammingMode.cs +++ b/PepLib.Core/Enums/ProgrammingMode.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Enums { public enum ProgrammingMode { diff --git a/PepLib.Core/RotationType.cs b/PepLib.Core/Enums/RotationType.cs similarity index 89% rename from PepLib.Core/RotationType.cs rename to PepLib.Core/Enums/RotationType.cs index bb33c51..06952b6 100644 --- a/PepLib.Core/RotationType.cs +++ b/PepLib.Core/Enums/RotationType.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Enums { public enum RotationType { diff --git a/PepLib.Core/StatusType.cs b/PepLib.Core/Enums/StatusType.cs similarity index 81% rename from PepLib.Core/StatusType.cs rename to PepLib.Core/Enums/StatusType.cs index d08bdb3..361589a 100644 --- a/PepLib.Core/StatusType.cs +++ b/PepLib.Core/Enums/StatusType.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Enums { public enum StatusType { diff --git a/PepLib.Core/PartListExtensions.cs b/PepLib.Core/Extensions/PartListExtensions.cs similarity index 93% rename from PepLib.Core/PartListExtensions.cs rename to PepLib.Core/Extensions/PartListExtensions.cs index 810a021..8f0dba0 100644 --- a/PepLib.Core/PartListExtensions.cs +++ b/PepLib.Core/Extensions/PartListExtensions.cs @@ -1,4 +1,7 @@ -namespace PepLib +using PepLib.Geometry; +using PepLib.Models; + +namespace PepLib.Extensions { public static class PartListExtensions { diff --git a/PepLib.Core/PlateListExtensions.cs b/PepLib.Core/Extensions/PlateListExtensions.cs similarity index 95% rename from PepLib.Core/PlateListExtensions.cs rename to PepLib.Core/Extensions/PlateListExtensions.cs index d5f24eb..972404e 100644 --- a/PepLib.Core/PlateListExtensions.cs +++ b/PepLib.Core/Extensions/PlateListExtensions.cs @@ -1,4 +1,6 @@ -namespace PepLib +using PepLib.Models; + +namespace PepLib.Extensions { public static class PlateListExtensions { diff --git a/PepLib.Core/Box.cs b/PepLib.Core/Geometry/Box.cs similarity index 97% rename from PepLib.Core/Box.cs rename to PepLib.Core/Geometry/Box.cs index 03b9144..77b030d 100644 --- a/PepLib.Core/Box.cs +++ b/PepLib.Core/Geometry/Box.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Geometry { public class Box { @@ -10,7 +10,7 @@ public Box(double x, double y, double w, double h) { Location = new Vector(x, y); - Size = new PepLib.Size(0, 0); + Size = new Size(0, 0); Width = w; Height = h; } diff --git a/PepLib.Core/Node.cs b/PepLib.Core/Geometry/Node.cs similarity index 98% rename from PepLib.Core/Node.cs rename to PepLib.Core/Geometry/Node.cs index 90755a3..3a988b8 100644 --- a/PepLib.Core/Node.cs +++ b/PepLib.Core/Geometry/Node.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Geometry { public class Node { diff --git a/PepLib.Core/Size.cs b/PepLib.Core/Geometry/Size.cs similarity index 97% rename from PepLib.Core/Size.cs rename to PepLib.Core/Geometry/Size.cs index fd9f2cb..de7f61f 100644 --- a/PepLib.Core/Size.cs +++ b/PepLib.Core/Geometry/Size.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Geometry { public class Size { @@ -42,4 +42,4 @@ return string.Format("{0} x {1}", Height, Width); } } -} \ No newline at end of file +} diff --git a/PepLib.Core/Spacing.cs b/PepLib.Core/Geometry/Spacing.cs similarity index 94% rename from PepLib.Core/Spacing.cs rename to PepLib.Core/Geometry/Spacing.cs index 3fdfc81..bd83a4f 100644 --- a/PepLib.Core/Spacing.cs +++ b/PepLib.Core/Geometry/Spacing.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Geometry { public class Spacing { diff --git a/PepLib.Core/Vector.cs b/PepLib.Core/Geometry/Vector.cs similarity index 98% rename from PepLib.Core/Vector.cs rename to PepLib.Core/Geometry/Vector.cs index b17b8ea..e0a1ceb 100644 --- a/PepLib.Core/Vector.cs +++ b/PepLib.Core/Geometry/Vector.cs @@ -1,4 +1,6 @@ -namespace PepLib +using PepLib.Utilities; + +namespace PepLib.Geometry { public struct Vector { diff --git a/PepLib.Core/GlobalUsings.cs b/PepLib.Core/GlobalUsings.cs new file mode 100644 index 0000000..1a75171 --- /dev/null +++ b/PepLib.Core/GlobalUsings.cs @@ -0,0 +1,6 @@ +global using PepLib.Enums; +global using PepLib.Geometry; +global using PepLib.Models; +global using PepLib.Utilities; +global using PepLib.Extensions; +global using PepLib.Interfaces; diff --git a/PepLib.Core/IO/DrawingInfoReader.cs b/PepLib.Core/IO/DrawingInfoReader.cs index 691320a..7009f89 100644 --- a/PepLib.Core/IO/DrawingInfoReader.cs +++ b/PepLib.Core/IO/DrawingInfoReader.cs @@ -1,4 +1,7 @@ -using System.Text; +using PepLib.Enums; +using PepLib.Models; +using PepLib.Utilities; +using System.Text; namespace PepLib.IO { diff --git a/PepLib.Core/IO/DrawingReader.cs b/PepLib.Core/IO/DrawingReader.cs index 4e883a9..189bde8 100644 --- a/PepLib.Core/IO/DrawingReader.cs +++ b/PepLib.Core/IO/DrawingReader.cs @@ -1,3 +1,4 @@ +using PepLib.Models; using System.Diagnostics; using System.IO.Compression; using System.Text.RegularExpressions; diff --git a/PepLib.Core/IO/LoopReader.cs b/PepLib.Core/IO/LoopReader.cs index 7f3737c..a9e2688 100644 --- a/PepLib.Core/IO/LoopReader.cs +++ b/PepLib.Core/IO/LoopReader.cs @@ -1,4 +1,6 @@ using PepLib.Codes; +using PepLib.Geometry; +using PepLib.Models; namespace PepLib.IO { diff --git a/PepLib.Core/IO/NestInfoReader.cs b/PepLib.Core/IO/NestInfoReader.cs index d797a6f..ae35aca 100644 --- a/PepLib.Core/IO/NestInfoReader.cs +++ b/PepLib.Core/IO/NestInfoReader.cs @@ -1,4 +1,7 @@ -using System.Text; +using PepLib.Enums; +using PepLib.Models; +using PepLib.Utilities; +using System.Text; namespace PepLib.IO { diff --git a/PepLib.Core/IO/NestReader.cs b/PepLib.Core/IO/NestReader.cs index 8ccbb15..162f478 100644 --- a/PepLib.Core/IO/NestReader.cs +++ b/PepLib.Core/IO/NestReader.cs @@ -1,3 +1,4 @@ +using PepLib.Models; using System.Diagnostics; using System.IO.Compression; using System.Text; diff --git a/PepLib.Core/IO/PlateReader.cs b/PepLib.Core/IO/PlateReader.cs index 8bc3fd3..b5c0e0b 100644 --- a/PepLib.Core/IO/PlateReader.cs +++ b/PepLib.Core/IO/PlateReader.cs @@ -1,4 +1,7 @@ using PepLib.Codes; +using PepLib.Geometry; +using PepLib.Models; +using PepLib.Utilities; namespace PepLib.IO { diff --git a/PepLib.Core/IO/ProgramReader.cs b/PepLib.Core/IO/ProgramReader.cs index 95cb17f..e9cded1 100644 --- a/PepLib.Core/IO/ProgramReader.cs +++ b/PepLib.Core/IO/ProgramReader.cs @@ -1,4 +1,7 @@ using PepLib.Codes; +using PepLib.Enums; +using PepLib.Geometry; +using PepLib.Models; using System.Text; namespace PepLib.IO diff --git a/PepLib.Core/IO/ReportReader.cs b/PepLib.Core/IO/ReportReader.cs index d3a48a6..ae00e1d 100644 --- a/PepLib.Core/IO/ReportReader.cs +++ b/PepLib.Core/IO/ReportReader.cs @@ -1,4 +1,6 @@ -using System.Diagnostics; +using PepLib.Models; +using PepLib.Utilities; +using System.Diagnostics; namespace PepLib.IO { diff --git a/PepLib.Core/IMovable.cs b/PepLib.Core/Interfaces/IMovable.cs similarity index 80% rename from PepLib.Core/IMovable.cs rename to PepLib.Core/Interfaces/IMovable.cs index c76b3ac..34667eb 100644 --- a/PepLib.Core/IMovable.cs +++ b/PepLib.Core/Interfaces/IMovable.cs @@ -1,4 +1,6 @@ -namespace PepLib +using PepLib.Geometry; + +namespace PepLib.Interfaces { public interface IMovable { diff --git a/PepLib.Core/Drawing.cs b/PepLib.Core/Models/Drawing.cs similarity index 99% rename from PepLib.Core/Drawing.cs rename to PepLib.Core/Models/Drawing.cs index 7e8b280..705c426 100644 --- a/PepLib.Core/Drawing.cs +++ b/PepLib.Core/Models/Drawing.cs @@ -1,7 +1,8 @@ -using PepLib.Codes; +using PepLib.Codes; +using PepLib.Enums; using PepLib.IO; -namespace PepLib +namespace PepLib.Models { public class Drawing { diff --git a/PepLib.Core/DrawingInfo.cs b/PepLib.Core/Models/DrawingInfo.cs similarity index 98% rename from PepLib.Core/DrawingInfo.cs rename to PepLib.Core/Models/DrawingInfo.cs index 16d8ec1..8e58a12 100644 --- a/PepLib.Core/DrawingInfo.cs +++ b/PepLib.Core/Models/DrawingInfo.cs @@ -1,6 +1,7 @@ +using PepLib.Enums; using PepLib.IO; -namespace PepLib +namespace PepLib.Models { public class DrawingInfo { @@ -103,4 +104,3 @@ namespace PepLib } } } - diff --git a/PepLib.Core/Loop.cs b/PepLib.Core/Models/Loop.cs similarity index 93% rename from PepLib.Core/Loop.cs rename to PepLib.Core/Models/Loop.cs index 6cb2ffe..6e7c440 100644 --- a/PepLib.Core/Loop.cs +++ b/PepLib.Core/Models/Loop.cs @@ -1,6 +1,8 @@ -using PepLib.Codes; +using PepLib.Codes; +using PepLib.Enums; +using PepLib.Geometry; -namespace PepLib +namespace PepLib.Models { public class Loop : Program { diff --git a/PepLib.Core/Machine.cs b/PepLib.Core/Models/Machine.cs similarity index 83% rename from PepLib.Core/Machine.cs rename to PepLib.Core/Models/Machine.cs index 8fbb0c7..f653cf5 100644 --- a/PepLib.Core/Machine.cs +++ b/PepLib.Core/Models/Machine.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Models { public class Machine { diff --git a/PepLib.Core/Material.cs b/PepLib.Core/Models/Material.cs similarity index 87% rename from PepLib.Core/Material.cs rename to PepLib.Core/Models/Material.cs index e219c2d..e4f0d83 100644 --- a/PepLib.Core/Material.cs +++ b/PepLib.Core/Models/Material.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Models { public class Material { diff --git a/PepLib.Core/Nest.cs b/PepLib.Core/Models/Nest.cs similarity index 98% rename from PepLib.Core/Nest.cs rename to PepLib.Core/Models/Nest.cs index 20b50e7..58d10c7 100644 --- a/PepLib.Core/Nest.cs +++ b/PepLib.Core/Models/Nest.cs @@ -1,7 +1,7 @@ -using PepLib.Codes; +using PepLib.Codes; using PepLib.IO; -namespace PepLib +namespace PepLib.Models { public class Nest { diff --git a/PepLib.Core/NestDrawing.cs b/PepLib.Core/Models/NestDrawing.cs similarity index 84% rename from PepLib.Core/NestDrawing.cs rename to PepLib.Core/Models/NestDrawing.cs index 1a1b9b1..c8c9bba 100644 --- a/PepLib.Core/NestDrawing.cs +++ b/PepLib.Core/Models/NestDrawing.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Models { public class NestDrawing { diff --git a/PepLib.Core/NestIndex.cs b/PepLib.Core/Models/NestIndex.cs similarity index 97% rename from PepLib.Core/NestIndex.cs rename to PepLib.Core/Models/NestIndex.cs index d5ebea6..56192f2 100644 --- a/PepLib.Core/NestIndex.cs +++ b/PepLib.Core/Models/NestIndex.cs @@ -1,7 +1,7 @@ -using PepLib.IO; +using PepLib.IO; using System.Text; -namespace PepLib +namespace PepLib.Models { public class NestIndex { diff --git a/PepLib.Core/NestInfo.cs b/PepLib.Core/Models/NestInfo.cs similarity index 97% rename from PepLib.Core/NestInfo.cs rename to PepLib.Core/Models/NestInfo.cs index 23db7a1..1f93690 100644 --- a/PepLib.Core/NestInfo.cs +++ b/PepLib.Core/Models/NestInfo.cs @@ -1,6 +1,7 @@ -using PepLib.IO; +using PepLib.Enums; +using PepLib.IO; -namespace PepLib +namespace PepLib.Models { public class NestInfo { @@ -94,4 +95,4 @@ namespace PepLib return true; } } -} \ No newline at end of file +} diff --git a/PepLib.Core/Part.cs b/PepLib.Core/Models/Part.cs similarity index 97% rename from PepLib.Core/Part.cs rename to PepLib.Core/Models/Part.cs index 1808254..9fe28ec 100644 --- a/PepLib.Core/Part.cs +++ b/PepLib.Core/Models/Part.cs @@ -1,4 +1,8 @@ -namespace PepLib +using PepLib.Enums; +using PepLib.Geometry; +using PepLib.Interfaces; + +namespace PepLib.Models { public class Part : IMovable { diff --git a/PepLib.Core/Plate.cs b/PepLib.Core/Models/Plate.cs similarity index 98% rename from PepLib.Core/Plate.cs rename to PepLib.Core/Models/Plate.cs index e00d475..292019c 100644 --- a/PepLib.Core/Plate.cs +++ b/PepLib.Core/Models/Plate.cs @@ -1,4 +1,9 @@ -namespace PepLib +using PepLib.Extensions; +using PepLib.Geometry; +using PepLib.Interfaces; +using PepLib.Utilities; + +namespace PepLib.Models { public class Plate : IMovable { diff --git a/PepLib.Core/Program.cs b/PepLib.Core/Models/Program.cs similarity index 98% rename from PepLib.Core/Program.cs rename to PepLib.Core/Models/Program.cs index bb71a05..ac83971 100644 --- a/PepLib.Core/Program.cs +++ b/PepLib.Core/Models/Program.cs @@ -1,7 +1,11 @@ -using PepLib.Codes; +using PepLib.Codes; +using PepLib.Enums; +using PepLib.Geometry; +using PepLib.Interfaces; using PepLib.IO; +using PepLib.Utilities; -namespace PepLib +namespace PepLib.Models { public class Program : List, IMovable { diff --git a/PepLib.Core/Report.Drawing.cs b/PepLib.Core/Models/Report.Drawing.cs similarity index 98% rename from PepLib.Core/Report.Drawing.cs rename to PepLib.Core/Models/Report.Drawing.cs index fe09cd1..f17679f 100644 --- a/PepLib.Core/Report.Drawing.cs +++ b/PepLib.Core/Models/Report.Drawing.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Models { public partial class Report { diff --git a/PepLib.Core/Report.Plate.cs b/PepLib.Core/Models/Report.Plate.cs similarity index 96% rename from PepLib.Core/Report.Plate.cs rename to PepLib.Core/Models/Report.Plate.cs index 5a8feca..ff702c1 100644 --- a/PepLib.Core/Report.Plate.cs +++ b/PepLib.Core/Models/Report.Plate.cs @@ -1,5 +1,5 @@ - -namespace PepLib + +namespace PepLib.Models { public partial class Report { diff --git a/PepLib.Core/Report.cs b/PepLib.Core/Models/Report.cs similarity index 98% rename from PepLib.Core/Report.cs rename to PepLib.Core/Models/Report.cs index f1b83b9..9fab6a7 100644 --- a/PepLib.Core/Report.cs +++ b/PepLib.Core/Models/Report.cs @@ -1,6 +1,6 @@ -using PepLib.IO; +using PepLib.IO; -namespace PepLib +namespace PepLib.Models { public partial class Report { @@ -118,4 +118,4 @@ namespace PepLib return true; } } -} \ No newline at end of file +} diff --git a/PepLib.Core/AngleConverter.cs b/PepLib.Core/Utilities/AngleConverter.cs similarity index 91% rename from PepLib.Core/AngleConverter.cs rename to PepLib.Core/Utilities/AngleConverter.cs index b58c78c..cb4e08e 100644 --- a/PepLib.Core/AngleConverter.cs +++ b/PepLib.Core/Utilities/AngleConverter.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Utilities { public static class AngleConverter { diff --git a/PepLib.Core/Generic.cs b/PepLib.Core/Utilities/Generic.cs similarity index 86% rename from PepLib.Core/Generic.cs rename to PepLib.Core/Utilities/Generic.cs index 35a5f73..e82a8d3 100644 --- a/PepLib.Core/Generic.cs +++ b/PepLib.Core/Utilities/Generic.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Utilities { public static class Generic { diff --git a/PepLib.Core/IniConfig.cs b/PepLib.Core/Utilities/IniConfig.cs similarity index 98% rename from PepLib.Core/IniConfig.cs rename to PepLib.Core/Utilities/IniConfig.cs index 005691d..9a3a9d3 100644 --- a/PepLib.Core/IniConfig.cs +++ b/PepLib.Core/Utilities/IniConfig.cs @@ -1,4 +1,6 @@ -namespace PepLib +using PepLib.Geometry; + +namespace PepLib.Utilities { public class IniConfig { diff --git a/PepLib.Core/MathHelper.cs b/PepLib.Core/Utilities/MathHelper.cs similarity index 98% rename from PepLib.Core/MathHelper.cs rename to PepLib.Core/Utilities/MathHelper.cs index 3db3c63..fa7ded5 100644 --- a/PepLib.Core/MathHelper.cs +++ b/PepLib.Core/Utilities/MathHelper.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Utilities { public static class MathHelper { diff --git a/PepLib.Core/Tolerance.cs b/PepLib.Core/Utilities/Tolerance.cs similarity index 90% rename from PepLib.Core/Tolerance.cs rename to PepLib.Core/Utilities/Tolerance.cs index 78adc58..14a7ceb 100644 --- a/PepLib.Core/Tolerance.cs +++ b/PepLib.Core/Utilities/Tolerance.cs @@ -1,4 +1,4 @@ -namespace PepLib +namespace PepLib.Utilities { public static class Tolerance { diff --git a/PepLib.Core/Util.cs b/PepLib.Core/Utilities/Util.cs similarity index 93% rename from PepLib.Core/Util.cs rename to PepLib.Core/Utilities/Util.cs index 47be69d..19c39d0 100644 --- a/PepLib.Core/Util.cs +++ b/PepLib.Core/Utilities/Util.cs @@ -1,6 +1,6 @@ -using System.Diagnostics; +using System.Diagnostics; -namespace PepLib +namespace PepLib.Utilities { public static class Util { diff --git a/PepLib.Core/ZipHelper.cs b/PepLib.Core/Utilities/ZipHelper.cs similarity index 99% rename from PepLib.Core/ZipHelper.cs rename to PepLib.Core/Utilities/ZipHelper.cs index 3b338a0..2362486 100644 --- a/PepLib.Core/ZipHelper.cs +++ b/PepLib.Core/Utilities/ZipHelper.cs @@ -1,7 +1,7 @@ using System.IO.Compression; using System.Text.RegularExpressions; -namespace PepLib +namespace PepLib.Utilities { public static class ZipHelper { @@ -79,4 +79,3 @@ namespace PepLib } } } -