From 9ddd40432cdafe67176edd9eab4a83b71214c9db Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Fri, 4 May 2018 15:32:01 +0000 Subject: [PATCH] Added shanks update & add --- CMS_CORE_Library/DataStructures.cs | 12 +- CMS_CORE_Library/Demo/ILibraryService.cs | 15 +- CMS_CORE_Library/Demo/Models/ToolDataModel.cs | 3 +- CMS_CORE_Library/Demo/Nc_Demo.cs | 54 +- CMS_CORE_Library/Fanuc/Nc_Fanuc.cs | 5 + CMS_CORE_Library/Nc.cs | 2 + CMS_CORE_Library/Osai/Nc_Osai.cs | 5 + CMS_CORE_Library/Siemens/Nc_Siemens.cs | 15 +- .../Siemens/ToolsConfiguration.cs | 447 ----------- CMS_CORE_Library/ToolConfigurations.cs | 15 +- .../Database/DatabaseController.cs | 65 +- .../Database/Models/ToolsDataModel.cs | 9 +- .../Nc_Demo_Application/Nc_Demo_Db.db | Bin 77824 -> 77824 bytes .../Server/Service/ILibraryService.cs | 9 +- .../Server/Service/LibraryService.cs | 12 +- .../Views/DemoApplicationForm.Designer.cs | 722 +++++++++--------- .../Views/DemoApplicationForm.cs | 3 + 17 files changed, 522 insertions(+), 871 deletions(-) delete mode 100644 CMS_CORE_Library/Siemens/ToolsConfiguration.cs diff --git a/CMS_CORE_Library/DataStructures.cs b/CMS_CORE_Library/DataStructures.cs index cb04b8b..a5da1e4 100644 --- a/CMS_CORE_Library/DataStructures.cs +++ b/CMS_CORE_Library/DataStructures.cs @@ -478,6 +478,7 @@ namespace CMS_CORE_Library public ROTATION Rotation; public bool Cooling1; public bool Cooling2; + public bool IsEnabled; public bool IsActive; public bool InFixedPlace; public bool IsInhibited; @@ -500,7 +501,16 @@ namespace CMS_CORE_Library public class ShankModel { public int Id; - public List childsTools; + public string Name; + public bool IsEnabled; + public bool IsInhibited; + public bool InChangeTool; + public bool InFixedPlace; + public bool InUse; + public int LeftSize; + public int RightSize; + public int MagazinePositionType; + public List ChildsTools; } public class ShankChildModel diff --git a/CMS_CORE_Library/Demo/ILibraryService.cs b/CMS_CORE_Library/Demo/ILibraryService.cs index afd7f91..41697af 100644 --- a/CMS_CORE_Library/Demo/ILibraryService.cs +++ b/CMS_CORE_Library/Demo/ILibraryService.cs @@ -164,7 +164,7 @@ namespace Nc_Demo_Application.Server.Service void GetFamilies(out List families); [WebInvoke(Method = "PUT", UriTemplate = "tool_table/family/{oldName}", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] - void PutFamily(string oldName, DemoFamilyModel family); + void PutFamily(string oldName, ref DemoFamilyModel family); [WebInvoke(Method = "POST", UriTemplate = "tool_table/family", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void AddFamily(ref FamilyModel family); @@ -177,13 +177,13 @@ namespace Nc_Demo_Application.Server.Service #region Tools [WebGet(UriTemplate = "tool_table", BodyStyle = WebMessageBodyStyle.Wrapped, ResponseFormat = WebMessageFormat.Json)] - void GetTools(out List toolsData); + void GetTools(out List toolsData); [WebInvoke(Method = "POST", UriTemplate = "tool_table/tool", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void AddTool(ref SiemensToolModel tool); [WebInvoke(Method = "PUT", UriTemplate = "tool_table/tool", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] - void PutTool(SiemensToolModel tool); + void PutTool(ref SiemensToolModel tool); [WebInvoke(Method = "DELETE", UriTemplate = "tool_table/tool/{id}", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void DeleteTool(string id); @@ -198,10 +198,13 @@ namespace Nc_Demo_Application.Server.Service void DeleteEdge(string toolId, string edgeId); [WebGet(UriTemplate = "tool_table/shanks", BodyStyle = WebMessageBodyStyle.Wrapped, ResponseFormat = WebMessageFormat.Json)] - void GetShanks(out List shanksData); + void GetShanks(out List shanksData); [WebInvoke(Method = "POST", UriTemplate = "tool_table/shank", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] - void AddShank(out ShankModel shankData); + void AddShank(ref ShankModel shankData); + + [WebInvoke(Method = "PUT", UriTemplate = "tool_table/shank", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] + void PutShank(ref ShankModel shankData); [WebInvoke(Method = "DELETE", UriTemplate = "tool_table/shank/{id}", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void DeleteShank(string id); @@ -210,7 +213,7 @@ namespace Nc_Demo_Application.Server.Service void GetPositions(out List positionsData); [WebInvoke(Method = "PUT", UriTemplate = "tool_table/position", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] - void PutPosition(MagazinePositionsModel position); + void PutPosition(ref MagazinePositionsModel position); #endregion diff --git a/CMS_CORE_Library/Demo/Models/ToolDataModel.cs b/CMS_CORE_Library/Demo/Models/ToolDataModel.cs index 425b653..fea2cf0 100644 --- a/CMS_CORE_Library/Demo/Models/ToolDataModel.cs +++ b/CMS_CORE_Library/Demo/Models/ToolDataModel.cs @@ -3,7 +3,7 @@ using static CMS_CORE_Library.DataStructures; namespace CMS_CORE.Demo.Models { - public class ToolsDataModel + public class DemoToolsDataModel { public int Id; public int MagazineId; @@ -16,6 +16,7 @@ namespace CMS_CORE.Demo.Models public int Rotation; public bool Cooling1; public bool Cooling2; + public bool IsEnabled; public bool IsActive; public bool InFixedPlace; public bool IsInhibited; diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index d970a34..c7fdff0 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -1747,11 +1747,12 @@ namespace CMS_CORE.Demo { toolTable = new List(); // Get tools table data - serverService.GetTools(out List demoToolsData); + serverService.GetTools(out List demoToolsData); DemoEdgesConfiguration toolsConfig = new DemoEdgesConfiguration(); - foreach (ToolsDataModel demoTool in demoToolsData) + // Parse and cast demo model + foreach (DemoToolsDataModel demoTool in demoToolsData) { var toolData = new SiemensToolModel() { @@ -1765,6 +1766,7 @@ namespace CMS_CORE.Demo Rotation = (ROTATION)demoTool.Rotation, Cooling1 = demoTool.Cooling1, Cooling2 = demoTool.Cooling2, + IsEnabled = demoTool.IsEnabled, IsActive = demoTool.IsActive, InFixedPlace = demoTool.InFixedPlace, IsInhibited = demoTool.IsInhibited, @@ -1847,7 +1849,7 @@ namespace CMS_CORE.Demo try { - serverService.PutTool(tool); + serverService.PutTool(ref tool); return NO_ERROR; } @@ -1890,7 +1892,7 @@ namespace CMS_CORE.Demo try { // Get tools data in order to get tool type and its config - serverService.GetTools(out List demoToolsData); + serverService.GetTools(out List demoToolsData); // Find tool by id var demoTool = demoToolsData @@ -1952,7 +1954,7 @@ namespace CMS_CORE.Demo try { // Get tools data in order to get tool type and its config - serverService.GetTools(out List demoToolsData); + serverService.GetTools(out List demoToolsData); // Find tool by id var demoTool = demoToolsData @@ -2036,22 +2038,7 @@ namespace CMS_CORE.Demo { shanks = new List(); // Get tool table data - serverService.GetShanks(out List demoShanksData); - - foreach (ShankDataModel shank in demoShanksData) - { - shanks.Add(new ShankModel() - { - Id = shank.Id, - childsTools = shank.childsTools.Select(x => new ShankChildModel() - { - Id = x.ToolId, - MultitoolId = x.ChildId, - FamilyName = x.FamilyName, - ToolType = x.Type - }).ToList() - }); - } + serverService.GetShanks(out shanks); return NO_ERROR; } @@ -2070,7 +2057,26 @@ namespace CMS_CORE.Demo try { - serverService.AddShank(out shank); + serverService.AddShank(ref shank); + + return NO_ERROR; + } + catch (Exception ex) + { + return ManageException(ex); + } + } + + public override CmsError TOOLS_WUpdateShank(ref ShankModel shank) + { + // Check if the NC Demo is Connected + CmsError cmsError = CheckConnection(); + if (cmsError.IsError()) + return cmsError; + + try + { + serverService.PutShank(ref shank); return NO_ERROR; } @@ -2167,7 +2173,7 @@ namespace CMS_CORE.Demo }; // Get families data - serverService.PutFamily(oldName, demoFamilyData); + serverService.PutFamily(oldName, ref demoFamilyData); return NO_ERROR; } @@ -2237,7 +2243,7 @@ namespace CMS_CORE.Demo try { // Call demo update - serverService.PutPosition(position); + serverService.PutPosition(ref position); return NO_ERROR; } diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 33ca439..884829f 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -1750,6 +1750,11 @@ namespace CMS_CORE.Fanuc return NO_ERROR; } + public override CmsError TOOLS_WUpdateShank(ref ShankModel shank) + { + return NO_ERROR; + } + #endregion Tools Management /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/CMS_CORE_Library/Nc.cs b/CMS_CORE_Library/Nc.cs index 20cbfce..440854a 100644 --- a/CMS_CORE_Library/Nc.cs +++ b/CMS_CORE_Library/Nc.cs @@ -1332,6 +1332,8 @@ namespace CMS_CORE public abstract CmsError TOOLS_WUpdateEdge(int toolId, ref EdgeModel newEdge); + public abstract CmsError TOOLS_WUpdateShank(ref ShankModel shank); + #endregion Tool Table /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index 991f505..0fffd7d 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -2120,6 +2120,11 @@ namespace CMS_CORE.Osai return NO_ERROR; } + public override CmsError TOOLS_WUpdateShank(ref ShankModel shank) + { + return NO_ERROR; + } + #endregion Tools Management /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 664b068..073960c 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -1946,14 +1946,19 @@ namespace CMS_CORE.Siemens { return NO_ERROR; } - #endregion Tool Management - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + public override CmsError TOOLS_WUpdateShank(ref ShankModel shank) + { + return NO_ERROR; + } + #endregion Tool Management - #region Subordinate Private Functions + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - //Manage the Alarms - Called automatically on changes - private void AlarmsChanged(Guid guid, Alarm[] alarms) + #region Subordinate Private Functions + + //Manage the Alarms - Called automatically on changes + private void AlarmsChanged(Guid guid, Alarm[] alarms) { SiemensAlarms = alarms; } diff --git a/CMS_CORE_Library/Siemens/ToolsConfiguration.cs b/CMS_CORE_Library/Siemens/ToolsConfiguration.cs deleted file mode 100644 index 5817c73..0000000 --- a/CMS_CORE_Library/Siemens/ToolsConfiguration.cs +++ /dev/null @@ -1,447 +0,0 @@ -using System.Collections.Generic; - -namespace CMS_CORE_Library.Siemens -{ - internal class SiemensAdditionalParams - { - public class ToolConfig - { - public string Name; - public string Path; - } - - public Dictionary> ToolsSettings = new Dictionary>() - { - { - 100, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 110, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 111, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "CornerRadius", Path = "$TC_DP7["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 120, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 121, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 130, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "GeomLenght1", Path = "$TC_DP3["}, - new ToolConfig{Name = "GeomLenght2", Path = "$TC_DP4["}, - new ToolConfig{Name = "GeomLenght3", Path = "$TC_DP5["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "GeomDeltaLenght1", Path = "$TC_DP12["}, - new ToolConfig{Name = "GeomDeltaLenght2", Path = "$TC_DP13["}, - new ToolConfig{Name = "GeomDeltaLenght3", Path = "$TC_DP14["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "AdapterLenght1", Path = "$TC_DP21["}, - new ToolConfig{Name = "AdapterLenght2", Path = "$TC_DP22["}, - new ToolConfig{Name = "AdapterLenght3", Path = "$TC_DP23["}, - new ToolConfig{Name = "V", Path = "$TC_DPV["}, - new ToolConfig{Name = "Vector1", Path = "$TC_DPV3["}, - new ToolConfig{Name = "Vector2", Path = "$TC_DPV4["}, - new ToolConfig{Name = "Vector3", Path = "$TC_DPV5["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 131, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "GeomLenght1", Path = "$TC_DP3["}, - new ToolConfig{Name = "GeomLenght2", Path = "$TC_DP4["}, - new ToolConfig{Name = "GeomLenght3", Path = "$TC_DP5["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "GeomDeltaLenght1", Path = "$TC_DP12["}, - new ToolConfig{Name = "GeomDeltaLenght2", Path = "$TC_DP13["}, - new ToolConfig{Name = "GeomDeltaLenght3", Path = "$TC_DP14["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "AdapterLenght1", Path = "$TC_DP21["}, - new ToolConfig{Name = "AdapterLenght2", Path = "$TC_DP22["}, - new ToolConfig{Name = "AdapterLenght3", Path = "$TC_DP23["}, - new ToolConfig{Name = "V", Path = "$TC_DPV["}, - new ToolConfig{Name = "Vector1", Path = "$TC_DPV3["}, - new ToolConfig{Name = "Vector2", Path = "$TC_DPV4["}, - new ToolConfig{Name = "Vector3", Path = "$TC_DPV5["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 140, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "OutsideRadius", Path = "$TC_DP17["}, - new ToolConfig{Name = "ToolAngle", Path = "$TC_DP11["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 145, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 150, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "Width", Path = "$TC_DP9[" }, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15[" }, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 151, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "Width", Path = "$TC_DP9[" }, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15[" }, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 155, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "TaperAngle", Path = "$TC_DP11[" }, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 156, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "CornerRadius", Path = "$TC_DP7["}, - new ToolConfig{Name = "TaperAngle", Path = "$TC_DP11[" }, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 157, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "TaperAngle", Path = "$TC_DP11[" }, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - { - 160, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "Teeth", Path = "$TC_DPNT[" } - } - }, - //////// 200 - { - 200, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{ Name = "TipAngle", Path = "$TC_DP24["} - } - }, - { - 205, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 210, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 220, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{ Name = "TipAngle", Path = "$TC_DP24["} - } - }, - { - 230, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{ Name = "TipAngle", Path = "$TC_DP24["} - } - }, - { - 231, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 240, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "Pitch", Path = "$TC_DP9["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 241, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 242, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "Pitch", Path = "$TC_DP9["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 250, new List() - { - new ToolConfig{ Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{ Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{ Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{ Name = "Pitch", Path = "$TC_DP9["}, - new ToolConfig{ Name = "WearLenght", Path = "$TC_DP12"}, - new ToolConfig{ Name = "WearRadius", Path = "$TC_DP15["} - } - }, - ///////// 700 - { - 700, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "GeomLenght1", Path = "$TC_DP3["}, - new ToolConfig{Name = "GeomLenght2", Path = "$TC_DP4["}, - new ToolConfig{Name = "GeomLenght3", Path = "$TC_DP5["}, - //new ToolConfiguration{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "GeomSlotWidth", Path = "$TC_DP7["}, - new ToolConfig{Name = "GeomPrjection", Path = "$TC_DP8["}, - new ToolConfig{Name = "GeomWearLenght1", Path = "$TC_DP12["}, - new ToolConfig{Name = "GeomWearLenght2", Path = "$TC_DP13["}, - new ToolConfig{Name = "GeomWearLenght3", Path = "$TC_DP14["}, - new ToolConfig{Name = "Wear", Path = "$TC_DP15["}, // ? - new ToolConfig{Name = "WearSlotWdth", Path = "$TC_DP16["}, - new ToolConfig{Name = "WearGeomPrjection", Path = "$TC_DP17["}, - new ToolConfig{Name = "AdapterLenght1", Path = "$TC_DP21["}, - new ToolConfig{Name = "AdapterLenght2", Path = "$TC_DP22["}, - new ToolConfig{Name = "AdapterLenght3", Path = "$TC_DP23["} - } - }, - { - 710, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 711, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 712, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "CorrAngle", Path = "$TC_DP10["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 713, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "GeomLenght1", Path = "$TC_DP3["}, - new ToolConfig{Name = "GeomLenght2", Path = "$TC_DP4["}, - new ToolConfig{Name = "GeomLenght3", Path = "$TC_DP5["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "BoomLenght", Path = "$TC_DP7["}, - new ToolConfig{Name = "CorrAngle", Path = "$TC_DP10["}, - new ToolConfig{Name = "GeomWearLenght1", Path = "$TC_DP12["}, - new ToolConfig{Name = "GeomWearLenght2", Path = "$TC_DP13["}, - new ToolConfig{Name = "GeomWearLenght3", Path = "$TC_DP14["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "AdapterLenght1", Path = "$TC_DP21["}, - new ToolConfig{Name = "AdapterLenght2", Path = "$TC_DP22["}, - new ToolConfig{Name = "AdapterLenght3", Path = "$TC_DP23["} - } - }, - { - 714, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "GeomLenght1", Path = "$TC_DP3["}, - new ToolConfig{Name = "GeomLenght2", Path = "$TC_DP4["}, - new ToolConfig{Name = "GeomLenght3", Path = "$TC_DP5["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "BallRadius", Path = "$TC_DP7["}, - new ToolConfig{Name = "CorrAngle", Path = "$TC_DP10["}, - new ToolConfig{Name = "GeomWearLenght1", Path = "$TC_DP12["}, - new ToolConfig{Name = "GeomWearLenght2", Path = "$TC_DP13["}, - new ToolConfig{Name = "GeomWearLenght3", Path = "$TC_DP14["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "AdapterLenght1", Path = "$TC_DP21["}, - new ToolConfig{Name = "AdapterLenght2", Path = "$TC_DP22["}, - new ToolConfig{Name = "AdapterLenght3", Path = "$TC_DP23["} - } - }, - { - 725, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "GeomLenght1", Path = "$TC_DP3["}, - new ToolConfig{Name = "GeomLenght2", Path = "$TC_DP4["}, - new ToolConfig{Name = "GeomLenght3", Path = "$TC_DP5["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "CorrAngle", Path = "$TC_DP10["}, - new ToolConfig{Name = "GeomWearLenght1", Path = "$TC_DP12["}, - new ToolConfig{Name = "GeomWearLenght2", Path = "$TC_DP13["}, - new ToolConfig{Name = "GeomWearLenght3", Path = "$TC_DP14["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["}, - new ToolConfig{Name = "AdapterLenght1", Path = "$TC_DP21["}, - new ToolConfig{Name = "AdapterLenght2", Path = "$TC_DP22["}, - new ToolConfig{Name = "AdapterLenght3", Path = "$TC_DP23["} - } - }, - { - 730, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["} - } - }, - { - 900, new List() - { - new ToolConfig{Name = "CuttingEdge", Path = "$TC_DP2["}, - new ToolConfig{Name = "Lenght", Path = "$TC_DP3["}, - new ToolConfig{Name = "Radius", Path = "$TC_DP6["}, - new ToolConfig{Name = "WearLenght", Path = "$TC_DP12["}, - new ToolConfig{Name = "WearRadius", Path = "$TC_DP15["} - } - }, - }; - } -} \ No newline at end of file diff --git a/CMS_CORE_Library/ToolConfigurations.cs b/CMS_CORE_Library/ToolConfigurations.cs index 979966e..73b0b61 100644 --- a/CMS_CORE_Library/ToolConfigurations.cs +++ b/CMS_CORE_Library/ToolConfigurations.cs @@ -74,6 +74,7 @@ namespace CMS_CORE_Library new FieldsConfiguration{Name = "toolLifeType", Type="select", SelectValues = toolLifeList, Category = "general", ReadOnly = false}, new FieldsConfiguration{Name = "familyName", Type = "string", SelectValues = null, Category = "family", ReadOnly = true }, new FieldsConfiguration{Name = "childId", Type = "int", SelectValues = null, Category = "family", ReadOnly = true }, + new FieldsConfiguration{Name = "isEnabled", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, new FieldsConfiguration{Name = "isActive", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, new FieldsConfiguration{Name = "isInhibited", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, new FieldsConfiguration{Name = "inFixedPlace", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, @@ -113,7 +114,16 @@ namespace CMS_CORE_Library { ShankConfiguration = new List() { - new FieldsConfiguration{Name = "id", Type = "int", SelectValues = null, Category = "general", ReadOnly = true } + new FieldsConfiguration{Name = "id", Type = "int", SelectValues = null, Category = "general", ReadOnly = true }, + new FieldsConfiguration{Name = "name", Type = "string", SelectValues = null, Category = "general", ReadOnly = false }, + new FieldsConfiguration{Name = "isEnabled", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, + new FieldsConfiguration{Name = "isInhibited", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, + new FieldsConfiguration{Name = "inFixedPlace", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, + new FieldsConfiguration{Name = "inChangeTool", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, + new FieldsConfiguration{Name = "isInUse", Type = "boolean", SelectValues = null, Category = "state", ReadOnly = false}, + new FieldsConfiguration{Name = "leftSize", Type = "int", SelectValues = null, Category = "magazine", ReadOnly = false}, + new FieldsConfiguration{Name = "rightSize", Type = "int", SelectValues = null, Category = "magazine", ReadOnly = false}, + new FieldsConfiguration{Name = "magazinePositionType", Type = "int", SelectValues = null, Category = "magazine", ReadOnly = false}, }, ToolsConfiguration = new List() { @@ -140,10 +150,9 @@ namespace CMS_CORE_Library new FieldsConfiguration{Name = "nominalLife", Type = "double", SelectValues = null, Category = "general", ReadOnly = false }, new FieldsConfiguration{Name = "preAlmLife", Type = "double", SelectValues = null, Category = "general", ReadOnly = false } }, - EdgesAdditionalParamsConfiguration = new Dictionary>() + EdgesAdditionalParamsConfiguration = new Dictionary>() // Set value runtime, based on NC vendor }; - #endregion PUBLIC_CONFIGS_FIELDS } } \ No newline at end of file diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs index 4982010..e6dfa93 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs @@ -738,19 +738,18 @@ namespace Nc_Demo_Application.Database .Where(x => x.ShanksId == lastId) .Select(x => new ShankChildDataModel() { - ToolId = x.Id, - Type = x.ToolType, + Id = x.Id, + ToolType = x.ToolType, FamilyName = x.FamilyName, - ChildId = i++ + MultitoolId = i++ }) .ToList(); - // Convert DataTable.row into family model + // Convert DataTable.row into Shank model ShankDataModel tmpShank = new ShankDataModel { Id = lastId, Name = row["name"].ToString(), - InChangeTool = Convert.ToInt32(row["in_change_tool"]) == 1, IsEnabled = Convert.ToInt32(row["is_enabled"]) == 1, IsInhibited = Convert.ToInt32(row["is_inhibited"]) == 1, @@ -759,7 +758,7 @@ namespace Nc_Demo_Application.Database LeftSize = Convert.ToInt32(row["left_size"]), RightSize = Convert.ToInt32(row["right_size"]), MagazinePositionType = Convert.ToInt32(row["magazine_position"]), - childsTools = childTools + ChildsTools = childTools }; shanks.Add(tmpShank); @@ -777,15 +776,6 @@ namespace Nc_Demo_Application.Database { try { - SetConnection(); - - // Open the connection with database - sqlConnection.Open(); - // Create a SQLite command with query, adapter and commandbuilder in order to update. - sqlCommand = new SQLiteCommand(READ_SHANKS_QUERY, sqlConnection); - SQLiteDataAdapter adapter = new SQLiteDataAdapter(sqlCommand); - SQLiteCommandBuilder commandBuilder = new SQLiteCommandBuilder(adapter); - // Create new row that must be inserted DataRow row = ShanksDataTable.NewRow(); int id = 1; @@ -805,14 +795,10 @@ namespace Nc_Demo_Application.Database row["right_size"] = newShank.RightSize; row["magazine_position"] = newShank.RightSize; - // Add the new row + // Add the new row to the datatable ShanksDataTable.Rows.Add(row); - - // Update database - adapter.Update(ShanksDataTable); - - // Close the connection with database - sqlConnection.Close(); + // Update Database + UpdateShanks(ShanksDataTable); return newShank; } @@ -823,6 +809,38 @@ namespace Nc_Demo_Application.Database } } + public ShankDataModel UpdateShank(ShankDataModel newShank) + { + try + { + // Find row that must be update + DataRow row = ShanksDataTable.AsEnumerable().FirstOrDefault(x => Convert.ToInt32(x["id"]) == newShank.Id); + if (row == null) + return null; + + // Setup autoincrement Id + row["name"] = newShank.Name; + row["is_enabled"] = newShank.IsEnabled ? 1 : 0; + row["is_inhibited"] = newShank.IsInhibited ? 1 : 0; + row["in_change_tool"] = newShank.InChangeTool ? 1 : 0; + row["in_fixed_place"] = newShank.InFixedPlace ? 1 : 0; + row["in_use"] = newShank.InUse ? 1 : 0; + row["left_size"] = newShank.LeftSize; + row["right_size"] = newShank.RightSize; + row["magazine_position"] = newShank.RightSize; + + // Update Db + UpdateShanks(ShanksDataTable); + + return newShank; + } + catch (Exception ex) + { + Console.WriteLine("Update shanks exception: " + ex.Message); + return null; + } + } + public void DeleteShank(int id) { try @@ -894,6 +912,7 @@ namespace Nc_Demo_Application.Database ShanksId = Convert.ToInt32(row["shankId"]), Cooling1 = Convert.ToInt32(row["cooling1"]) == 1, Cooling2 = Convert.ToInt32(row["cooling2"]) == 1, + IsEnabled = Convert.ToInt32(row["isEnabled"]) == 1, IsActive = Convert.ToInt32(row["isActive"]) == 1, InFixedPlace = Convert.ToInt32(row["fixedPlace"]) == 1, IsInhibited = Convert.ToInt32(row["isInhibited"]) == 1, @@ -941,6 +960,7 @@ namespace Nc_Demo_Application.Database row["rotation"] = toolData.Rotation; row["cooling1"] = toolData.Cooling1; row["cooling2"] = toolData.Cooling2; + row["isEnabled"] = toolData.IsEnabled; row["isActive"] = toolData.IsActive; row["fixedPlace"] = toolData.InFixedPlace; row["isInhibited"] = toolData.IsInhibited; @@ -993,6 +1013,7 @@ namespace Nc_Demo_Application.Database row["rotation"] = toolData.Rotation; row["cooling1"] = toolData.Cooling1; row["cooling2"] = toolData.Cooling2; + row["isEnabled"] = toolData.IsEnabled; row["isActive"] = toolData.IsActive; row["fixedPlace"] = toolData.InFixedPlace; row["isInhibited"] = toolData.IsInhibited; diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/Models/ToolsDataModel.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/Models/ToolsDataModel.cs index 6144d3d..d94b981 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/Models/ToolsDataModel.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/Models/ToolsDataModel.cs @@ -15,6 +15,7 @@ namespace Nc_Demo_Application.Database.Models public int Rotation; public bool Cooling1; public bool Cooling2; + public bool IsEnabled; public bool IsActive; public bool InFixedPlace; public bool IsInhibited; @@ -38,15 +39,15 @@ namespace Nc_Demo_Application.Database.Models public int LeftSize; public int RightSize; public int MagazinePositionType; - public List childsTools; + public List ChildsTools; } public class ShankChildDataModel { - public int ToolId; - public int ChildId; + public int Id; + public int MultitoolId; public string FamilyName; - public int Type; + public int ToolType; } public class PositionsDataModel 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 dd18558d3f0e8c166734b08855bbfc7a730fe2ce..cc1c7520c997002fcc187bf6b6eef2cb2a0a57c5 100644 GIT binary patch delta 1579 zcmc(dUq}=|9LHyNPjCNt_glSNPCcnTLpVW~;}-{nUqJ@_Jajjnret-Xvz`#kr3sJXo<+}c=IA@H5umK8C~ zo}-=oHqnTMO|>hcYdh3Xcib4zGsLULpsuw<)b32#h&7tMMwb!Ks?nsYL$O43hu+<* znmu|O*-S=tTBbdgS-L-}hazgUZ!0L2-;C1p$}+xFAE*0{lRC7!>RQ90wy@F`I&&ec zlv1fw2@3Wp?$`fj(EM*1BtJ1na_m+9{fyU-R~+M5l4N*|a$y?55BLc4@C{~R8g3^8 z$~AB_upQW*!)1XQZlr;gF(pHWelpax9$h9EO-PH$`NLJi1x^@a;T^2NS9k@_U=qe` zX)2gJJ*7cVaI(mMR#h~;&k}OCjdQk*9W1inJU>w=xMvZ3ftT9!9API zmma#S0yQ$?0+`1f&vP74o}_V{nXm>d#kBf#hZ(5OjMyWqo}s|;OfhR7V=BjJgx|Zg zsT7lh52qSglrB!5TuZ`?s|>5?BST6wBVkQ;GeFqYbdT z65noS5hvz8#1ZvKOA~jyU>UJ6fnfqZz??0u6(@sh*Wq#z7SW+pkld0>iGDq*mkQT6lk0!-B@8o?gx3!K1uv&p8UO$Q delta 1104 zcma)*O=#3W6vt;K`!U&U^0M7sw@q|+r7cz{+d@UKpr_h{7A+{QCn1tWh3$rZiFoLj zf`}k35$aJ8FM?7UXgw5)2N6W7^-@X?TS0rND+Tc+s4uBo=itGa%*5NHI!#q5Jhj0(ZU=VC5!YMcoozM(d|F`2d z-f81XN+D{!DM=9;L`aCBivS{MBB&z7MNsN+371x4b@D+Lfr}6ofhj?mf=Qtw5CP`j zQ{9AVEMl6$Q!L*Io>Ur+YHQkp_COo*_HPbp?xR{LBvtaQZoZb4StZw!BK)B2e*Drj zUdfsWCgs>=S>{2PdD$wLt%}8*_IwlS8M@n0-Sz1ot&CVKYUct~{+AlHB}rmA<8Qdk zgK*CIZn$Je##z{GM2|GZ9DeS4>$3(dW-~+bML7`b66d~XGx$u5K&xjB9QqDW)1dyM zGVTde`dNdycc?UMImBcsB4=vSjg8*oy%mH+?% diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/ILibraryService.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/ILibraryService.cs index 1adb83c..37d4ca5 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/ILibraryService.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/ILibraryService.cs @@ -167,7 +167,7 @@ namespace Nc_Demo_Application.Server.Service void GetFamilies(out List families); [WebInvoke(Method = "PUT", UriTemplate = "tool_table/family/{oldName}", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] - void PutFamily(string oldName, FamilyModel family); + void PutFamily(string oldName, ref FamilyModel family); [WebInvoke(Method = "POST", UriTemplate = "tool_table/family", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void AddFamily(ref FamilyModel family); @@ -185,7 +185,7 @@ namespace Nc_Demo_Application.Server.Service void AddTool(ref ToolsDataModel tool); [WebInvoke(Method = "PUT", UriTemplate = "tool_table/tool", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] - void PutTool(ToolsDataModel tool); + void PutTool(ref ToolsDataModel tool); [WebInvoke(Method = "DELETE", UriTemplate = "tool_table/tool/{id}", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void DeleteTool(string id); @@ -205,6 +205,9 @@ namespace Nc_Demo_Application.Server.Service [WebInvoke(Method = "POST", UriTemplate = "tool_table/shank", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void AddShank(ref ShankDataModel shankData); + [WebInvoke(Method = "PUT", UriTemplate = "tool_table/shank", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] + void PutShank(ref ShankDataModel shankData); + [WebInvoke(Method = "DELETE", UriTemplate = "tool_table/shank/{id}", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] void DeleteShank(string id); @@ -215,7 +218,7 @@ namespace Nc_Demo_Application.Server.Service void GetMagazinePositions(string magazineId, out List positionsData); [WebInvoke(Method = "PUT", UriTemplate = "tool_table/position", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] - void PutPosition(PositionsDataModel position); + void PutPosition(ref PositionsDataModel position); #endregion } } diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs index e50945a..bd0b31a 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs @@ -461,7 +461,7 @@ namespace Nc_Demo_Application.Server.Service families = DatabaseController.getInstance().GetFamilies(); } - public void PutFamily(string oldName, FamilyModel family) + public void PutFamily(string oldName, ref FamilyModel family) { DatabaseController.getInstance().UpdateFamily(oldName, family.Name); } @@ -500,9 +500,9 @@ namespace Nc_Demo_Application.Server.Service throw new WebFaultException(HttpStatusCode.BadRequest); } - public void PutTool(ToolsDataModel tool) + public void PutTool(ref ToolsDataModel tool) { - tool = DatabaseController.getInstance().UpdateToolData(tool); + tool = DatabaseController.getInstance().UpdateToolData(tool); if (tool == null) throw new WebFaultException(HttpStatusCode.BadRequest); @@ -553,9 +553,9 @@ namespace Nc_Demo_Application.Server.Service throw new WebFaultException(HttpStatusCode.BadRequest); } - public void PutShank(ShankDataModel shankData) + public void PutShank(ref ShankDataModel shankData) { - + shankData = DatabaseController.getInstance().UpdateShank(shankData); if (shankData == null) throw new WebFaultException(HttpStatusCode.BadRequest); } @@ -579,7 +579,7 @@ namespace Nc_Demo_Application.Server.Service positionsData = DatabaseController.getInstance().GetMagazinePositions(Convert.ToInt32(magazineId)); } - public void PutPosition(PositionsDataModel position) + public void PutPosition(ref PositionsDataModel position) { DatabaseController.getInstance().UpdatePosition(position); } 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 2bfdf56..bd1d3af 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 @@ -39,6 +39,8 @@ namespace Nc_Demo_Application 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(); + this.saveNcDataButton = new System.Windows.Forms.ToolStripButton(); this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); @@ -58,6 +60,8 @@ namespace Nc_Demo_Application this.NCNameLabel = new System.Windows.Forms.Label(); this.ncTabControl = new System.Windows.Forms.TabControl(); this.processPage = new System.Windows.Forms.TabPage(); + this.toolStrip1 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveNcProcessData = new System.Windows.Forms.ToolStripButton(); this.ncProcessGridView = new System.Windows.Forms.DataGridView(); this.ncProcessIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ProcessPartProgram = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -65,12 +69,16 @@ namespace Nc_Demo_Application this.ncProcessStatusColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.ncProcessModeColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.alarms = new System.Windows.Forms.TabPage(); + this.toolStrip3 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveNcAlarmsButton = new System.Windows.Forms.ToolStripButton(); this.ncAlarmsGridView = new System.Windows.Forms.DataGridView(); this.ncAlarmCodeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAlarmProcessIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAlarmTextColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAlarmIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAxesPage = new System.Windows.Forms.TabPage(); + this.toolStrip4 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveNcAxesButton = new System.Windows.Forms.ToolStripButton(); this.ncAxisGridView = new System.Windows.Forms.DataGridView(); this.axisIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.axisNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -88,14 +96,25 @@ namespace Nc_Demo_Application this.BinaryMemoryBinaryColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.BinaryMemoryWordColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.BinaryMemoryIntegerColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.toolStrip2 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveBinaryMemoryButton = new System.Windows.Forms.ToolStripButton(); + this.addRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); + this.deleteRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); this.partProgramPage = new System.Windows.Forms.TabPage(); this.fileContentTextBox = new System.Windows.Forms.TextBox(); this.fileTreeView = new System.Windows.Forms.TreeView(); + this.toolStrip6 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveFileButton = new System.Windows.Forms.ToolStripButton(); + this.deleteFileButton = new System.Windows.Forms.ToolStripButton(); + this.addFileButton = new System.Windows.Forms.ToolStripButton(); + this.newFileNameTextBox = new System.Windows.Forms.ToolStripTextBox(); this.magazinesTab = new System.Windows.Forms.TabPage(); this.magazinesGridView = new System.Windows.Forms.DataGridView(); this.magazineId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.positionId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.positionType = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.toolStripEx2 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveMagazinesButton = new System.Windows.Forms.ToolStripButton(); this.familiesTab = new System.Windows.Forms.TabPage(); this.label18 = new System.Windows.Forms.Label(); this.shanksDataGridView = new System.Windows.Forms.DataGridView(); @@ -103,6 +122,8 @@ namespace Nc_Demo_Application this.familiesDataGridView = new System.Windows.Forms.DataGridView(); this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.toolStripEx1 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveFamiliesButton = new System.Windows.Forms.ToolStripButton(); this.toolsPage = new System.Windows.Forms.TabPage(); this.label19 = new System.Windows.Forms.Label(); this.shankIdTextBox = new System.Windows.Forms.TextBox(); @@ -174,68 +195,48 @@ namespace Nc_Demo_Application this.param29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.param30 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.param34 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.stopServer = new System.Windows.Forms.Button(); - this.toolStrip5 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcDataButton = new System.Windows.Forms.ToolStripButton(); - this.toolStrip1 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcProcessData = new System.Windows.Forms.ToolStripButton(); - this.toolStrip3 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcAlarmsButton = new System.Windows.Forms.ToolStripButton(); - this.toolStrip4 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcAxesButton = new System.Windows.Forms.ToolStripButton(); - this.toolStrip2 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveBinaryMemoryButton = new System.Windows.Forms.ToolStripButton(); - this.addRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); - this.deleteRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); - this.toolStrip6 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveFileButton = new System.Windows.Forms.ToolStripButton(); - this.deleteFileButton = new System.Windows.Forms.ToolStripButton(); - this.addFileButton = new System.Windows.Forms.ToolStripButton(); - this.newFileNameTextBox = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripEx2 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveMagazinesButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripEx1 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveFamiliesButton = new System.Windows.Forms.ToolStripButton(); this.toolStrip7 = new Nc_Demo_Application.Views.ToolStripEx(); this.refreshToolUI = new System.Windows.Forms.ToolStripButton(); this.removeTool = new System.Windows.Forms.ToolStripButton(); this.addTool = new System.Windows.Forms.ToolStripButton(); - this.shanksId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.shankName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.shankIsEnabled = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.ShankIsInhibited = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.ShankInChangeTool = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.FixedPlace = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.ShankIsInUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.ShankLeftSize = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ShankRightSize = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.stopServer = new System.Windows.Forms.Button(); this.ShankMagPos = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShankRightSize = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShankLeftSize = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ShankIsInUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.FixedPlace = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.ShankInChangeTool = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.ShankIsInhibited = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.shankIsEnabled = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.shankName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.shanksId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.isEnabledCheckBox = new System.Windows.Forms.CheckBox(); this.ncDataPage.SuspendLayout(); + this.toolStrip5.SuspendLayout(); this.ncTabControl.SuspendLayout(); this.processPage.SuspendLayout(); + this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncProcessGridView)).BeginInit(); this.alarms.SuspendLayout(); + this.toolStrip3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAlarmsGridView)).BeginInit(); this.ncAxesPage.SuspendLayout(); + this.toolStrip4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAxisGridView)).BeginInit(); this.byteMemoryPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.binaryMemoryGridView)).BeginInit(); + this.toolStrip2.SuspendLayout(); this.partProgramPage.SuspendLayout(); + this.toolStrip6.SuspendLayout(); this.magazinesTab.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.magazinesGridView)).BeginInit(); + this.toolStripEx2.SuspendLayout(); this.familiesTab.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.shanksDataGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.familiesDataGridView)).BeginInit(); + this.toolStripEx1.SuspendLayout(); this.toolsPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.edgesDataGridView)).BeginInit(); - this.toolStrip5.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.toolStrip3.SuspendLayout(); - this.toolStrip4.SuspendLayout(); - this.toolStrip2.SuspendLayout(); - this.toolStrip6.SuspendLayout(); - this.toolStripEx2.SuspendLayout(); - this.toolStripEx1.SuspendLayout(); this.toolStrip7.SuspendLayout(); this.SuspendLayout(); // @@ -277,6 +278,27 @@ namespace Nc_Demo_Application this.ncDataPage.TabIndex = 0; this.ncDataPage.Text = "Nc Data"; // + // toolStrip5 + // + this.toolStrip5.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcDataButton}); + this.toolStrip5.Location = new System.Drawing.Point(3, 3); + this.toolStrip5.Name = "toolStrip5"; + this.toolStrip5.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.toolStrip5.Size = new System.Drawing.Size(972, 25); + this.toolStrip5.TabIndex = 53; + this.toolStrip5.Text = "toolStrip5"; + // + // saveNcDataButton + // + this.saveNcDataButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcDataButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcDataButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcDataButton.Name = "saveNcDataButton"; + this.saveNcDataButton.Size = new System.Drawing.Size(23, 22); + this.saveNcDataButton.Text = "toolStripButton1"; + this.saveNcDataButton.Click += new System.EventHandler(this.SaveCnDataButton_Click); + // // label6 // this.label6.AutoSize = true; @@ -447,6 +469,28 @@ namespace Nc_Demo_Application this.processPage.TabIndex = 1; this.processPage.Text = "Nc Process"; // + // toolStrip1 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcProcessData}); + this.toolStrip1.Location = new System.Drawing.Point(3, 3); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(35, 25); + this.toolStrip1.TabIndex = 9; + this.toolStrip1.Text = "toolStrip1"; + this.toolStrip1.Click += new System.EventHandler(this.SaveNcProcessData_Click); + // + // saveNcProcessData + // + this.saveNcProcessData.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcProcessData.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcProcessData.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcProcessData.Name = "saveNcProcessData"; + this.saveNcProcessData.Size = new System.Drawing.Size(23, 22); + this.saveNcProcessData.Text = "Save"; + this.saveNcProcessData.Click += new System.EventHandler(this.SaveNcProcessData_Click); + // // ncProcessGridView // this.ncProcessGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -514,6 +558,32 @@ namespace Nc_Demo_Application this.alarms.Text = "NC Alarms"; this.alarms.UseVisualStyleBackColor = true; // + // toolStrip3 + // + this.toolStrip3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.toolStrip3.Dock = System.Windows.Forms.DockStyle.None; + this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcAlarmsButton}); + this.toolStrip3.Location = new System.Drawing.Point(0, 0); + this.toolStrip3.Name = "toolStrip3"; + this.toolStrip3.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.toolStrip3.Size = new System.Drawing.Size(35, 25); + this.toolStrip3.TabIndex = 2; + this.toolStrip3.Text = "toolStrip3"; + this.toolStrip3.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); + // + // saveNcAlarmsButton + // + this.saveNcAlarmsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcAlarmsButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcAlarmsButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcAlarmsButton.Name = "saveNcAlarmsButton"; + this.saveNcAlarmsButton.Size = new System.Drawing.Size(23, 22); + this.saveNcAlarmsButton.Text = "Save"; + this.saveNcAlarmsButton.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); + // // ncAlarmsGridView // this.ncAlarmsGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -571,6 +641,26 @@ namespace Nc_Demo_Application this.ncAxesPage.Text = "Axes"; this.ncAxesPage.UseVisualStyleBackColor = true; // + // toolStrip4 + // + this.toolStrip4.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcAxesButton}); + this.toolStrip4.Location = new System.Drawing.Point(0, 0); + this.toolStrip4.Name = "toolStrip4"; + this.toolStrip4.Size = new System.Drawing.Size(978, 25); + this.toolStrip4.TabIndex = 53; + this.toolStrip4.Text = "toolStrip4"; + // + // saveNcAxesButton + // + this.saveNcAxesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcAxesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcAxesButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcAxesButton.Name = "saveNcAxesButton"; + this.saveNcAxesButton.Size = new System.Drawing.Size(23, 22); + this.saveNcAxesButton.Text = "Save"; + this.saveNcAxesButton.Click += new System.EventHandler(this.SaveNcAxesButton_Click); + // // ncAxisGridView // this.ncAxisGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; @@ -717,6 +807,49 @@ namespace Nc_Demo_Application this.BinaryMemoryIntegerColumn.HeaderText = "Integer"; this.BinaryMemoryIntegerColumn.Name = "BinaryMemoryIntegerColumn"; // + // toolStrip2 + // + this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveBinaryMemoryButton, + this.addRowsBinaryMemory, + this.deleteRowsBinaryMemory}); + this.toolStrip2.Location = new System.Drawing.Point(0, 0); + this.toolStrip2.Name = "toolStrip2"; + this.toolStrip2.Size = new System.Drawing.Size(978, 25); + this.toolStrip2.TabIndex = 1; + this.toolStrip2.Text = "toolStrip2"; + // + // saveBinaryMemoryButton + // + this.saveBinaryMemoryButton.CheckOnClick = true; + this.saveBinaryMemoryButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveBinaryMemoryButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveBinaryMemoryButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveBinaryMemoryButton.Name = "saveBinaryMemoryButton"; + this.saveBinaryMemoryButton.Size = new System.Drawing.Size(23, 22); + this.saveBinaryMemoryButton.Text = "Save"; + this.saveBinaryMemoryButton.Click += new System.EventHandler(this.SaveBinaryMemory_Click); + // + // addRowsBinaryMemory + // + this.addRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.addRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.addButton; + this.addRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; + this.addRowsBinaryMemory.Name = "addRowsBinaryMemory"; + this.addRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); + this.addRowsBinaryMemory.Text = "Add 4 Rows"; + this.addRowsBinaryMemory.Click += new System.EventHandler(this.addRowsBinaryMemory_Click); + // + // deleteRowsBinaryMemory + // + this.deleteRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.deleteRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; + this.deleteRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; + this.deleteRowsBinaryMemory.Name = "deleteRowsBinaryMemory"; + this.deleteRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); + this.deleteRowsBinaryMemory.Text = "Remove 4 rows"; + this.deleteRowsBinaryMemory.Click += new System.EventHandler(this.deleteRowsBinaryMemory_Click); + // // partProgramPage // this.partProgramPage.Controls.Add(this.fileContentTextBox); @@ -754,6 +887,55 @@ namespace Nc_Demo_Application this.fileTreeView.TabIndex = 0; this.fileTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.FileTreeView_AfterSelect); // + // toolStrip6 + // + this.toolStrip6.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveFileButton, + this.deleteFileButton, + this.addFileButton, + this.newFileNameTextBox}); + this.toolStrip6.Location = new System.Drawing.Point(3, 3); + this.toolStrip6.Name = "toolStrip6"; + this.toolStrip6.Size = new System.Drawing.Size(972, 25); + this.toolStrip6.TabIndex = 1; + this.toolStrip6.Text = "toolStrip6"; + // + // saveFileButton + // + this.saveFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveFileButton.Enabled = false; + this.saveFileButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveFileButton.Name = "saveFileButton"; + this.saveFileButton.Size = new System.Drawing.Size(23, 22); + this.saveFileButton.Text = "Save file"; + this.saveFileButton.Click += new System.EventHandler(this.SaveFileButton_Click); + // + // deleteFileButton + // + this.deleteFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.deleteFileButton.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; + this.deleteFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.deleteFileButton.Name = "deleteFileButton"; + this.deleteFileButton.Size = new System.Drawing.Size(23, 22); + this.deleteFileButton.Text = "Delete file"; + this.deleteFileButton.Click += new System.EventHandler(this.DeleteFile_Click); + // + // addFileButton + // + this.addFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.addFileButton.Image = global::Nc_Demo_Application.Properties.Resources.addButton; + this.addFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.addFileButton.Name = "addFileButton"; + this.addFileButton.Size = new System.Drawing.Size(23, 22); + this.addFileButton.Text = "Add file"; + this.addFileButton.Click += new System.EventHandler(this.AddFile_Click); + // + // newFileNameTextBox + // + this.newFileNameTextBox.Name = "newFileNameTextBox"; + this.newFileNameTextBox.Size = new System.Drawing.Size(100, 25); + // // magazinesTab // this.magazinesTab.Controls.Add(this.magazinesGridView); @@ -813,6 +995,26 @@ namespace Nc_Demo_Application this.positionType.HeaderText = "Type"; this.positionType.Name = "positionType"; // + // toolStripEx2 + // + this.toolStripEx2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveMagazinesButton}); + this.toolStripEx2.Location = new System.Drawing.Point(3, 3); + this.toolStripEx2.Name = "toolStripEx2"; + this.toolStripEx2.Size = new System.Drawing.Size(972, 25); + this.toolStripEx2.TabIndex = 1; + this.toolStripEx2.Text = "toolStripEx2"; + // + // saveMagazinesButton + // + this.saveMagazinesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveMagazinesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveMagazinesButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveMagazinesButton.Name = "saveMagazinesButton"; + this.saveMagazinesButton.Size = new System.Drawing.Size(23, 22); + this.saveMagazinesButton.Text = "Save"; + this.saveMagazinesButton.Click += new System.EventHandler(this.SaveMagazinesButton_Click); + // // familiesTab // this.familiesTab.Controls.Add(this.label18); @@ -897,8 +1099,28 @@ namespace Nc_Demo_Application this.name.HeaderText = "Name"; this.name.Name = "name"; // + // toolStripEx1 + // + this.toolStripEx1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveFamiliesButton}); + this.toolStripEx1.Location = new System.Drawing.Point(3, 3); + this.toolStripEx1.Name = "toolStripEx1"; + this.toolStripEx1.Size = new System.Drawing.Size(972, 25); + this.toolStripEx1.TabIndex = 0; + this.toolStripEx1.Text = "toolStripEx1"; + // + // saveFamiliesButton + // + this.saveFamiliesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveFamiliesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveFamiliesButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveFamiliesButton.Name = "saveFamiliesButton"; + this.saveFamiliesButton.Size = new System.Drawing.Size(23, 22); + this.saveFamiliesButton.Click += new System.EventHandler(this.SaveFamiliesButton_Click); + // // toolsPage // + this.toolsPage.Controls.Add(this.isEnabledCheckBox); this.toolsPage.Controls.Add(this.label19); this.toolsPage.Controls.Add(this.shankIdTextBox); this.toolsPage.Controls.Add(this.label16); @@ -1034,7 +1256,7 @@ namespace Nc_Demo_Application // useCheckBox // this.useCheckBox.AutoSize = true; - this.useCheckBox.Location = new System.Drawing.Point(776, 233); + this.useCheckBox.Location = new System.Drawing.Point(794, 233); this.useCheckBox.Name = "useCheckBox"; this.useCheckBox.Size = new System.Drawing.Size(45, 17); this.useCheckBox.TabIndex = 23; @@ -1044,7 +1266,7 @@ namespace Nc_Demo_Application // changeToolCheckBox // this.changeToolCheckBox.AutoSize = true; - this.changeToolCheckBox.Location = new System.Drawing.Point(661, 233); + this.changeToolCheckBox.Location = new System.Drawing.Point(695, 233); this.changeToolCheckBox.Name = "changeToolCheckBox"; this.changeToolCheckBox.Size = new System.Drawing.Size(63, 17); this.changeToolCheckBox.TabIndex = 22; @@ -1054,7 +1276,7 @@ namespace Nc_Demo_Application // measuredCheckBox // this.measuredCheckBox.AutoSize = true; - this.measuredCheckBox.Location = new System.Drawing.Point(543, 233); + this.measuredCheckBox.Location = new System.Drawing.Point(578, 233); this.measuredCheckBox.Name = "measuredCheckBox"; this.measuredCheckBox.Size = new System.Drawing.Size(73, 17); this.measuredCheckBox.TabIndex = 21; @@ -1064,7 +1286,7 @@ namespace Nc_Demo_Application // inhibitedCheckBox // this.inhibitedCheckBox.AutoSize = true; - this.inhibitedCheckBox.Location = new System.Drawing.Point(438, 233); + this.inhibitedCheckBox.Location = new System.Drawing.Point(488, 233); this.inhibitedCheckBox.Name = "inhibitedCheckBox"; this.inhibitedCheckBox.Size = new System.Drawing.Size(66, 17); this.inhibitedCheckBox.TabIndex = 20; @@ -1074,7 +1296,7 @@ namespace Nc_Demo_Application // fixedPlaceCheckBox // this.fixedPlaceCheckBox.AutoSize = true; - this.fixedPlaceCheckBox.Location = new System.Drawing.Point(325, 233); + this.fixedPlaceCheckBox.Location = new System.Drawing.Point(385, 233); this.fixedPlaceCheckBox.Name = "fixedPlaceCheckBox"; this.fixedPlaceCheckBox.Size = new System.Drawing.Size(66, 17); this.fixedPlaceCheckBox.TabIndex = 19; @@ -1084,7 +1306,7 @@ namespace Nc_Demo_Application // isActiveCheckBox // this.isActiveCheckBox.AutoSize = true; - this.isActiveCheckBox.Location = new System.Drawing.Point(208, 233); + this.isActiveCheckBox.Location = new System.Drawing.Point(295, 233); this.isActiveCheckBox.Name = "isActiveCheckBox"; this.isActiveCheckBox.Size = new System.Drawing.Size(56, 17); this.isActiveCheckBox.TabIndex = 18; @@ -1506,237 +1728,6 @@ namespace Nc_Demo_Application this.param34.HeaderText = "34"; this.param34.Name = "param34"; // - // stopServer - // - this.stopServer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.stopServer.Location = new System.Drawing.Point(906, 687); - this.stopServer.Name = "stopServer"; - this.stopServer.Size = new System.Drawing.Size(91, 30); - this.stopServer.TabIndex = 8; - this.stopServer.Text = "Stop"; - this.stopServer.UseVisualStyleBackColor = true; - this.stopServer.Click += new System.EventHandler(this.StopServer_Click); - // - // toolStrip5 - // - this.toolStrip5.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcDataButton}); - this.toolStrip5.Location = new System.Drawing.Point(3, 3); - this.toolStrip5.Name = "toolStrip5"; - this.toolStrip5.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.toolStrip5.Size = new System.Drawing.Size(972, 25); - this.toolStrip5.TabIndex = 53; - this.toolStrip5.Text = "toolStrip5"; - // - // saveNcDataButton - // - this.saveNcDataButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcDataButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcDataButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcDataButton.Name = "saveNcDataButton"; - this.saveNcDataButton.Size = new System.Drawing.Size(23, 22); - this.saveNcDataButton.Text = "toolStripButton1"; - this.saveNcDataButton.Click += new System.EventHandler(this.SaveCnDataButton_Click); - // - // toolStrip1 - // - this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcProcessData}); - this.toolStrip1.Location = new System.Drawing.Point(3, 3); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(35, 25); - this.toolStrip1.TabIndex = 9; - this.toolStrip1.Text = "toolStrip1"; - this.toolStrip1.Click += new System.EventHandler(this.SaveNcProcessData_Click); - // - // saveNcProcessData - // - this.saveNcProcessData.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcProcessData.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcProcessData.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcProcessData.Name = "saveNcProcessData"; - this.saveNcProcessData.Size = new System.Drawing.Size(23, 22); - this.saveNcProcessData.Text = "Save"; - this.saveNcProcessData.Click += new System.EventHandler(this.SaveNcProcessData_Click); - // - // toolStrip3 - // - this.toolStrip3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.toolStrip3.Dock = System.Windows.Forms.DockStyle.None; - this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcAlarmsButton}); - this.toolStrip3.Location = new System.Drawing.Point(0, 0); - this.toolStrip3.Name = "toolStrip3"; - this.toolStrip3.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.toolStrip3.Size = new System.Drawing.Size(35, 25); - this.toolStrip3.TabIndex = 2; - this.toolStrip3.Text = "toolStrip3"; - this.toolStrip3.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); - // - // saveNcAlarmsButton - // - this.saveNcAlarmsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcAlarmsButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcAlarmsButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcAlarmsButton.Name = "saveNcAlarmsButton"; - this.saveNcAlarmsButton.Size = new System.Drawing.Size(23, 22); - this.saveNcAlarmsButton.Text = "Save"; - this.saveNcAlarmsButton.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); - // - // toolStrip4 - // - this.toolStrip4.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcAxesButton}); - this.toolStrip4.Location = new System.Drawing.Point(0, 0); - this.toolStrip4.Name = "toolStrip4"; - this.toolStrip4.Size = new System.Drawing.Size(978, 25); - this.toolStrip4.TabIndex = 53; - this.toolStrip4.Text = "toolStrip4"; - // - // saveNcAxesButton - // - this.saveNcAxesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcAxesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcAxesButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcAxesButton.Name = "saveNcAxesButton"; - this.saveNcAxesButton.Size = new System.Drawing.Size(23, 22); - this.saveNcAxesButton.Text = "Save"; - this.saveNcAxesButton.Click += new System.EventHandler(this.SaveNcAxesButton_Click); - // - // toolStrip2 - // - this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveBinaryMemoryButton, - this.addRowsBinaryMemory, - this.deleteRowsBinaryMemory}); - this.toolStrip2.Location = new System.Drawing.Point(0, 0); - this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(978, 25); - this.toolStrip2.TabIndex = 1; - this.toolStrip2.Text = "toolStrip2"; - // - // saveBinaryMemoryButton - // - this.saveBinaryMemoryButton.CheckOnClick = true; - this.saveBinaryMemoryButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveBinaryMemoryButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveBinaryMemoryButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveBinaryMemoryButton.Name = "saveBinaryMemoryButton"; - this.saveBinaryMemoryButton.Size = new System.Drawing.Size(23, 22); - this.saveBinaryMemoryButton.Text = "Save"; - this.saveBinaryMemoryButton.Click += new System.EventHandler(this.SaveBinaryMemory_Click); - // - // addRowsBinaryMemory - // - this.addRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.addRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.addButton; - this.addRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; - this.addRowsBinaryMemory.Name = "addRowsBinaryMemory"; - this.addRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); - this.addRowsBinaryMemory.Text = "Add 4 Rows"; - this.addRowsBinaryMemory.Click += new System.EventHandler(this.addRowsBinaryMemory_Click); - // - // deleteRowsBinaryMemory - // - this.deleteRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.deleteRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; - this.deleteRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; - this.deleteRowsBinaryMemory.Name = "deleteRowsBinaryMemory"; - this.deleteRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); - this.deleteRowsBinaryMemory.Text = "Remove 4 rows"; - this.deleteRowsBinaryMemory.Click += new System.EventHandler(this.deleteRowsBinaryMemory_Click); - // - // toolStrip6 - // - this.toolStrip6.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveFileButton, - this.deleteFileButton, - this.addFileButton, - this.newFileNameTextBox}); - this.toolStrip6.Location = new System.Drawing.Point(3, 3); - this.toolStrip6.Name = "toolStrip6"; - this.toolStrip6.Size = new System.Drawing.Size(972, 25); - this.toolStrip6.TabIndex = 1; - this.toolStrip6.Text = "toolStrip6"; - // - // saveFileButton - // - this.saveFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveFileButton.Enabled = false; - this.saveFileButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveFileButton.Name = "saveFileButton"; - this.saveFileButton.Size = new System.Drawing.Size(23, 22); - this.saveFileButton.Text = "Save file"; - this.saveFileButton.Click += new System.EventHandler(this.SaveFileButton_Click); - // - // deleteFileButton - // - this.deleteFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.deleteFileButton.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; - this.deleteFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.deleteFileButton.Name = "deleteFileButton"; - this.deleteFileButton.Size = new System.Drawing.Size(23, 22); - this.deleteFileButton.Text = "Delete file"; - this.deleteFileButton.Click += new System.EventHandler(this.DeleteFile_Click); - // - // addFileButton - // - this.addFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.addFileButton.Image = global::Nc_Demo_Application.Properties.Resources.addButton; - this.addFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.addFileButton.Name = "addFileButton"; - this.addFileButton.Size = new System.Drawing.Size(23, 22); - this.addFileButton.Text = "Add file"; - this.addFileButton.Click += new System.EventHandler(this.AddFile_Click); - // - // newFileNameTextBox - // - this.newFileNameTextBox.Name = "newFileNameTextBox"; - this.newFileNameTextBox.Size = new System.Drawing.Size(100, 25); - // - // toolStripEx2 - // - this.toolStripEx2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveMagazinesButton}); - this.toolStripEx2.Location = new System.Drawing.Point(3, 3); - this.toolStripEx2.Name = "toolStripEx2"; - this.toolStripEx2.Size = new System.Drawing.Size(972, 25); - this.toolStripEx2.TabIndex = 1; - this.toolStripEx2.Text = "toolStripEx2"; - // - // saveMagazinesButton - // - this.saveMagazinesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveMagazinesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveMagazinesButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveMagazinesButton.Name = "saveMagazinesButton"; - this.saveMagazinesButton.Size = new System.Drawing.Size(23, 22); - this.saveMagazinesButton.Text = "Save"; - this.saveMagazinesButton.Click += new System.EventHandler(this.SaveMagazinesButton_Click); - // - // toolStripEx1 - // - this.toolStripEx1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveFamiliesButton}); - this.toolStripEx1.Location = new System.Drawing.Point(3, 3); - this.toolStripEx1.Name = "toolStripEx1"; - this.toolStripEx1.Size = new System.Drawing.Size(972, 25); - this.toolStripEx1.TabIndex = 0; - this.toolStripEx1.Text = "toolStripEx1"; - // - // saveFamiliesButton - // - this.saveFamiliesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveFamiliesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveFamiliesButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveFamiliesButton.Name = "saveFamiliesButton"; - this.saveFamiliesButton.Size = new System.Drawing.Size(23, 22); - this.saveFamiliesButton.Click += new System.EventHandler(this.SaveFamiliesButton_Click); - // // toolStrip7 // this.toolStrip7.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1779,46 +1770,66 @@ namespace Nc_Demo_Application this.addTool.Text = "toolStripButton1"; this.addTool.Click += new System.EventHandler(this.AddTool_Click); // - // shanksId + // stopServer // - this.shanksId.DataPropertyName = "id"; - this.shanksId.HeaderText = "Id"; - this.shanksId.Name = "shanksId"; - this.shanksId.Width = 41; + this.stopServer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.stopServer.Location = new System.Drawing.Point(906, 687); + this.stopServer.Name = "stopServer"; + this.stopServer.Size = new System.Drawing.Size(91, 30); + this.stopServer.TabIndex = 8; + this.stopServer.Text = "Stop"; + this.stopServer.UseVisualStyleBackColor = true; + this.stopServer.Click += new System.EventHandler(this.StopServer_Click); // - // shankName + // ShankMagPos // - this.shankName.DataPropertyName = "name"; - this.shankName.HeaderText = "Name"; - this.shankName.Name = "shankName"; - this.shankName.Width = 60; + this.ShankMagPos.DataPropertyName = "magazine_position"; + this.ShankMagPos.FillWeight = 140.2515F; + this.ShankMagPos.HeaderText = "ShankMagPos"; + this.ShankMagPos.Name = "ShankMagPos"; + this.ShankMagPos.Width = 102; // - // shankIsEnabled + // ShankRightSize // - this.shankIsEnabled.DataPropertyName = "is_enabled"; - this.shankIsEnabled.FalseValue = "0"; - this.shankIsEnabled.HeaderText = "Enabled"; - this.shankIsEnabled.Name = "shankIsEnabled"; - this.shankIsEnabled.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.shankIsEnabled.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.shankIsEnabled.TrueValue = "1"; - this.shankIsEnabled.Width = 71; + this.ShankRightSize.DataPropertyName = "right_size"; + this.ShankRightSize.FillWeight = 99.15981F; + this.ShankRightSize.HeaderText = "Man DX"; + this.ShankRightSize.Name = "ShankRightSize"; + this.ShankRightSize.Width = 66; // - // ShankIsInhibited + // ShankLeftSize // - this.ShankIsInhibited.DataPropertyName = "is_inhibited"; - this.ShankIsInhibited.FalseValue = "0"; - this.ShankIsInhibited.HeaderText = "Inhibited"; - this.ShankIsInhibited.Name = "ShankIsInhibited"; - this.ShankIsInhibited.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.ShankIsInhibited.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.ShankIsInhibited.TrueValue = "1"; - this.ShankIsInhibited.Width = 72; + this.ShankLeftSize.DataPropertyName = "left_size"; + this.ShankLeftSize.FillWeight = 99.28913F; + this.ShankLeftSize.HeaderText = "Man SX"; + this.ShankLeftSize.Name = "ShankLeftSize"; + this.ShankLeftSize.Width = 65; + // + // ShankIsInUse + // + this.ShankIsInUse.DataPropertyName = "in_use"; + this.ShankIsInUse.FalseValue = "0"; + this.ShankIsInUse.FillWeight = 60.79543F; + this.ShankIsInUse.HeaderText = "In Use"; + this.ShankIsInUse.Name = "ShankIsInUse"; + this.ShankIsInUse.TrueValue = "1"; + this.ShankIsInUse.Width = 40; + // + // FixedPlace + // + this.FixedPlace.DataPropertyName = "in_fixed_place"; + this.FixedPlace.FalseValue = "0"; + this.FixedPlace.FillWeight = 94.99512F; + this.FixedPlace.HeaderText = "Fixed Place"; + this.FixedPlace.Name = "FixedPlace"; + this.FixedPlace.TrueValue = "1"; + this.FixedPlace.Width = 61; // // ShankInChangeTool // this.ShankInChangeTool.DataPropertyName = "in_change_tool"; this.ShankInChangeTool.FalseValue = "0"; + this.ShankInChangeTool.FillWeight = 132.1911F; this.ShankInChangeTool.HeaderText = "ChangeTool"; this.ShankInChangeTool.Name = "ShankInChangeTool"; this.ShankInChangeTool.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -1826,44 +1837,56 @@ namespace Nc_Demo_Application this.ShankInChangeTool.TrueValue = "1"; this.ShankInChangeTool.Width = 90; // - // FixedPlace + // ShankIsInhibited // - this.FixedPlace.DataPropertyName = "in_fixed_place"; - this.FixedPlace.FalseValue = "0"; - this.FixedPlace.HeaderText = "Fixed Place"; - this.FixedPlace.Name = "FixedPlace"; - this.FixedPlace.TrueValue = "1"; - this.FixedPlace.Width = 68; + this.ShankIsInhibited.DataPropertyName = "is_inhibited"; + this.ShankIsInhibited.FalseValue = "0"; + this.ShankIsInhibited.FillWeight = 108.3094F; + this.ShankIsInhibited.HeaderText = "Inhibited"; + this.ShankIsInhibited.Name = "ShankIsInhibited"; + this.ShankIsInhibited.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.ShankIsInhibited.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.ShankIsInhibited.TrueValue = "1"; + this.ShankIsInhibited.Width = 72; // - // ShankIsInUse + // shankIsEnabled // - this.ShankIsInUse.DataPropertyName = "in_use"; - this.ShankIsInUse.FalseValue = "0"; - this.ShankIsInUse.HeaderText = "In Use"; - this.ShankIsInUse.Name = "ShankIsInUse"; - this.ShankIsInUse.TrueValue = "1"; - this.ShankIsInUse.Width = 44; + this.shankIsEnabled.DataPropertyName = "is_enabled"; + this.shankIsEnabled.FalseValue = "0"; + this.shankIsEnabled.FillWeight = 109.4491F; + this.shankIsEnabled.HeaderText = "Enabled"; + this.shankIsEnabled.Name = "shankIsEnabled"; + this.shankIsEnabled.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.shankIsEnabled.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.shankIsEnabled.TrueValue = "1"; + this.shankIsEnabled.Width = 71; // - // ShankLeftSize + // shankName // - this.ShankLeftSize.DataPropertyName = "left_size"; - this.ShankLeftSize.HeaderText = "Man SX"; - this.ShankLeftSize.Name = "ShankLeftSize"; - this.ShankLeftSize.Width = 70; + this.shankName.DataPropertyName = "name"; + this.shankName.FillWeight = 93.24941F; + this.shankName.HeaderText = "Name"; + this.shankName.Name = "shankName"; + this.shankName.Width = 60; // - // ShankRightSize + // shanksId // - this.ShankRightSize.DataPropertyName = "right_size"; - this.ShankRightSize.HeaderText = "Man DX"; - this.ShankRightSize.Name = "ShankRightSize"; - this.ShankRightSize.Width = 71; + this.shanksId.DataPropertyName = "id"; + this.shanksId.FillWeight = 62.31002F; + this.shanksId.HeaderText = "Id"; + this.shanksId.Name = "shanksId"; + this.shanksId.Width = 41; // - // ShankMagPos + // isEnabledCheckBox // - this.ShankMagPos.DataPropertyName = "magazine_position"; - this.ShankMagPos.HeaderText = "ShankMagPos"; - this.ShankMagPos.Name = "ShankMagPos"; - this.ShankMagPos.Width = 102; + this.isEnabledCheckBox.AutoSize = true; + this.isEnabledCheckBox.Location = new System.Drawing.Point(186, 233); + this.isEnabledCheckBox.Name = "isEnabledCheckBox"; + this.isEnabledCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.isEnabledCheckBox.Size = new System.Drawing.Size(65, 17); + this.isEnabledCheckBox.TabIndex = 35; + this.isEnabledCheckBox.Text = "Enabled"; + this.isEnabledCheckBox.UseVisualStyleBackColor = true; // // DemoApplicationForm // @@ -1882,47 +1905,47 @@ namespace Nc_Demo_Application this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DemoApplicationForm_KeyDown); this.ncDataPage.ResumeLayout(false); this.ncDataPage.PerformLayout(); + this.toolStrip5.ResumeLayout(false); + this.toolStrip5.PerformLayout(); this.ncTabControl.ResumeLayout(false); this.processPage.ResumeLayout(false); this.processPage.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncProcessGridView)).EndInit(); this.alarms.ResumeLayout(false); this.alarms.PerformLayout(); + this.toolStrip3.ResumeLayout(false); + this.toolStrip3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAlarmsGridView)).EndInit(); this.ncAxesPage.ResumeLayout(false); this.ncAxesPage.PerformLayout(); + this.toolStrip4.ResumeLayout(false); + this.toolStrip4.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAxisGridView)).EndInit(); this.byteMemoryPage.ResumeLayout(false); this.byteMemoryPage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.binaryMemoryGridView)).EndInit(); + this.toolStrip2.ResumeLayout(false); + this.toolStrip2.PerformLayout(); this.partProgramPage.ResumeLayout(false); this.partProgramPage.PerformLayout(); + this.toolStrip6.ResumeLayout(false); + this.toolStrip6.PerformLayout(); this.magazinesTab.ResumeLayout(false); this.magazinesTab.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.magazinesGridView)).EndInit(); + this.toolStripEx2.ResumeLayout(false); + this.toolStripEx2.PerformLayout(); this.familiesTab.ResumeLayout(false); this.familiesTab.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.shanksDataGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.familiesDataGridView)).EndInit(); + this.toolStripEx1.ResumeLayout(false); + this.toolStripEx1.PerformLayout(); this.toolsPage.ResumeLayout(false); this.toolsPage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.edgesDataGridView)).EndInit(); - this.toolStrip5.ResumeLayout(false); - this.toolStrip5.PerformLayout(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.toolStrip3.ResumeLayout(false); - this.toolStrip3.PerformLayout(); - this.toolStrip4.ResumeLayout(false); - this.toolStrip4.PerformLayout(); - this.toolStrip2.ResumeLayout(false); - this.toolStrip2.PerformLayout(); - this.toolStrip6.ResumeLayout(false); - this.toolStrip6.PerformLayout(); - this.toolStripEx2.ResumeLayout(false); - this.toolStripEx2.PerformLayout(); - this.toolStripEx1.ResumeLayout(false); - this.toolStripEx1.PerformLayout(); this.toolStrip7.ResumeLayout(false); this.toolStrip7.PerformLayout(); this.ResumeLayout(false); @@ -2105,6 +2128,7 @@ namespace Nc_Demo_Application private System.Windows.Forms.DataGridViewTextBoxColumn ShankLeftSize; private System.Windows.Forms.DataGridViewTextBoxColumn ShankRightSize; private System.Windows.Forms.DataGridViewTextBoxColumn ShankMagPos; + private System.Windows.Forms.CheckBox isEnabledCheckBox; } } 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 39ec03f..f2cabf4 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 @@ -534,6 +534,7 @@ namespace Nc_Demo_Application Cooling1 = false, Cooling2 = false, Rotation = 0, + IsEnabled = false, IsActive = false, InFixedPlace = false, IsMeasured = false, @@ -604,6 +605,7 @@ namespace Nc_Demo_Application cooling2CheckBox.Checked = toolInfo.Cooling2; shankIdTextBox.Text = toolInfo.ShanksId.ToString(); + isEnabledCheckBox.Checked = toolInfo.IsEnabled; isActiveCheckBox.Checked = toolInfo.IsActive; fixedPlaceCheckBox.Checked = toolInfo.InFixedPlace; inhibitedCheckBox.Checked = toolInfo.IsInhibited; @@ -646,6 +648,7 @@ namespace Nc_Demo_Application toolInfo.Cooling2 = cooling2CheckBox.Checked; toolInfo.ShanksId = Convert.ToInt32(shankIdTextBox.Text); + toolInfo.IsEnabled = isEnabledCheckBox.Checked; toolInfo.IsActive = isActiveCheckBox.Checked; toolInfo.InFixedPlace = fixedPlaceCheckBox.Checked; toolInfo.IsInhibited = inhibitedCheckBox.Checked;