From 29cb19492062e177153a9f9ad113adb40d8b30e9 Mon Sep 17 00:00:00 2001 From: AJ Date: Thu, 5 Mar 2020 08:00:21 -0500 Subject: [PATCH] Run EtchBendLines after creating dxf. --- .gitmodules | 3 +++ EtchBendLines | 1 + ExportDXF.sln | 19 +++++++++++++++++-- ExportDXF/ExportDXF.csproj | 19 ++++++++++++++++--- ExportDXF/Forms/MainForm.cs | 2 ++ ExportDXF/Properties/Resources.Designer.cs | 2 +- ExportDXF/Properties/Settings.Designer.cs | 22 +++++++++------------- ExportDXF/app.config | 9 +++++++++ 8 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 .gitmodules create mode 160000 EtchBendLines create mode 100644 ExportDXF/app.config diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a8bb1d1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "EtchBendLines"] + path = EtchBendLines + url = https://git.nforge.net/aj/etchbendlines.git diff --git a/EtchBendLines b/EtchBendLines new file mode 160000 index 0000000..1e66f9d --- /dev/null +++ b/EtchBendLines @@ -0,0 +1 @@ +Subproject commit 1e66f9d9604b294c2d04fc409d08c65ef21c8b5e diff --git a/ExportDXF.sln b/ExportDXF.sln index 9a1043d..24040fd 100644 --- a/ExportDXF.sln +++ b/ExportDXF.sln @@ -1,10 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29123.88 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExportDXF", "ExportDXF\ExportDXF.csproj", "{05F21D73-FD31-4E77-8D9B-41C86D4D8305}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtchBendLines", "EtchBendLines\EtchBendLines\EtchBendLines.csproj", "{229C2FB9-6AD6-4A5D-B83A-D1146573D6F9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "netDxf", "EtchBendLines\netDxf\netDxf\netDxf.csproj", "{785380E0-CEB9-4C34-82E5-60D0E33E848E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,8 +19,19 @@ Global {05F21D73-FD31-4E77-8D9B-41C86D4D8305}.Debug|Any CPU.Build.0 = Debug|Any CPU {05F21D73-FD31-4E77-8D9B-41C86D4D8305}.Release|Any CPU.ActiveCfg = Release|Any CPU {05F21D73-FD31-4E77-8D9B-41C86D4D8305}.Release|Any CPU.Build.0 = Release|Any CPU + {229C2FB9-6AD6-4A5D-B83A-D1146573D6F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {229C2FB9-6AD6-4A5D-B83A-D1146573D6F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {229C2FB9-6AD6-4A5D-B83A-D1146573D6F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {229C2FB9-6AD6-4A5D-B83A-D1146573D6F9}.Release|Any CPU.Build.0 = Release|Any CPU + {785380E0-CEB9-4C34-82E5-60D0E33E848E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {785380E0-CEB9-4C34-82E5-60D0E33E848E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {785380E0-CEB9-4C34-82E5-60D0E33E848E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {785380E0-CEB9-4C34-82E5-60D0E33E848E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4EF8ADDD-D992-4DED-BB58-F4DC0F53A4A3} + EndGlobalSection EndGlobal diff --git a/ExportDXF/ExportDXF.csproj b/ExportDXF/ExportDXF.csproj index ddc7536..0d9c55f 100644 --- a/ExportDXF/ExportDXF.csproj +++ b/ExportDXF/ExportDXF.csproj @@ -9,9 +9,10 @@ Properties ExportDXF ExportDXF - v4.0 + v4.7.2 512 false + \\SERVER4\Data\Software\ExportDXF\ true Unc @@ -23,8 +24,8 @@ false true Rogers Engineering - 6 - 1.0.3.%2a + 4 + 1.1.0.%2a false true true @@ -38,6 +39,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -47,6 +49,7 @@ TRACE prompt 4 + false 34BB4CCEF0A2D6409091A3AC44083A6F09D1DF82 @@ -60,6 +63,9 @@ false + + true + @@ -116,6 +122,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs @@ -163,6 +170,12 @@ 4.5.3.1 + + + {229c2fb9-6ad6-4a5d-b83a-d1146573d6f9} + EtchBendLines + +