From ff00e18bcaed013a9b7c1ad0d68707f79219f6cb Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Wed, 5 Sep 2018 16:08:00 +0000 Subject: [PATCH] Fix osai library --- CMS_CORE_Application/Form1.cs | 19 +- CMS_CORE_Library/DataStructures.cs | 8 +- CMS_CORE_Library/Demo/Models/ToolDataModel.cs | 1 + CMS_CORE_Library/Demo/Nc_Demo.cs | 55 +- CMS_CORE_Library/Fanuc/Nc_Fanuc.cs | 2 - CMS_CORE_Library/Osai/Nc_Osai.cs | 13 +- CMS_CORE_Library/Siemens/Nc_Siemens.cs | 70 +- CMS_CORE_Library/ToolConfigurations.cs | 2 +- .../Database/DatabaseController.cs | 5 +- .../Database/Models/ToolsDataModel.cs | 1 + .../Nc_Demo_Application/Nc_Demo_Db.db | Bin 94208 -> 98304 bytes .../Views/DemoApplicationForm.Designer.cs | 771 +++++++++--------- .../Views/DemoApplicationForm.cs | 3 +- .../Views/DemoApplicationForm.resx | 114 +-- 14 files changed, 573 insertions(+), 491 deletions(-) diff --git a/CMS_CORE_Application/Form1.cs b/CMS_CORE_Application/Form1.cs index 9d3cf32..fcda260 100644 --- a/CMS_CORE_Application/Form1.cs +++ b/CMS_CORE_Application/Form1.cs @@ -135,13 +135,20 @@ namespace CMS_CORE_Application List axes = new List(); cmsError = N.AXES_RAxesNames(1, ref axes); - //N.TOOLS_RStoredData(); - //InfoFile f = new InfoFile(); - //N.FILES_RGetFileInfo("",ref f); + N.TOOLS_WStartEditTooling(1); + Stopwatch st = new Stopwatch(); + st.Start(); + List list = new List(); + List listB = new List(); + List listS = new List(); + // cmsError = N.MEM_RWIntegerList(false, 0, Nc.MEMORY_TYPE.Fanuc_R, 0, 512, ref list); + // cmsError = N.MEM_RWByteList(false, 0, Nc.MEMORY_TYPE.Fanuc_R, 0,0, 2048, ref listB); + // cmsError = N.MEM_RWIntegerList(false, 0, Nc.MEMORY_TYPE.Osai_GW, 0, 512, ref list); + // cmsError = N.MEM_RWWordList(false, 0, Nc.MEMORY_TYPE.Fanuc_R, 0, 512, ref listS); + cmsError = N.MEM_RWIntegerList(false, 0, Nc.MEMORY_TYPE.Siemens_DB, 258, 0, 512, ref list); + st.Stop(); + Console.WriteLine(st.ElapsedMilliseconds); - //Dictionary statu = new Dictionary(); - //Dictionary lives = new Dictionary(); - //N.TOOLS_RUpdatedToolsData(ref statu, ref lives); sw.Stop(); if (!this.IsDisposed && this.InvokeRequired) { diff --git a/CMS_CORE_Library/DataStructures.cs b/CMS_CORE_Library/DataStructures.cs index c546f16..78c6b77 100644 --- a/CMS_CORE_Library/DataStructures.cs +++ b/CMS_CORE_Library/DataStructures.cs @@ -362,7 +362,8 @@ namespace CMS_CORE_Library MAG_POS_OCCUPIED = 18, MAGAZINE_OCCUPIED = 19, TOOL_IS_MOUNTED = 20, - TOOL_AND_POSITION_NOT_MATCHING = 21 + TOOL_AND_POSITION_NOT_MATCHING = 21, + FILE_NOT_FOUND = 22 } public static CmsError NO_ERROR = new CmsError(CMS_ERROR_CODES.OK, ""); @@ -385,13 +386,14 @@ namespace CMS_CORE_Library public static CmsError MAGAZINE_BUSY_ERROR = new CmsError(CMS_ERROR_CODES.MAGAZINE_OCCUPIED, "error_magazine_occupied"); public static CmsError TOOL_IS_MOUNTED_ERROR = new CmsError(CMS_ERROR_CODES.TOOL_IS_MOUNTED, "error_tool_mounted"); public static CmsError TOOL_AND_POSITION_NOT_MATCHING_ERROR = new CmsError(CMS_ERROR_CODES.TOOL_IS_MOUNTED, "error_tool_and_position_not_matching"); + public static CmsError FILE_NOT_FOUND_ERROR = new CmsError(CMS_ERROR_CODES.FILE_NOT_FOUND, "error_file_not_found"); #endregion Cms Errors Codes /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #region Constants - + public static readonly string[] VALID_PP_FORMATS = { ".txt", ".cnc", ".ini" }; public static readonly string[] VALID_IMAGE_FORMATS = { ".jpg", ".jpeg", ".png" }; @@ -735,6 +737,8 @@ namespace CMS_CORE_Library #endregion Siemens Tool Manager Models + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + #region Nc Tool Manager Models public class ToolManagerOptionsModel diff --git a/CMS_CORE_Library/Demo/Models/ToolDataModel.cs b/CMS_CORE_Library/Demo/Models/ToolDataModel.cs index 835744b..092adfc 100644 --- a/CMS_CORE_Library/Demo/Models/ToolDataModel.cs +++ b/CMS_CORE_Library/Demo/Models/ToolDataModel.cs @@ -78,6 +78,7 @@ namespace CMS_CORE.Demo.Models } public class DemoToolManagerConfig { + public int SelectedNc; public int MaxTools; public int MaxEdgePerTools; public int MaxMultitools; diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index 768273d..f27b9f4 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -1790,19 +1790,37 @@ namespace CMS_CORE.Demo { try { - //config.ToolsConfiguration = SiemensToolFieldsConfig; - //config.FamiliesConfiguration = SiemensFamilyFieldsConfig; - //config.ShanksConfiguration = SiemensShankFieldsConfig; - //config.MagazinePosConfiguration = SiemensMagazinePosFieldsConfig; - //config.EdgesConfiguration = SiemensEdgesFieldsConfiguration; - config.ToolsConfiguration = NcToolFieldsConfig; - config.FamiliesConfiguration = NcFamilyFieldsConfig; - config.ShanksConfiguration = NcShankFieldsConfig; - config.MagazinePosConfiguration = NcMagazinePosFieldsConfig; - config.EdgesConfiguration = NcOffsetFieldsConfiguration; - // Get config from demo serverService.GetToolManagerConfiguration(out DemoToolManagerConfig demoConf); + if (demoConf.SelectedNc == 0) // Siemens config + { + config.ToolsConfiguration = SiemensToolFieldsConfig; + config.FamiliesConfiguration = SiemensFamilyFieldsConfig; + config.ShanksConfiguration = SiemensShankFieldsConfig; + config.MagazinePosConfiguration = SiemensMagazinePosFieldsConfig; + config.EdgesConfiguration = SiemensEdgesFieldsConfiguration; + + config.EdgesConfiguration.EdgesAdditionalParamsConfiguration = new Dictionary>(); + // Remove path and set only names + foreach (int key in DemoEdgesConfiguration.EdgesConfig.Keys) + { + List tmpNames = new List(); + foreach (var conf in DemoEdgesConfiguration.EdgesConfig[key]) + { + tmpNames.Add(conf.Name); + } + config.EdgesConfiguration.EdgesAdditionalParamsConfiguration.Add(key, tmpNames); + } + } + else // Osai fanuc config + { + config.ToolsConfiguration = NcToolFieldsConfig; + config.FamiliesConfiguration = NcFamilyFieldsConfig; + config.ShanksConfiguration = NcShankFieldsConfig; + config.MagazinePosConfiguration = NcMagazinePosFieldsConfig; + config.EdgesConfiguration = NcOffsetFieldsConfiguration; + } + config.MaxTools = demoConf.MaxTools; config.MaxEdgesPerTools = demoConf.MaxEdgePerTools; config.MaxToolsPerFamily = demoConf.MaxMultitools; @@ -1814,19 +1832,6 @@ namespace CMS_CORE.Demo config.MagPositionOptionActive = demoConf.MagPositionOption; config.MaxOffsets = 5; - - config.EdgesConfiguration.EdgesAdditionalParamsConfiguration = new Dictionary>(); - // Remove path and set only names - //foreach (int key in DemoEdgesConfiguration.EdgesConfig.Keys) - //{ - // List tmpNames = new List(); - // foreach (var conf in DemoEdgesConfiguration.EdgesConfig[key]) - // { - // tmpNames.Add(conf.Name); - // } - // config.EdgesConfiguration.EdgesAdditionalParamsConfiguration.Add(key, tmpNames); - //} - config.Magazines = MagazineConfig; } catch (Exception ex) @@ -2885,7 +2890,7 @@ namespace CMS_CORE.Demo internal static MEMORY_CELL HEADS_STROBE_INCREMENT = new MEMORY_CELL(MEMORY_TYPE.Demo, 432, 4); internal static MEMORY_CELL HEADS_STROBE_DECREMENT = new MEMORY_CELL(MEMORY_TYPE.Demo, 436, 4); - internal static MEMORY_CELL MAGAZINES_ENABLED_CMD = new MEMORY_CELL(MEMORY_TYPE.Demo, 440, 4); + internal static MEMORY_CELL MAGAZINES_ENABLED_CMD = new MEMORY_CELL(MEMORY_TYPE.Demo, 441, 4); } #endregion Memory addresses diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 8d3c59d..875e8c0 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -2105,11 +2105,9 @@ namespace CMS_CORE.Fanuc //Execute the method nReturn1 = Focas1.cnc_sysinfo(nLibHandle[0], tmpNode); - MessageBox.Show("return 1 dopo metodo " + nReturn1); node = tmpNode; nReturn2 = Focas1.cnc_rdcncid(nLibHandle[0], out SerialNumber); - MessageBox.Show("return 1 dopo n return 2" + nReturn1); //Throw Exception if there's an error if (nReturn1 != 0) diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index d681889..332a09d 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -38,7 +38,7 @@ namespace CMS_CORE.Osai private BasicHttpBinding HttpBinding; private static Dictionary PlcMessages; - private const string TOOL_MANAGER_DIRECTORY_PATH = @"TEST\\SYS\\STEP\\"; + private const string TOOL_MANAGER_DIRECTORY_PATH = @"STEP\"; // private const string TOOL_MANAGER_DIRECTORY_PATH = @"test\OEM\CMS\SYS\STEP\"; private const string NC_PROGRAM_PATH = @"CAMBIO\"; private const string NC_PROGRAM_UPLOAD_PATH = @"CAMBIO\UPLOADED_PP\"; @@ -2587,6 +2587,12 @@ namespace CMS_CORE.Osai if (cmsError.IsError()) return cmsError; + // Release tool manager status + bool write = false; + cmsError = MEM_RWBoolean(W, 0, TOOL_MANAGER_COMMAND.MemType, TOOL_MANAGER_COMMAND.Address, 1, ref write); + if (cmsError.IsError()) + return cmsError; + // Set reload command cmsError = PLC_WStrobe(TOOL_MANAGER_STATUS, TOOL_MANAGER_COMMAND, 1); if (cmsError.IsError()) @@ -3438,7 +3444,6 @@ namespace CMS_CORE.Osai return CmsError.NcError(GetNCErrorMessage(errorClass, errorNum)); } - //Get Active PP Path private CmsError PROC_RPPPath(ushort procNumber, ref string path) { @@ -3457,7 +3462,7 @@ namespace CMS_CORE.Osai //Execute the method nReturn = OpenNC.GetActivePartProgramFullPath(procNumber, out Level, out mainPath, out SubPath, out uint errorClass, out uint errorNum); - //If there's an error launch exception + //If there's an error launch exception\ if (errorClass != 0 || errorNum != 0 || nReturn == 0) return GetNCError(errorClass, errorNum); @@ -3465,6 +3470,7 @@ namespace CMS_CORE.Osai path = mainPath.Replace("\\Network", ""); path = path.Replace("\\User\\", ""); path = path.Replace("\\user\\", ""); + path = path.Replace("\\USER\\", ""); } catch (Exception ex) { @@ -3474,7 +3480,6 @@ namespace CMS_CORE.Osai return NO_ERROR; } - ////Get Image files //private CmsError FILE_PPImage(string PP_Name, ref string base64Image) //{ diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 3013029..283a3c8 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -3,7 +3,6 @@ using Siemens.Sinumerik.Operate.Services; using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; @@ -133,7 +132,6 @@ namespace CMS_CORE.Siemens //Setup timeout TimeoutConn = ConnectionTimeOut; SiemensAlarms = new Alarm[] { }; - ChannelAxesId = new List(); } //Connect Method @@ -183,12 +181,18 @@ namespace CMS_CORE.Siemens if (SiemensToolSvc != null) { SiemensToolSvc.UnSubscribe(ToolMngmtSvcHandler); - SiemensToolSvc = null; + SiemensToolSvc.Dispose(); } if (MagazinePositionSvc != null) + { MagazinePositionSvc.UnSubscribe(MagazinePositionEnabled_OnChange); + MagazinePositionSvc.Dispose(); + } if (MagazineActionsSvc != null) + { MagazineActionsSvc.UnSubscribe(MagazineAction_OnChange); + MagazineActionsSvc.Dispose(); + } return NO_ERROR; } @@ -1330,6 +1334,8 @@ namespace CMS_CORE.Siemens Item[] ncAxes = new Item[20]; Item[] axesVisibleParams = new Item[20]; + if (ChannelAxesId == null) + ChannelAxesId = new List(); bool[] axesAreVisible = new bool[20]; @@ -1883,7 +1889,7 @@ namespace CMS_CORE.Siemens Path = path + "\\" + element.Name, IsDirectory = element.IsDirNode, Name = element.Name, - AbsolutePath = element.RealPath + AbsolutePath = element.LogicalPath }); } } @@ -1913,7 +1919,7 @@ namespace CMS_CORE.Siemens Name = fileNode.Name, Content = new List() { fileNode.LogicalPath }, PreviewBase64 = FindImageBase64String(IMAGES_PATH, fileNode.Name), - AbsolutePath = fileNode.RealPath + AbsolutePath = fileNode.LogicalPath }; } catch (Exception ex) @@ -1933,9 +1939,16 @@ namespace CMS_CORE.Siemens FileSvc fileSvc = new FileSvc(); // Preapare folder node - Node selectedNode = new Node(BASE_FILE_PATH + ncPath); + Node selectedNode = new Node(ncPath); - fileSvc.Select(selectedNode, processId); + if (!selectedNode.Exists) + return FILE_NOT_FOUND_ERROR; + + // Check if file is stored on NC + if(filePath.StartsWith(BASE_FILE_PATH)) + fileSvc.Select(selectedNode, processId); + else + fileSvc.SelectExtern(selectedNode, processId); return FILES_RActiveProgramData(processId, ref data); } @@ -1949,7 +1962,7 @@ namespace CMS_CORE.Siemens { return NO_ERROR; } - + public override CmsError FILES_RActiveProgramData(int processId, ref ActiveProgramDataModel data) { try @@ -1989,7 +2002,7 @@ namespace CMS_CORE.Siemens return NO_ERROR; } - + public override CmsError FILES_UploadPartProgram(string localPath, string name, ref string newFilePath) { // Open file @@ -2112,7 +2125,7 @@ namespace CMS_CORE.Siemens return NO_ERROR; } - + private IEnumerable GetLinesFromString(string text) { string line; @@ -2662,10 +2675,18 @@ namespace CMS_CORE.Siemens if (tool == null) return INCORRECT_PARAMETERS_ERROR; - if (tool.EdgesData.Count > MAX_EDGES_PER_TOOL) + if (tool.EdgesData.Count >= MAX_EDGES_PER_TOOL) return MAX_EDGES_PER_TOOL_REACHED_ERROR; + + List ids = Enumerable.Range(1, MAX_EDGES_PER_TOOL).ToList(); + + foreach(var edgeVal in tool.EdgesData) + { + ids.Remove(edgeVal.Id); + } + // Get next edge id - int nextEdgeId = tool.EdgesData.Count + 1; + int nextEdgeId = ids[0]; try { @@ -2776,7 +2797,9 @@ namespace CMS_CORE.Siemens // if edge not exists, return if (tool.EdgesData.Where(x => x.Id == edgeId).FirstOrDefault() == null) return INCORRECT_PARAMETERS_ERROR; - + // If there is only 1 edge, return with error + if (tool.EdgesData.Count == 1) + return INCORRECT_PARAMETERS_ERROR; try { // Create strings parameters @@ -4062,20 +4085,29 @@ namespace CMS_CORE.Siemens case "$TC_DPNT": { SiemensToolModel tool = ToolTableData[toolIndex]; - + // Clear tool + tool + .EdgesData[edgeIndex] + .EdgeAdditionalParams + .Clear(); // Get tool type additional parameters if (toolEdgesConfig.EdgesConfig.ContainsKey(tool.ToolType)) { // Find if actual param exist for the tool type List toolTypeConfig = toolEdgesConfig.EdgesConfig[tool.ToolType]; - EdgeConfigModel paramConfig = toolTypeConfig.Where(x => x.Path == (GetUntilOrEmpty(actualString) + "[")).FirstOrDefault(); + EdgeConfigModel paramConfig = toolTypeConfig + .Where(x => x.Path == (GetUntilOrEmpty(actualString) + "[")) + .FirstOrDefault(); // If Exist if (paramConfig != null) - ToolTableData[toolIndex] - .EdgesData[edgeIndex] - .EdgeAdditionalParams // Add additional param - .Add(paramConfig.Name, Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat)); + { + // Add additional param + tool + .EdgesData[edgeIndex] + .EdgeAdditionalParams + .Add(paramConfig.Name, Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat)); + } } } break; diff --git a/CMS_CORE_Library/ToolConfigurations.cs b/CMS_CORE_Library/ToolConfigurations.cs index 177945c..4dba766 100644 --- a/CMS_CORE_Library/ToolConfigurations.cs +++ b/CMS_CORE_Library/ToolConfigurations.cs @@ -292,7 +292,7 @@ namespace CMS_CORE_Library EdgeConfiguration = new List() { new FieldsConfiguration{Name = "id", Type = "int", SelectValues = null, Category = "general", ReadOnly = true, MinValue = 0, MaxValue = 0 }, - new FieldsConfiguration{Name = "lenght", Type = "double", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 0, MaxValue = uint.MaxValue }, + new FieldsConfiguration{Name = "length", Type = "double", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 0, MaxValue = uint.MaxValue }, new FieldsConfiguration{Name = "radius", Type = "double", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 0, MaxValue = uint.MaxValue }, new FieldsConfiguration{Name = "wearLength", Type = "double", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 0, MaxValue = uint.MaxValue }, new FieldsConfiguration{Name = "wearRadius", Type = "double", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 0, MaxValue = uint.MaxValue } 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 79088df..bf870e4 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 @@ -247,6 +247,7 @@ namespace Nc_Demo_Application.Database // Populate ToolManagerConfig with db data foreach (DataRow row in ToolMagerConfigDataTable.Rows) { + ToolManConfig.SelectedNc = Convert.ToInt32(row["selected_nc"]); ToolManConfig.MaxTools = Convert.ToInt32(row["max_tool"]); ToolManConfig.MaxEdgePerTools = Convert.ToInt32(row["max_edges_per_tool"]); ToolManConfig.MaxMultitools = Convert.ToInt32(row["max_multitool"]); @@ -266,6 +267,7 @@ namespace Nc_Demo_Application.Database // Update local ncDatatable data foreach (DataRow row in ToolMagerConfigDataTable.Rows) { + row["selected_nc"] = config.SelectedNc; row["max_tool"] = config.MaxTools; row["max_edges_per_tool"] = config.MaxEdgePerTools; row["max_multitool"] = config.MaxMultitools; @@ -348,8 +350,7 @@ namespace Nc_Demo_Application.Database { UpdateDatabaseFromDataTable(ncProcessData, READ_NC_PROCESS_QUERY); } - - + public void UpdateProcessProgram(int processId, string path) { // Update process part program path data 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 fcd7827..61d26b7 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 @@ -108,6 +108,7 @@ namespace Nc_Demo_Application.Database.Models public class ToolManagerConfig { + public int SelectedNc; public int MaxTools; public int MaxEdgePerTools; public int MaxMultitools; 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 a0a20f7e3803c83afdb05f3d579046cad74ce75c..5e9cb7c4930234544028345298953474a3679206 100644 GIT binary patch delta 593 zcmZp8z}nEjHbGj@nt_2q0*HBmn2~{j<;FxEV@B(Z2}|U~IQSbG_&@XC=D*1QjDHXR za{fmCKK`)Hf&w=DY#NQa%;B6) zF)#uFI}q@4JZIo!tzhOm#AU~}lC^^K7xzidJ)9!ENz9LcZac=z-7M5>!!8~k&e+O4 zz2BPAYU*l6QAUZWy^KlIU)nJ4m(ta3mhe!K)}V!%nSf{?wWM~ delta 427 zcmZo@U~725Izd`chk=1X9EgR1n2~{j<@iJ$V@92g2}|Tf*!lYy_&@XC=D*1QjDHXR za{fO44BLDyZ 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 171e0c6..b105343 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 @@ -51,6 +51,8 @@ namespace Nc_Demo_Application this.maxToolTxb = new System.Windows.Forms.TextBox(); this.multitoolOptCheckbox = new System.Windows.Forms.CheckBox(); this.label27 = new System.Windows.Forms.Label(); + 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(); @@ -70,6 +72,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(); @@ -77,12 +81,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(); @@ -100,6 +108,10 @@ 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.timeLeftPicker = new System.Windows.Forms.DateTimePicker(); this.label35 = new System.Windows.Forms.Label(); @@ -109,6 +121,12 @@ namespace Nc_Demo_Application this.activeProgram = new System.Windows.Forms.TextBox(); this.fileContentTextBox = new System.Windows.Forms.TextBox(); this.fileTreeView = new System.Windows.Forms.TreeView(); + this.toolStrip6 = new Nc_Demo_Application.Views.ToolStripEx(); + this.refreshActiveProgram = new System.Windows.Forms.ToolStripButton(); + 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.label26 = new System.Windows.Forms.Label(); this.label25 = new System.Windows.Forms.Label(); @@ -130,6 +148,8 @@ namespace Nc_Demo_Application this.ShankId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.magazineToolId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.disablePosition = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + 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(); @@ -148,6 +168,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.label32 = new System.Windows.Forms.Label(); this.multitoolIdTxb = new System.Windows.Forms.TextBox(); @@ -224,73 +246,53 @@ 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.versionLabel = new System.Windows.Forms.Label(); + 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.offsetPage = new System.Windows.Forms.TabPage(); + this.toolStripEx3 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveOffsetButton = new System.Windows.Forms.ToolStripButton(); this.offsetGridView = new System.Windows.Forms.DataGridView(); this.OffsetsColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.OffsetsColLength = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.OffsetColRadius = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.OffsetColWearLength = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.OffsetColWearRadius = new System.Windows.Forms.DataGridViewTextBoxColumn(); - 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.refreshActiveProgram = new System.Windows.Forms.ToolStripButton(); - 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.toolStripEx3 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveOffsetButton = new System.Windows.Forms.ToolStripButton(); + this.stopServer = new System.Windows.Forms.Button(); + this.versionLabel = new System.Windows.Forms.Label(); + this.label36 = new System.Windows.Forms.Label(); + this.ncConfigType = new System.Windows.Forms.ComboBox(); 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.offsetPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.offsetGridView)).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.offsetPage.SuspendLayout(); this.toolStripEx3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.offsetGridView)).BeginInit(); this.SuspendLayout(); // // serverStatusLabel @@ -306,6 +308,8 @@ namespace Nc_Demo_Application // ncDataPage // this.ncDataPage.BackColor = System.Drawing.SystemColors.Control; + this.ncDataPage.Controls.Add(this.ncConfigType); + this.ncDataPage.Controls.Add(this.label36); this.ncDataPage.Controls.Add(this.magPositionOptionCheckbox); this.ncDataPage.Controls.Add(this.familyOptCheckbox); this.ncDataPage.Controls.Add(this.label31); @@ -346,7 +350,7 @@ namespace Nc_Demo_Application // magPositionOptionCheckbox // this.magPositionOptionCheckbox.AutoSize = true; - this.magPositionOptionCheckbox.Location = new System.Drawing.Point(219, 341); + this.magPositionOptionCheckbox.Location = new System.Drawing.Point(214, 397); this.magPositionOptionCheckbox.Name = "magPositionOptionCheckbox"; this.magPositionOptionCheckbox.Size = new System.Drawing.Size(121, 17); this.magPositionOptionCheckbox.TabIndex = 65; @@ -356,7 +360,7 @@ namespace Nc_Demo_Application // familyOptCheckbox // this.familyOptCheckbox.AutoSize = true; - this.familyOptCheckbox.Location = new System.Drawing.Point(19, 341); + this.familyOptCheckbox.Location = new System.Drawing.Point(14, 397); this.familyOptCheckbox.Name = "familyOptCheckbox"; this.familyOptCheckbox.Size = new System.Drawing.Size(89, 17); this.familyOptCheckbox.TabIndex = 64; @@ -366,7 +370,7 @@ namespace Nc_Demo_Application // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(591, 296); + this.label31.Location = new System.Drawing.Point(586, 352); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(86, 13); this.label31.TabIndex = 63; @@ -374,7 +378,7 @@ namespace Nc_Demo_Application // // maxToolXMultiTxb // - this.maxToolXMultiTxb.Location = new System.Drawing.Point(684, 293); + this.maxToolXMultiTxb.Location = new System.Drawing.Point(679, 349); this.maxToolXMultiTxb.Name = "maxToolXMultiTxb"; this.maxToolXMultiTxb.Size = new System.Drawing.Size(100, 20); this.maxToolXMultiTxb.TabIndex = 62; @@ -382,7 +386,7 @@ namespace Nc_Demo_Application // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(401, 296); + this.label30.Location = new System.Drawing.Point(396, 352); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(69, 13); this.label30.TabIndex = 61; @@ -390,7 +394,7 @@ namespace Nc_Demo_Application // // maxMultitoolTxb // - this.maxMultitoolTxb.Location = new System.Drawing.Point(476, 293); + this.maxMultitoolTxb.Location = new System.Drawing.Point(471, 349); this.maxMultitoolTxb.Name = "maxMultitoolTxb"; this.maxMultitoolTxb.Size = new System.Drawing.Size(100, 20); this.maxMultitoolTxb.TabIndex = 60; @@ -398,7 +402,7 @@ namespace Nc_Demo_Application // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(190, 296); + this.label29.Location = new System.Drawing.Point(185, 352); this.label29.Name = "label29"; this.label29.Size = new System.Drawing.Size(87, 13); this.label29.TabIndex = 59; @@ -406,7 +410,7 @@ namespace Nc_Demo_Application // // maxEdgeXToolTxb // - this.maxEdgeXToolTxb.Location = new System.Drawing.Point(283, 294); + this.maxEdgeXToolTxb.Location = new System.Drawing.Point(278, 350); this.maxEdgeXToolTxb.Name = "maxEdgeXToolTxb"; this.maxEdgeXToolTxb.Size = new System.Drawing.Size(100, 20); this.maxEdgeXToolTxb.TabIndex = 58; @@ -414,7 +418,7 @@ namespace Nc_Demo_Application // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(16, 296); + this.label28.Location = new System.Drawing.Point(11, 352); this.label28.Name = "label28"; this.label28.Size = new System.Drawing.Size(54, 13); this.label28.TabIndex = 57; @@ -422,7 +426,7 @@ namespace Nc_Demo_Application // // maxToolTxb // - this.maxToolTxb.Location = new System.Drawing.Point(76, 293); + this.maxToolTxb.Location = new System.Drawing.Point(71, 349); this.maxToolTxb.Name = "maxToolTxb"; this.maxToolTxb.Size = new System.Drawing.Size(100, 20); this.maxToolTxb.TabIndex = 56; @@ -430,7 +434,7 @@ namespace Nc_Demo_Application // multitoolOptCheckbox // this.multitoolOptCheckbox.AutoSize = true; - this.multitoolOptCheckbox.Location = new System.Drawing.Point(114, 341); + this.multitoolOptCheckbox.Location = new System.Drawing.Point(109, 397); this.multitoolOptCheckbox.Name = "multitoolOptCheckbox"; this.multitoolOptCheckbox.Size = new System.Drawing.Size(99, 17); this.multitoolOptCheckbox.TabIndex = 55; @@ -447,6 +451,27 @@ namespace Nc_Demo_Application this.label27.TabIndex = 54; this.label27.Text = "Configurations:"; // + // 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; @@ -618,6 +643,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) @@ -685,6 +732,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) @@ -742,6 +815,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; @@ -888,6 +981,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.timeLeftPicker); @@ -983,6 +1119,65 @@ 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.refreshActiveProgram, + 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"; + // + // refreshActiveProgram + // + this.refreshActiveProgram.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.refreshActiveProgram.Image = global::Nc_Demo_Application.Properties.Resources.refresh; + this.refreshActiveProgram.ImageTransparentColor = System.Drawing.Color.Magenta; + this.refreshActiveProgram.Name = "refreshActiveProgram"; + this.refreshActiveProgram.Size = new System.Drawing.Size(23, 22); + this.refreshActiveProgram.Text = "toolStripButton1"; + this.refreshActiveProgram.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // saveFileButton + // + this.saveFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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.label26); @@ -1181,6 +1376,26 @@ namespace Nc_Demo_Application this.disablePosition.Name = "disablePosition"; this.disablePosition.TrueValue = "1"; // + // 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); @@ -1361,6 +1576,25 @@ 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.label32); @@ -2123,27 +2357,47 @@ namespace Nc_Demo_Application this.param34.HeaderText = "34"; this.param34.Name = "param34"; // - // stopServer + // toolStrip7 // - 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); + this.toolStrip7.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.refreshToolUI, + this.removeTool, + this.addTool}); + this.toolStrip7.Location = new System.Drawing.Point(3, 3); + this.toolStrip7.Name = "toolStrip7"; + this.toolStrip7.Size = new System.Drawing.Size(972, 25); + this.toolStrip7.TabIndex = 1; + this.toolStrip7.Text = "toolStrip7"; // - // versionLabel + // refreshToolUI // - this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.versionLabel.AutoSize = true; - this.versionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.versionLabel.Location = new System.Drawing.Point(811, 691); - this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(89, 20); - this.versionLabel.TabIndex = 11; - this.versionLabel.Text = "Version: 34"; + this.refreshToolUI.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + 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); + this.refreshToolUI.Text = "Refresh"; + this.refreshToolUI.Click += new System.EventHandler(this.refreshToolUI_Click); + // + // removeTool + // + this.removeTool.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.removeTool.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; + this.removeTool.ImageTransparentColor = System.Drawing.Color.Magenta; + this.removeTool.Name = "removeTool"; + this.removeTool.Size = new System.Drawing.Size(23, 22); + this.removeTool.Text = "toolStripButton1"; + this.removeTool.Click += new System.EventHandler(this.RemoveTool_Click); + // + // addTool + // + this.addTool.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.addTool.Image = global::Nc_Demo_Application.Properties.Resources.addButton; + this.addTool.ImageTransparentColor = System.Drawing.Color.Magenta; + this.addTool.Name = "addTool"; + this.addTool.Size = new System.Drawing.Size(23, 22); + this.addTool.Text = "toolStripButton1"; + this.addTool.Click += new System.EventHandler(this.AddTool_Click); // // offsetPage // @@ -2157,6 +2411,26 @@ namespace Nc_Demo_Application this.offsetPage.Text = "Offsets"; this.offsetPage.UseVisualStyleBackColor = true; // + // toolStripEx3 + // + this.toolStripEx3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveOffsetButton}); + this.toolStripEx3.Location = new System.Drawing.Point(3, 3); + this.toolStripEx3.Name = "toolStripEx3"; + this.toolStripEx3.Size = new System.Drawing.Size(972, 25); + this.toolStripEx3.TabIndex = 1; + this.toolStripEx3.Text = "toolStripEx3"; + // + // saveOffsetButton + // + this.saveOffsetButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveOffsetButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveOffsetButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveOffsetButton.Name = "saveOffsetButton"; + this.saveOffsetButton.Size = new System.Drawing.Size(23, 22); + this.saveOffsetButton.Text = "toolStripButton1"; + this.saveOffsetButton.Click += new System.EventHandler(this.saveOffsetButton_Click); + // // offsetGridView // this.offsetGridView.AllowUserToAddRows = false; @@ -2205,297 +2479,48 @@ namespace Nc_Demo_Application this.OffsetColWearRadius.HeaderText = "Wear Radius"; this.OffsetColWearRadius.Name = "OffsetColWearRadius"; // - // toolStrip5 + // stopServer // - 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"; + 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); // - // saveNcDataButton + // versionLabel // - 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); + this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.versionLabel.AutoSize = true; + this.versionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.versionLabel.Location = new System.Drawing.Point(811, 691); + this.versionLabel.Name = "versionLabel"; + this.versionLabel.Size = new System.Drawing.Size(89, 20); + this.versionLabel.TabIndex = 11; + this.versionLabel.Text = "Version: 35"; // - // toolStrip1 + // label36 // - 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); + this.label36.AutoSize = true; + this.label36.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label36.Location = new System.Drawing.Point(16, 310); + this.label36.Name = "label36"; + this.label36.Size = new System.Drawing.Size(107, 13); + this.label36.TabIndex = 66; + this.label36.Text = "Select NC config:"; // - // saveNcProcessData + // ncConfigType // - 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.refreshActiveProgram, - 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"; - // - // refreshActiveProgram - // - this.refreshActiveProgram.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.refreshActiveProgram.Image = global::Nc_Demo_Application.Properties.Resources.refresh; - this.refreshActiveProgram.ImageTransparentColor = System.Drawing.Color.Magenta; - this.refreshActiveProgram.Name = "refreshActiveProgram"; - this.refreshActiveProgram.Size = new System.Drawing.Size(23, 22); - this.refreshActiveProgram.Text = "toolStripButton1"; - this.refreshActiveProgram.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // saveFileButton - // - this.saveFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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[] { - this.refreshToolUI, - this.removeTool, - this.addTool}); - this.toolStrip7.Location = new System.Drawing.Point(3, 3); - this.toolStrip7.Name = "toolStrip7"; - this.toolStrip7.Size = new System.Drawing.Size(972, 25); - this.toolStrip7.TabIndex = 1; - this.toolStrip7.Text = "toolStrip7"; - // - // refreshToolUI - // - this.refreshToolUI.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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); - this.refreshToolUI.Text = "Refresh"; - this.refreshToolUI.Click += new System.EventHandler(this.refreshToolUI_Click); - // - // removeTool - // - this.removeTool.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.removeTool.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; - this.removeTool.ImageTransparentColor = System.Drawing.Color.Magenta; - this.removeTool.Name = "removeTool"; - this.removeTool.Size = new System.Drawing.Size(23, 22); - this.removeTool.Text = "toolStripButton1"; - this.removeTool.Click += new System.EventHandler(this.RemoveTool_Click); - // - // addTool - // - this.addTool.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.addTool.Image = global::Nc_Demo_Application.Properties.Resources.addButton; - this.addTool.ImageTransparentColor = System.Drawing.Color.Magenta; - this.addTool.Name = "addTool"; - this.addTool.Size = new System.Drawing.Size(23, 22); - this.addTool.Text = "toolStripButton1"; - this.addTool.Click += new System.EventHandler(this.AddTool_Click); - // - // toolStripEx3 - // - this.toolStripEx3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveOffsetButton}); - this.toolStripEx3.Location = new System.Drawing.Point(3, 3); - this.toolStripEx3.Name = "toolStripEx3"; - this.toolStripEx3.Size = new System.Drawing.Size(972, 25); - this.toolStripEx3.TabIndex = 1; - this.toolStripEx3.Text = "toolStripEx3"; - // - // saveOffsetButton - // - this.saveOffsetButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveOffsetButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveOffsetButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveOffsetButton.Name = "saveOffsetButton"; - this.saveOffsetButton.Size = new System.Drawing.Size(23, 22); - this.saveOffsetButton.Text = "toolStripButton1"; - this.saveOffsetButton.Click += new System.EventHandler(this.saveOffsetButton_Click); + this.ncConfigType.FormattingEnabled = true; + this.ncConfigType.Items.AddRange(new object[] { + "SIEMENS", + "OSAI/FANUC"}); + this.ncConfigType.Location = new System.Drawing.Point(132, 307); + this.ncConfigType.Name = "ncConfigType"; + this.ncConfigType.Size = new System.Drawing.Size(121, 21); + this.ncConfigType.TabIndex = 67; // // DemoApplicationForm // @@ -2515,54 +2540,54 @@ 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.offsetPage.ResumeLayout(false); - this.offsetPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.offsetGridView)).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.offsetPage.ResumeLayout(false); + this.offsetPage.PerformLayout(); this.toolStripEx3.ResumeLayout(false); this.toolStripEx3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.offsetGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -2794,6 +2819,8 @@ namespace Nc_Demo_Application private System.Windows.Forms.DataGridViewTextBoxColumn OffsetColWearLength; private System.Windows.Forms.DataGridViewTextBoxColumn OffsetColWearRadius; private System.Windows.Forms.ToolStripButton saveOffsetButton; + private System.Windows.Forms.ComboBox ncConfigType; + private System.Windows.Forms.Label label36; } } 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 ae1c07f..b70d26f 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 @@ -119,7 +119,7 @@ namespace Nc_Demo_Application processNumberTxb.Text = ncData.processCount.ToString(); ToolManagerConfig config = DatabaseController.GetInstance().ReadToolManagerConfig(); - + ncConfigType.SelectedIndex = config.SelectedNc; maxToolTxb.Text = config.MaxTools.ToString(); maxEdgeXToolTxb.Text = config.MaxEdgePerTools.ToString(); maxMultitoolTxb.Text = config.MaxMultitools.ToString(); @@ -224,6 +224,7 @@ namespace Nc_Demo_Application ToolManagerConfig config = new ToolManagerConfig() { + SelectedNc = ncConfigType.SelectedIndex, MaxTools = Convert.ToInt32(maxToolTxb.Text), MaxEdgePerTools = Convert.ToInt32(maxEdgeXToolTxb.Text), MaxMultitools = Convert.ToInt32(maxMultitoolTxb.Text), 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 4319165..2498896 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 @@ -120,18 +120,36 @@ 17, 17 + + 17, 17 + 122, 17 + + 122, 17 + + + 227, 17 + 227, 17 332, 17 + + 332, 17 + 437, 17 + + 437, 17 + + + 542, 17 + 542, 17 @@ -180,6 +198,9 @@ True + + 869, 17 + 752, 17 @@ -261,6 +282,9 @@ True + + 752, 17 + 647, 17 @@ -480,63 +504,6 @@ True - - 986, 17 - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - 17, 17 - - - 122, 17 - - - 227, 17 - - - 332, 17 - - - 437, 17 - - - 542, 17 - - - 869, 17 - - - 752, 17 - 647, 17 @@ -554,4 +521,37 @@ 986, 17 + + 986, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file