From 44f3cbfa815a2c4ad8ca0431fa8138db2fa05e92 Mon Sep 17 00:00:00 2001 From: AJ Date: Mon, 4 Oct 2021 19:06:33 -0400 Subject: [PATCH] Moved nesting to SawCut library --- CutToLength.sln | 13 +- CutToLength/Controls/BinLayoutView.cs | 3 +- CutToLength/CutToLength.csproj | 16 ++- CutToLength/Forms/MainForm.cs | 5 +- CutToLength/Forms/ResultsForm.Designer.cs | 116 +++++++++--------- CutToLength/Forms/ResultsForm.cs | 3 +- CutToLength/Forms/ResultsForm.resx | 5 +- CutToLength/{ => Models}/UIItem.cs | 1 + {CutToLength => SawCut}/ArchUnits.cs | 3 +- {CutToLength => SawCut}/Bin.cs | 2 +- {CutToLength => SawCut}/BinItem.cs | 2 +- {CutToLength => SawCut}/Fraction.cs | 2 +- .../Nesting/BestFitEngine.cs | 2 +- {CutToLength => SawCut}/Nesting/Engine2.cs | 4 +- {CutToLength => SawCut}/Nesting/IEngine.cs | 2 +- {CutToLength => SawCut}/Nesting/Result.cs | 2 +- SawCut/Properties/AssemblyInfo.cs | 36 ++++++ SawCut/SawCut.csproj | 55 +++++++++ 18 files changed, 186 insertions(+), 86 deletions(-) rename CutToLength/{ => Models}/UIItem.cs (98%) rename {CutToLength => SawCut}/ArchUnits.cs (98%) rename {CutToLength => SawCut}/Bin.cs (98%) rename {CutToLength => SawCut}/BinItem.cs (83%) rename {CutToLength => SawCut}/Fraction.cs (99%) rename {CutToLength => SawCut}/Nesting/BestFitEngine.cs (98%) rename {CutToLength => SawCut}/Nesting/Engine2.cs (99%) rename {CutToLength => SawCut}/Nesting/IEngine.cs (80%) rename {CutToLength => SawCut}/Nesting/Result.cs (90%) create mode 100644 SawCut/Properties/AssemblyInfo.cs create mode 100644 SawCut/SawCut.csproj diff --git a/CutToLength.sln b/CutToLength.sln index fc2802a..df57f0d 100644 --- a/CutToLength.sln +++ b/CutToLength.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31402.337 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CutToLength", "CutToLength\CutToLength.csproj", "{3E82A1E3-07A8-40C4-ABC4-DF24C5120073}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SawCut", "SawCut\SawCut.csproj", "{3D873FF0-6930-4BCE-A5A9-DA5C20354DEE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,8 +17,15 @@ Global {3E82A1E3-07A8-40C4-ABC4-DF24C5120073}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E82A1E3-07A8-40C4-ABC4-DF24C5120073}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E82A1E3-07A8-40C4-ABC4-DF24C5120073}.Release|Any CPU.Build.0 = Release|Any CPU + {3D873FF0-6930-4BCE-A5A9-DA5C20354DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3D873FF0-6930-4BCE-A5A9-DA5C20354DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3D873FF0-6930-4BCE-A5A9-DA5C20354DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3D873FF0-6930-4BCE-A5A9-DA5C20354DEE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {808BC913-D54E-464A-A54C-55EB8D018724} + EndGlobalSection EndGlobal diff --git a/CutToLength/Controls/BinLayoutView.cs b/CutToLength/Controls/BinLayoutView.cs index 0003d95..91f58fc 100644 --- a/CutToLength/Controls/BinLayoutView.cs +++ b/CutToLength/Controls/BinLayoutView.cs @@ -1,4 +1,5 @@ -using System.Drawing; +using SawCut; +using System.Drawing; using System.Drawing.Drawing2D; using System.Windows.Forms; diff --git a/CutToLength/CutToLength.csproj b/CutToLength/CutToLength.csproj index b205cde..b4ce752 100644 --- a/CutToLength/CutToLength.csproj +++ b/CutToLength/CutToLength.csproj @@ -83,14 +83,9 @@ - - - - Component - Form @@ -103,13 +98,10 @@ ResultsForm.cs - - - - + MainForm.cs @@ -168,6 +160,12 @@ false + + + {3D873FF0-6930-4BCE-A5A9-DA5C20354DEE} + SawCut + +