From ec6b72d7c23685107c67e79da0388a9b045f8aab Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Fri, 27 Apr 2018 10:52:33 +0000 Subject: [PATCH] --- CMS_CORE_Application/Form1.cs | 1 + CMS_CORE_Library/CMS_CORE_Library.csproj | 1 + CMS_CORE_Library/DataStructures.cs | 50 +++--------------- CMS_CORE_Library/Demo/Nc_Demo.cs | 28 ++++++++++ CMS_CORE_Library/Siemens/Nc_Siemens.cs | 1 + .../CMS_Core_Nc_Demo_Application.csproj | 3 +- .../Nc_Demo_Application/Nc_Demo_Db.db | Bin 49152 -> 69632 bytes .../Properties/Resources.resx | 18 ++++--- .../Nc_Demo_Application/Resources/refresh.png | Bin 378 -> 313 bytes .../Resources/removeButton.png | Bin 0 -> 145 bytes .../Views/DemoApplicationForm.Designer.cs | 3 +- .../Views/DemoApplicationForm.resx | 11 ++++ 12 files changed, 64 insertions(+), 52 deletions(-) create mode 100644 CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Resources/removeButton.png diff --git a/CMS_CORE_Application/Form1.cs b/CMS_CORE_Application/Form1.cs index 8f375f2..3fe034b 100644 --- a/CMS_CORE_Application/Form1.cs +++ b/CMS_CORE_Application/Form1.cs @@ -193,6 +193,7 @@ namespace CMS_CORE_Application Name = "Da demo" }; cmsError = N.TOOLS_WAddFamily(ref family); + cmsError = N.TOOLS_RConfiguration(ref toolsConfig); // N.PLC_WPowerOnData(6, true); //N.PLC_RFunctionAccess(ref functionality); diff --git a/CMS_CORE_Library/CMS_CORE_Library.csproj b/CMS_CORE_Library/CMS_CORE_Library.csproj index a0ff0cf..d0d2e9d 100644 --- a/CMS_CORE_Library/CMS_CORE_Library.csproj +++ b/CMS_CORE_Library/CMS_CORE_Library.csproj @@ -149,6 +149,7 @@ + diff --git a/CMS_CORE_Library/DataStructures.cs b/CMS_CORE_Library/DataStructures.cs index a12a5a6..ba83755 100644 --- a/CMS_CORE_Library/DataStructures.cs +++ b/CMS_CORE_Library/DataStructures.cs @@ -274,7 +274,7 @@ namespace CMS_CORE_Library public string Name; } - #endregion Data structor models + #endregion Data structure models /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -349,7 +349,6 @@ namespace CMS_CORE_Library public const int ALARMS_NUMBER = 1024; public const int HEADS_NUMBER = 20; - public enum HEAD_OVERRIDE_SIGN { PLUS = 0, @@ -357,6 +356,7 @@ namespace CMS_CORE_Library } /** Process-Status */ + public enum PROC_STATUS : ushort { /** Idle-Status */ @@ -374,6 +374,7 @@ namespace CMS_CORE_Library }; /** CMS-Process-Mode */ + public enum PROC_MODE : ushort { /** Automatic-Mode */ @@ -421,56 +422,17 @@ namespace CMS_CORE_Library SPINDLE = 1, MAGAZINE_GROUND = 2 } - + public class ToolConfiguration { public string Name; public string Type; + public string Category; public Dictionary SelectValues; } - public static List SiemensToolsConfig = new List() - { - new ToolConfiguration{Name = "id", Type = "int", SelectValues = null}, - new ToolConfiguration{Name = "name", Type = "string", SelectValues = null}, - new ToolConfiguration{Name = "childId", Type = "int", SelectValues = null}, - new ToolConfiguration{Name = "isActive", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "isInhibited", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "fixedPlace", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "isMeasured", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "changeTool", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "isInUse", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "preAlarm", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "cooling1", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "cooling2", Type = "boolean", SelectValues = null}, - new ToolConfiguration{Name = "rotation", Type = "select", - SelectValues = new Dictionary() - { - {0, "none"}, - {1, "clockWhise"}, - {2, "counterClockWhise"} - }}, - new ToolConfiguration{Name = "toolLife", Type="select", SelectValues = new Dictionary() - { - {0, "toolLifeType"}, - {1, "countLife"}, - {2, "wearLife"} - }}, - new ToolConfiguration{Name = "edgeId", Type = "int", SelectValues = null}, - new ToolConfiguration{Name = "edgeResidualLife", Type = "double", SelectValues = null}, - new ToolConfiguration{Name = "edgeNominalLife", Type = "double", SelectValues = null}, - new ToolConfiguration{Name = "edgeNominalLife", Type = "double", SelectValues = null}, - new ToolConfiguration{Name = "edgePreAlarmVal", Type = "double", SelectValues = null}, - new ToolConfiguration{Name= "toolType", Type = "select", - SelectValues = new Dictionary() - { - {100, "milling"}, - {110, "ballNoseAndMill"}, - {111, "canonicalBallEnd"}, - {120, "endMill" } - }} - }; + public class MagazineModel { public int Id; diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index faf42f6..71bfb49 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -14,6 +14,7 @@ using System.Threading; using static CMS_CORE.Nc; using static CMS_CORE_Library.DataStructures; using static CMS_CORE.Demo.MEMORY_ADDRESS; +using static CMS_CORE_Library.ToolConfigurations; namespace CMS_CORE.Demo { @@ -23,6 +24,7 @@ namespace CMS_CORE.Demo private ChannelFactory cf; private ILibraryService serverService; + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #region Contructor & global methods @@ -1841,6 +1843,7 @@ namespace CMS_CORE.Demo } } + public override CmsError TOOLS_RFamilyData(ref List families) { // Check if the NC Demo is Connected @@ -1876,6 +1879,31 @@ namespace CMS_CORE.Demo } } + //public override CmsError TOOLS_WUpdateFamilyData(int id, string name) + //{ + // // Check if the NC Demo is Connected + // CmsError cmsError = CheckConnection(); + // if (cmsError.IsError()) + // return cmsError; + // try + // { + // DemoFamilyModel demo = new DemoFamilyModel() + // { + // Id = id, + // Name = name + // }; + + // // Get families data + // serverService.PutFamily(); + + + // return NO_ERROR; + // } + // catch (Exception ex) + // { + // return ManageException(ex); + // } + //} public override CmsError TOOLS_WAddFamily(ref FamilyModel family) { diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index aa727b3..5c79dbc 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -16,6 +16,7 @@ using static CMS_CORE.Nc; using static CMS_CORE.Siemens.MEMORY_ADDRESS; using static CMS_CORE_Library.DataStructures; using static Siemens.Sinumerik.Operate.Services.ToolMngmntSvc; +using static CMS_CORE_Library.ToolConfigurations; namespace CMS_CORE.Siemens { 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 4402eb7..7c883f9 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 @@ -184,7 +184,8 @@ - + + Always 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 index 7ef99dae006128bda96f26f1af7212ba332ddac2..d9440ecba10863e3150abe36f35b9d57ac6145ac 100644 GIT binary patch delta 3806 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/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAABISURBVDhPY8AGvn379h8bhkoTBiDFFl0mKHg4GwCSwIax + YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAAABISURBVDhPY8AGvn379h8bhkoTBiDFFl0mKHg4GwCSwIax GYANY7WNWDycDMCGsSnGhqFxgQpAEtgMgEoTBsPEAGwYKo0EGBgAMACkrMWZPQwAAAAASUVORK5CYII= - - - ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAFzUkdCAK7O + HOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAAsSAAALEgHS3X78AAAA2klEQVQ4T73TzQoBURjG8dnh + EqRcgAUbGws3IUquwtIFKAtbG5dgo1wE8rEhXISykfJRPv7PMHXGnImEp34157yd9zRnzji/SAJNrHDA + CUs0kMYMI1hTwQ7XNwRSxgUqdpBDFBEUcEZogyS8nauaeMoc5uJAgzY0qZ1tGcJcPIAvG6iQcUcfRKfa + vz/+J1OEfspXyUKvu3ZHRtTVPCgdnC09qN5yR0bMxTLBc2pQbQvdWF/Mxbo0JcQe8ujCqxURiNkgjHZW + Y2t0qmOkUIdu3xF7LKCfKY5vxnFu9N9UT/M6R8UAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAAAmSURBVDhPYxgFVADfvn37TwkGG+Dk5EQWHk4GUIKhcTEK + YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAAAmSURBVDhPYxgFVADfvn37TwkGG+Dk5EQWHk4GUIKhcTEK yAcMDABULP5BZjjimQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAABRSURBVDhPY6AK+Pbt239S8NevX+dDtUIASJAheA4cf3j/ + YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAAABRSURBVDhPY6AK+Pbt239S8NevX+dDtUIASJAheA4cf3j/ EY6RxUB0zIR9mIaQYgAIwwyBaifdABAm2gBkjKyGtgYQg0cNGJQGkIOh2ikBDAwAR/4LjdUkCHIAAAAA SUVORK5CYII= diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Resources/refresh.png b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Resources/refresh.png index a214ed9867acaedf28633513d4dd332666b1e981..3dc51976fe843cf0cfdad1342ba4466efad3b177 100644 GIT binary patch delta 284 zcmV+%0ptGq0=WVqiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyxe*oJ_ zL_t(IjlI&bN`o;JhT#WVP)BFMOVFi@L)Q+DrGg0FgJbW&!PUjZy-UHHuoSx}C_#`ACCnd|z2GXkaydn>lzdx0@E(Nyj6s%aSYPm^sPI}CSkTI4)D+)+ zOS#5{>SYXWf__;R%5Az!B)5Y$R7`BvV2UGbg{Y$&X|2@LRvF)6FrHC~_J?>y10UE9 iF~Kvgaq17%Px1>nA5|I-nTz-U0000`&MO<`7NnHNTkwWr zy_nf-+opXu=0Asmf*xQC{do#hQNctW;eAn{ig*9C8uK{C6Ta#M zYEQD&7{+-Fxx^-xn+SYjH%0g@e;%>W&{rRRfyu1H;Vg!aH0i724l5~wVJ?O=etC^; z45SK&V`0y8<3TuZNob{J$D>4U0)z{vUDoiCg}^hWIuMu^E~~BuuCUR8zy$vhyVZp diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Resources/removeButton.png b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Resources/removeButton.png new file mode 100644 index 0000000000000000000000000000000000000000..cdebb806174f69c276964356ab29ebb0f2760ec1 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;pqi(PV~B-+vIJ`g!~K1=zx_Gcq#rza;vy#J l#}?4Eu+Wg}1UnB8Lx|2l$25yaGl4o7JYD@<);T3K0RT+pC8huX literal 0 HcmV?d00001 diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs index 0bd23c4..b7945df 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs @@ -35,6 +35,7 @@ namespace Nc_Demo_Application System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DemoApplicationForm)); this.serverStatusLabel = new System.Windows.Forms.Label(); this.ncDataPage = new System.Windows.Forms.TabPage(); this.toolStrip5 = new Nc_Demo_Application.Views.ToolStripEx(); @@ -1420,7 +1421,7 @@ namespace Nc_Demo_Application // refreshToolUI // this.refreshToolUI.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.refreshToolUI.Image = global::Nc_Demo_Application.Properties.Resources.refresh; + this.refreshToolUI.Image = ((System.Drawing.Image)(resources.GetObject("refreshToolUI.Image"))); this.refreshToolUI.ImageTransparentColor = System.Drawing.Color.Magenta; this.refreshToolUI.Name = "refreshToolUI"; this.refreshToolUI.Size = new System.Drawing.Size(23, 22); diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx index c7b5ef4..bf2f2bf 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx @@ -162,4 +162,15 @@ 647, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADaSURBVDhPvdPNCgFRGMbx2eESpFyABRsbCzchSq7C0gUo + C1sbl2CjXATysSFchLKR8lE+/s8wdcaciYSnfjXnvJ33NGfOOL9IAk2scMAJSzSQxgwjWFPBDtc3BFLG + BSp2kEMUERRwRmiDJLydq5p4yhzm4kCDNjSpnW0Zwlw8gC8bqJBxRx9Ep9q/P/4nU4R+ylfJQq+7dkdG + 1NU8KB2cLT2o3nJHRszFMsFzalBtC91YX8zFujQlxB7y6MKrFRGI2SCMdlZja3SqY6RQh27fEXssoJ8p + jm/GcW7031RP8zpHxQAAAABJRU5ErkJggg== + + \ No newline at end of file