diff --git a/.vs/CMS_CORE/v15/.suo b/.vs/CMS_CORE/v15/.suo index d648eff..bba2917 100644 Binary files a/.vs/CMS_CORE/v15/.suo and b/.vs/CMS_CORE/v15/.suo differ diff --git a/.vs/CMS_CORE/v15/sqlite3/storage.ide b/.vs/CMS_CORE/v15/sqlite3/storage.ide new file mode 100644 index 0000000..7c4e8e4 Binary files /dev/null and b/.vs/CMS_CORE/v15/sqlite3/storage.ide differ diff --git a/CMS_CORE.sln b/CMS_CORE.sln index f94c766..a9f9c23 100644 --- a/CMS_CORE.sln +++ b/CMS_CORE.sln @@ -1,13 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -<<<<<<< .mine -VisualStudioVersion = 15.0.27004.2006 -||||||| .r6 -VisualStudioVersion = 15.0.27004.2005 -======= VisualStudioVersion = 15.0.26730.16 ->>>>>>> .r9 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS_CORE_Application", "CMS_CORE_Application\CMS_CORE_Application.csproj", "{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}" ProjectSection(ProjectDependencies) = postProject @@ -20,48 +14,34 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS_Core_Nc_Demo_Applicatio EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Debug2|Any CPU = Debug2|Any CPU - Debug2|x86 = Debug2|x86 - Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x64.ActiveCfg = Debug|x64 + {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x64.Build.0 = Debug|x64 {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x86.ActiveCfg = Debug|x86 {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x86.Build.0 = Debug|x86 - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|Any CPU.ActiveCfg = Debug|Any CPU - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|Any CPU.Build.0 = Debug|Any CPU - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|x86.ActiveCfg = Debug|x86 - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|x86.Build.0 = Debug|x86 - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|Any CPU.Build.0 = Release|Any CPU + {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x64.ActiveCfg = Release|x64 + {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x64.Build.0 = Release|x64 {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x86.ActiveCfg = Release|x86 {EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x86.Build.0 = Release|x86 - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.ActiveCfg = Debug2|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.Build.0 = Debug2|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|Any CPU.ActiveCfg = Debug2|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|Any CPU.Build.0 = Debug2|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|x86.ActiveCfg = Debug2|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|x86.Build.0 = Debug2|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.Build.0 = Release|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.ActiveCfg = Release|Any CPU - {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.Build.0 = Release|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.ActiveCfg = Debug|x64 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.Build.0 = Debug|x64 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.ActiveCfg = Debug|x86 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.Build.0 = Debug|x86 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.ActiveCfg = Release|x64 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.Build.0 = Release|x64 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.ActiveCfg = Release|x86 + {4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.Build.0 = Release|x86 + {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x64.ActiveCfg = Debug|Any CPU + {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x64.Build.0 = Debug|Any CPU {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x86.ActiveCfg = Debug|Any CPU {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x86.Build.0 = Debug|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|Any CPU.ActiveCfg = Debug|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|Any CPU.Build.0 = Debug|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|x86.ActiveCfg = Debug|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|x86.Build.0 = Debug|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|Any CPU.Build.0 = Release|Any CPU + {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x64.ActiveCfg = Release|x64 + {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x64.Build.0 = Release|x64 {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x86.ActiveCfg = Release|Any CPU {23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection diff --git a/CMS_CORE_Application/CMS_CORE_Application.csproj b/CMS_CORE_Application/CMS_CORE_Application.csproj index acd3c3f..4291120 100644 --- a/CMS_CORE_Application/CMS_CORE_Application.csproj +++ b/CMS_CORE_Application/CMS_CORE_Application.csproj @@ -51,10 +51,27 @@ MinimumRecommendedRules.ruleset true + + true + bin\x64\Debug\ + TRACE;DEBUG;FS30D + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + - - ..\CMS_CORE_Library\bin\Debug2\CMS_CORE_Library.dll - ..\packages\SKGL.2.0.5.3\lib\SKGL.dll @@ -93,7 +110,9 @@ True Resources.resx - + + Designer + SettingsSingleFileGenerator Settings.Designer.cs @@ -110,5 +129,11 @@ + + + {4abf8eef-2b23-483e-acdc-53214fe28681} + CMS_CORE_Library + + \ No newline at end of file diff --git a/CMS_CORE_Library/CMS_CORE_Library.csproj b/CMS_CORE_Library/CMS_CORE_Library.csproj index add13dc..275fdde 100644 --- a/CMS_CORE_Library/CMS_CORE_Library.csproj +++ b/CMS_CORE_Library/CMS_CORE_Library.csproj @@ -40,12 +40,69 @@ MinimumRecommendedRules.ruleset bin\Debug2\CMS_CORE_Library.xml + + true + bin\x86\Debug\ + TRACE;DEBUG;FS30D + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE;FS30D + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\Debug2\ + TRACE;DEBUG;FS30D + bin\Debug2\CMS_CORE_Library.xml + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE;FS30D + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x64\Debug2\ + TRACE;DEBUG;FS30D + bin\Debug2\CMS_CORE_Library.xml + full + x64 + prompt + MinimumRecommendedRules.ruleset + ..\..\..\..\..\..\..\Program Files (x86)\OSAI\WinNBI\UserLibrary\CndexLinkDotNet.dll - - ..\packages\SKGL.2.0.5.3\lib\SKGL.dll + + False + ..\..\..\..\..\..\..\Program Files (x86)\Siemens\MotionControl\siemens\sinumerik\hmi\base\Siemens.Sinumerik.Operate.Services.dll @@ -86,7 +143,9 @@ - + + Designer + Reference.svcmap @@ -784,7 +843,6 @@ Reference.svcmap - @@ -801,6 +859,19 @@ Reference.cs - + + + Always + + + Always + + + Always + + + Always + + \ No newline at end of file diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 5080313..6810f7b 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -132,7 +132,7 @@ namespace CMS_CORE.Fanuc CheckConnection(); ReadStaticNCData(); - Language = ConverToSTEPLanguage(FanucLanguage); + Language = ConvertToSTEPLanguage(FanucLanguage); } @@ -1394,7 +1394,7 @@ namespace CMS_CORE.Fanuc //Convert to Step Language - private CultureInfo ConverToSTEPLanguage(byte language) + private CultureInfo ConvertToSTEPLanguage(byte language) { switch (language) { diff --git a/CMS_CORE_Library/Fwlib32.dll b/CMS_CORE_Library/Fwlib32.dll new file mode 100644 index 0000000..f297dd9 Binary files /dev/null and b/CMS_CORE_Library/Fwlib32.dll differ diff --git a/CMS_CORE_Library/Siemens.Sinumerik.Operate.Services.Wrapper.dll b/CMS_CORE_Library/Siemens.Sinumerik.Operate.Services.Wrapper.dll new file mode 100644 index 0000000..b1cd4d2 Binary files /dev/null and b/CMS_CORE_Library/Siemens.Sinumerik.Operate.Services.Wrapper.dll differ diff --git a/CMS_CORE_Library/app.config b/CMS_CORE_Library/app.config index 463a29c..7eb5359 100644 --- a/CMS_CORE_Library/app.config +++ b/CMS_CORE_Library/app.config @@ -1,15 +1,13 @@ - + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/CMS_CORE_Library/fwlib30i.dll b/CMS_CORE_Library/fwlib30i.dll new file mode 100644 index 0000000..d10e884 Binary files /dev/null and b/CMS_CORE_Library/fwlib30i.dll differ diff --git a/CMS_CORE_Library/fwlibe1.dll b/CMS_CORE_Library/fwlibe1.dll new file mode 100644 index 0000000..19ed652 Binary files /dev/null and b/CMS_CORE_Library/fwlibe1.dll differ diff --git a/CMS_CORE_Library/packages.config b/CMS_CORE_Library/packages.config deleted file mode 100644 index ebc7520..0000000 --- a/CMS_CORE_Library/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj index 1211b0e..3690949 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj @@ -34,6 +34,46 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll @@ -113,6 +153,9 @@ StartupPanel.cs + + PreserveNewest + Designer diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj.user b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj.user index 05504fa..ff598a5 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj.user +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj.user @@ -3,4 +3,10 @@ http://localhost:8080/hello + + http://localhost:8080/hello + + + http://localhost:8080/hello + \ No newline at end of file diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Nc_Demo_Db.db b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Nc_Demo_Db.db new file mode 100644 index 0000000..c5955ce Binary files /dev/null and b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Nc_Demo_Db.db differ diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.cs index aecc90e..14fa45f 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.cs @@ -327,6 +327,13 @@ namespace Nc_Demo_Application var stack = new Stack(); var rootDirectory = new DirectoryInfo(path); + if (!rootDirectory.Exists) + { + if (MessageBox.Show("Part-Program Directory not found. Do you want to create it?", "Nc Demo Application", MessageBoxButtons.YesNo) == DialogResult.Yes) + rootDirectory.Create(); + } + + // Push var node = new TreeNode(rootDirectory.Name) { Tag = rootDirectory }; stack.Push(node);