From 943dba9e02ed2bc062eec966ebfd1cb452da8aa1 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Thu, 23 Aug 2018 11:30:39 +0000 Subject: [PATCH] Siemens AXes Added demo offsets --- CMS_CORE_Library/Demo/ILibraryService.cs | 7 + CMS_CORE_Library/Demo/Nc_Demo.cs | 33 + CMS_CORE_Library/Siemens/Nc_Siemens.cs | 97 ++- .../CMS_Core_Nc_Demo_Application.csproj | 1 + .../Nc_Demo_Application/Constants.cs | 1 + .../Database/DatabaseController.cs | 80 ++ .../Server/Service/ILibraryService.cs | 7 + .../Server/Service/LibraryService.cs | 14 + .../Views/DemoApplicationForm.Designer.cs | 761 ++++++++++-------- .../Views/DemoApplicationForm.cs | 17 +- .../Views/DemoApplicationForm.resx | 239 +++++- 11 files changed, 905 insertions(+), 352 deletions(-) diff --git a/CMS_CORE_Library/Demo/ILibraryService.cs b/CMS_CORE_Library/Demo/ILibraryService.cs index 865e22e..c1967a2 100644 --- a/CMS_CORE_Library/Demo/ILibraryService.cs +++ b/CMS_CORE_Library/Demo/ILibraryService.cs @@ -247,6 +247,13 @@ namespace Nc_Demo_Application.Server.Service [WebGet(UriTemplate = "tool_table/config", BodyStyle = WebMessageBodyStyle.Wrapped, ResponseFormat = WebMessageFormat.Json)] void GetToolManagerConfiguration(out DemoToolManagerConfig config); + + [WebGet(UriTemplate = "tool_table/offset", BodyStyle = WebMessageBodyStyle.Wrapped, ResponseFormat = WebMessageFormat.Json)] + void GetOffsets(out List offsetData); + + [WebInvoke(Method = "PUT", UriTemplate = "tool_table/offset", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] + void PutOffset(ref OffsetModel offsetData); + #endregion } diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index 532bb35..58c7acc 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -2603,11 +2603,44 @@ namespace CMS_CORE.Demo public override CmsError TOOLS_ROffset(short offsetId, ref OffsetModel offset) { + // Check if the NC Demo is Connected + CmsError cmsError = CheckConnection(); + if (cmsError.IsError()) + return cmsError; + + try + { + serverService.GetOffsets(out List offsetData); + + offset = offsetData.Where(x => x.Id == offsetId).FirstOrDefault(); + } + catch (Exception ex) + { + return ManageException(ex); + } + return NO_ERROR; } public override CmsError TOOLS_WOffset(short offsetId, OffsetModel offset) { + offset.Id = offsetId; + + // Check if the NC Demo is Connected + CmsError cmsError = CheckConnection(); + if (cmsError.IsError()) + return cmsError; + + try + { + serverService.PutOffset(ref offset); + } + catch (Exception ex) + { + return ManageException(ex); + } + + return NO_ERROR; } diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 4b8527f..1e851b2 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -1192,34 +1192,93 @@ namespace CMS_CORE.Siemens #region PROCESS-AXES (PATH) High-level data - //Get a dictionary with the Actual position of the axes in Process - public override CmsError AXES_RInterpPosition(ushort ProcNumber, ref Dictionary Axes) + public override CmsError AXES_RInterpPosition(ushort channel, ref Dictionary axes) { - return FUNCTION_NOT_ALLOWED_ERROR; + try + { + axes = AXES_ReadAxesPos(channel, "GeometricAxis/actToolBasePos"); // TODO FIX + } + catch (Exception ex) + { + return ManageException(ex); + } + + return NO_ERROR; + } + + public override CmsError AXES_RMachinePosition(ushort channel, ref Dictionary axes) + { + try + { + axes = AXES_ReadAxesPos(channel, "GeometricAxis/actToolBasePos"); + } + catch (Exception ex) + { + return ManageException(ex); + } + + return NO_ERROR; } - //Get a dictionary with the Machine position of the axes in Process - public override CmsError AXES_RMachinePosition(ushort ProcNumber, ref Dictionary Axes) + public override CmsError AXES_RProgrPosition(ushort channel, ref Dictionary axes) { - return FUNCTION_NOT_ALLOWED_ERROR; + try + { + axes = AXES_ReadAxesPos(channel, "GeometricAxis/actProgPos"); + } + catch (Exception ex) + { + return ManageException(ex); + } + + return NO_ERROR; + } + + public override CmsError AXES_RFollowingError(ushort channel, ref Dictionary axes) + { + try + { + axes = AXES_ReadAxesPos(channel, "MachineAxis/vaLagError"); + } + catch (Exception ex) + { + return ManageException(ex); + } + + return NO_ERROR; + } + + public override CmsError AXES_RDistanceToGo(ushort channel, ref Dictionary axes) + { + try + { + axes = AXES_ReadAxesPos(channel, "GeometricAxis/actDistToGoEns"); + } + catch (Exception ex) + { + return ManageException(ex); + } + return NO_ERROR; } - //Get a dictionary with the Programmed position of the axes in Process - public override CmsError AXES_RProgrPosition(ushort ProcNumber, ref Dictionary Axes) + private Dictionary AXES_ReadAxesPos(ushort channel, string positionType) { - return FUNCTION_NOT_ALLOWED_ERROR; - } + Dictionary axes = new Dictionary(); + List axesConf = new List(); + CmsError cmsError = AXES_RAxesNames(channel, ref axesConf); + + foreach (var conf in axesConf) + { + DataSvc dataSvc = new DataSvc(); - //Get a dictionary with the Following Error of the axes in Process - public override CmsError AXES_RFollowingError(ushort ProcNumber, ref Dictionary Axes) - { - return FUNCTION_NOT_ALLOWED_ERROR; - } + // Write parameter into multitool parameters + Item item = new Item() { Path = string.Format("/Channel/{0}[u{1},{2}]", positionType, channel, conf.Id) }; + dataSvc.Read(item); - //Get a dictionary with the Distance To Go of the axes in Process - public override CmsError AXES_RDistanceToGo(ushort ProcNumber, ref Dictionary Axes) - { - return FUNCTION_NOT_ALLOWED_ERROR; + axes.Add(conf.Id.ToString(), Convert.ToDouble(item.Value)); + } + + return axes; } public override CmsError AXES_RAxesNames(ushort channel, ref List axesData) diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj index 9369082..d52dd02 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/CMS_Core_Nc_Demo_Application.csproj @@ -116,6 +116,7 @@ + diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs index 25cb69f..f54cfba 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs @@ -22,6 +22,7 @@ namespace Nc_Demo_Application public const string READ_MAGAZINES_ACTION_QUERY = "SELECT * FROM magazine_status"; public const string READ_EDGES_QUERY = "SELECT * FROM edge"; public const string READ_ACT_PROGRAM_QUERY = "SELECT * FROM active_program"; + public const string OFFSET_QUERY = "SELECT * FROM offset"; // Server configuration public static string SERVER_PORT = ":8080"; 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 f8f49af..79088df 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 @@ -31,6 +31,7 @@ namespace Nc_Demo_Application.Database private DataTable EdgeDataTable; private DataTable ToolMagerConfigDataTable; private DataTable ActiveProgramDataTable; + private DataTable OffsetDataTable; #region Constructor & Private functions @@ -51,6 +52,7 @@ namespace Nc_Demo_Application.Database EdgeDataTable = new DataTable(); ToolMagerConfigDataTable = new DataTable(); ActiveProgramDataTable = new DataTable(); + OffsetDataTable = new DataTable(); // Create ncProcess columns @@ -95,6 +97,7 @@ namespace Nc_Demo_Application.Database MagazinesActionDataTable.Dispose(); ToolMagerConfigDataTable.Dispose(); ActiveProgramDataTable.Dispose(); + OffsetDataTable.Dispose(); // Close sql connection sqlConnection.Close(); @@ -1764,5 +1767,82 @@ namespace Nc_Demo_Application.Database } #endregion File manager + + #region Offsets + + public DataTable ReadOffsets() + { + try + { + ReadDataFromDatabase(OFFSET_QUERY, ref OffsetDataTable); + + return OffsetDataTable; + } + catch (Exception ex) + { + Console.WriteLine("ReadOffset exception: " + ex.Message); + return null; + } + } + + public List GetOffsets() + { + short lastId = 0; + List offsets = new List(); + foreach (DataRow row in OffsetDataTable.Rows) + { + if (Convert.IsDBNull(row["id"])) + lastId = (short)(lastId + 1); + else + lastId = Convert.ToInt16(row["id"]); + + // Convert DataTable.row into axis model + OffsetModel offset = new OffsetModel + { + Id = lastId, + Length = Convert.ToDouble(row["length"]), + Radius = Convert.ToDouble(row["radius"]), + WearLength = Convert.ToDouble(row["wear_length"]), + WearRadius = Convert.ToDouble(row["wear_radius"]) + }; + offsets.Add(offset); + } + + return offsets; + } + + public OffsetModel UpdateOffset(OffsetModel offset) + { + try + { + // Find row that must be update + DataRow row = OffsetDataTable.AsEnumerable().FirstOrDefault(x => Convert.ToInt32(x["id"]) == offset.Id); + if (row == null) + return null; + + // Update + row["length"] = offset.Length; + row["radius"] = offset.Radius; + row["wear_length"] = offset.WearRadius; + row["wear_radius"] = offset.WearLength; + + // Update Db + UpdateOffsets(OffsetDataTable); + + return offset; + } + catch (Exception ex) + { + Console.WriteLine("Update offsets exception: " + ex.Message); + return null; + } + } + + public void UpdateOffsets(DataTable offset) + { + UpdateDatabaseFromDataTable(offset, OFFSET_QUERY); + } + + #endregion } } \ No newline at end of file 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 75a19ea..d4e0b08 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 @@ -249,6 +249,13 @@ namespace Nc_Demo_Application.Server.Service [WebGet(UriTemplate = "tool_table/config", BodyStyle = WebMessageBodyStyle.Wrapped, ResponseFormat = WebMessageFormat.Json)] void GetToolManagerConfiguration(out ToolManagerConfig config); + + [WebGet(UriTemplate = "tool_table/offset", BodyStyle = WebMessageBodyStyle.Wrapped, ResponseFormat = WebMessageFormat.Json)] + void GetOffsets(out List offsetData); + + [WebInvoke(Method = "PUT", UriTemplate = "tool_table/offset", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json, BodyStyle = WebMessageBodyStyle.Wrapped)] + void PutOffset(ref OffsetModel offsetData); + #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 878b1dd..cc5467e 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 @@ -725,6 +725,20 @@ namespace Nc_Demo_Application.Server.Service #endregion Shanks + #region Offsets + + public void GetOffsets(out List offset) + { + offset = DatabaseController.GetInstance().GetOffsets(); + } + + public void PutOffset(ref OffsetModel offset) + { + DatabaseController.GetInstance().UpdateOffset(offset); + } + + #endregion + #region Positions public void GetPositions(out List positionsData) 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 8619e5e..171e0c6 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 @@ -30,12 +30,12 @@ namespace Nc_Demo_Application /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DemoApplicationForm)); this.serverStatusLabel = new System.Windows.Forms.Label(); this.ncDataPage = new System.Windows.Forms.TabPage(); @@ -51,8 +51,6 @@ 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(); @@ -72,8 +70,6 @@ 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(); @@ -81,16 +77,12 @@ 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(); @@ -108,10 +100,6 @@ 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(); @@ -121,12 +109,6 @@ 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(); @@ -148,8 +130,6 @@ 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(); @@ -168,8 +148,6 @@ 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(); @@ -246,39 +224,73 @@ 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.offsetPage = new System.Windows.Forms.TabPage(); + 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.stopServer = new System.Windows.Forms.Button(); - this.versionLabel = new System.Windows.Forms.Label(); + this.toolStripEx3 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveOffsetButton = new System.Windows.Forms.ToolStripButton(); 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.toolStripEx3.SuspendLayout(); this.SuspendLayout(); // // serverStatusLabel @@ -435,27 +447,6 @@ 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; @@ -608,6 +599,7 @@ namespace Nc_Demo_Application this.ncTabControl.Controls.Add(this.magazinesTab); this.ncTabControl.Controls.Add(this.familiesTab); this.ncTabControl.Controls.Add(this.toolsPage); + this.ncTabControl.Controls.Add(this.offsetPage); this.ncTabControl.Location = new System.Drawing.Point(11, 14); this.ncTabControl.Name = "ncTabControl"; this.ncTabControl.SelectedIndex = 0; @@ -626,28 +618,6 @@ 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) @@ -670,10 +640,10 @@ namespace Nc_Demo_Application // ncProcessIdColumn // this.ncProcessIdColumn.DataPropertyName = "id"; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black; - this.ncProcessIdColumn.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black; + this.ncProcessIdColumn.DefaultCellStyle = dataGridViewCellStyle7; this.ncProcessIdColumn.HeaderText = "Process Id"; this.ncProcessIdColumn.Name = "ncProcessIdColumn"; this.ncProcessIdColumn.ReadOnly = true; @@ -715,32 +685,6 @@ 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) @@ -798,26 +742,6 @@ 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; @@ -931,10 +855,10 @@ namespace Nc_Demo_Application // BinaryMemoryAddressColumn // this.BinaryMemoryAddressColumn.DataPropertyName = "address"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; - this.BinaryMemoryAddressColumn.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black; + this.BinaryMemoryAddressColumn.DefaultCellStyle = dataGridViewCellStyle8; this.BinaryMemoryAddressColumn.HeaderText = "Byte Address"; this.BinaryMemoryAddressColumn.Name = "BinaryMemoryAddressColumn"; this.BinaryMemoryAddressColumn.ReadOnly = true; @@ -964,49 +888,6 @@ 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); @@ -1102,65 +983,6 @@ 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); @@ -1304,10 +1126,10 @@ namespace Nc_Demo_Application // magazineId // this.magazineId.DataPropertyName = "magazineId"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black; - this.magazineId.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Black; + this.magazineId.DefaultCellStyle = dataGridViewCellStyle9; this.magazineId.FillWeight = 105.2829F; this.magazineId.HeaderText = "Magazine Id"; this.magazineId.Name = "magazineId"; @@ -1317,10 +1139,10 @@ namespace Nc_Demo_Application // positionId // this.positionId.DataPropertyName = "positionId"; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; - this.positionId.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.Black; + this.positionId.DefaultCellStyle = dataGridViewCellStyle10; this.positionId.FillWeight = 94.61015F; this.positionId.HeaderText = "Position Id"; this.positionId.Name = "positionId"; @@ -1359,26 +1181,6 @@ 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); @@ -1543,10 +1345,10 @@ namespace Nc_Demo_Application // id // this.id.DataPropertyName = "id"; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; - this.id.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.Black; + this.id.DefaultCellStyle = dataGridViewCellStyle11; this.id.FillWeight = 60F; this.id.HeaderText = "Id"; this.id.Name = "id"; @@ -1559,25 +1361,6 @@ 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); @@ -2121,11 +1904,11 @@ namespace Nc_Demo_Application // edgesId // this.edgesId.DataPropertyName = "child_id"; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.CornflowerBlue; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; - this.edgesId.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.CornflowerBlue; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black; + this.edgesId.DefaultCellStyle = dataGridViewCellStyle12; this.edgesId.HeaderText = "Id"; this.edgesId.Name = "edgesId"; // @@ -2340,6 +2123,318 @@ 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); + // + // versionLabel + // + 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"; + // + // offsetPage + // + this.offsetPage.Controls.Add(this.toolStripEx3); + this.offsetPage.Controls.Add(this.offsetGridView); + this.offsetPage.Location = new System.Drawing.Point(4, 22); + this.offsetPage.Name = "offsetPage"; + this.offsetPage.Padding = new System.Windows.Forms.Padding(3); + this.offsetPage.Size = new System.Drawing.Size(978, 641); + this.offsetPage.TabIndex = 9; + this.offsetPage.Text = "Offsets"; + this.offsetPage.UseVisualStyleBackColor = true; + // + // offsetGridView + // + this.offsetGridView.AllowUserToAddRows = false; + this.offsetGridView.AllowUserToDeleteRows = false; + this.offsetGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.offsetGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.offsetGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.OffsetsColumnId, + this.OffsetsColLength, + this.OffsetColRadius, + this.OffsetColWearLength, + this.OffsetColWearRadius}); + this.offsetGridView.Location = new System.Drawing.Point(3, 36); + this.offsetGridView.Name = "offsetGridView"; + this.offsetGridView.Size = new System.Drawing.Size(975, 605); + this.offsetGridView.TabIndex = 0; + // + // OffsetsColumnId + // + this.OffsetsColumnId.DataPropertyName = "id"; + this.OffsetsColumnId.HeaderText = "Id"; + this.OffsetsColumnId.Name = "OffsetsColumnId"; + this.OffsetsColumnId.ReadOnly = true; + // + // OffsetsColLength + // + this.OffsetsColLength.DataPropertyName = "length"; + this.OffsetsColLength.HeaderText = "Length"; + this.OffsetsColLength.Name = "OffsetsColLength"; + // + // OffsetColRadius + // + this.OffsetColRadius.DataPropertyName = "radius"; + this.OffsetColRadius.HeaderText = "Radius"; + this.OffsetColRadius.Name = "OffsetColRadius"; + // + // OffsetColWearLength + // + this.OffsetColWearLength.DataPropertyName = "wear_length"; + this.OffsetColWearLength.HeaderText = "Wear Length"; + this.OffsetColWearLength.Name = "OffsetColWearLength"; + // + // OffsetColWearRadius + // + this.OffsetColWearRadius.DataPropertyName = "wear_radius"; + this.OffsetColWearRadius.HeaderText = "Wear Radius"; + this.OffsetColWearRadius.Name = "OffsetColWearRadius"; + // + // 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.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[] { @@ -2382,27 +2477,25 @@ namespace Nc_Demo_Application this.addTool.Text = "toolStripButton1"; this.addTool.Click += new System.EventHandler(this.AddTool_Click); // - // stopServer + // toolStripEx3 // - 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.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"; // - // versionLabel + // saveOffsetButton // - 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: 33"; + 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); // // DemoApplicationForm // @@ -2422,49 +2515,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.toolStripEx3.ResumeLayout(false); + this.toolStripEx3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -2687,6 +2785,15 @@ namespace Nc_Demo_Application private System.Windows.Forms.TextBox isoLine; private System.Windows.Forms.Label label34; private System.Windows.Forms.ToolStripButton refreshActiveProgram; + private System.Windows.Forms.TabPage offsetPage; + private ToolStripEx toolStripEx3; + private System.Windows.Forms.DataGridView offsetGridView; + private System.Windows.Forms.DataGridViewTextBoxColumn OffsetsColumnId; + private System.Windows.Forms.DataGridViewTextBoxColumn OffsetsColLength; + private System.Windows.Forms.DataGridViewTextBoxColumn OffsetColRadius; + private System.Windows.Forms.DataGridViewTextBoxColumn OffsetColWearLength; + private System.Windows.Forms.DataGridViewTextBoxColumn OffsetColWearRadius; + private System.Windows.Forms.ToolStripButton saveOffsetButton; } } 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 b4818b5..ae1c07f 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 @@ -68,13 +68,14 @@ namespace Nc_Demo_Application FillNcDataInput(); FillNcProcessInput(); FillNcAlarmsInput(); - FillNAxisInput(); + FillNcAxesInput(); FillBinaryMemoryInput(); FillFamilyInput(); FillMagazineInput(); ReadPartProgramDirectory(FILE_FOLDER); FillToolsInput(); FillActiveProgramData(); + FillOffsets(); serverStatusLabel.Text = "Server running on: http://localhost:" + SERVER_PORT + API_URL; } @@ -142,7 +143,7 @@ namespace Nc_Demo_Application ncAlarmsGridView.DataSource = ncAlarmsData; } - private void FillNAxisInput() + private void FillNcAxesInput() { // Insert axes' data into Grid View DataTable ncAxisData = DatabaseController.GetInstance().ReadNcAxes(); @@ -196,6 +197,13 @@ namespace Nc_Demo_Application activeProgram.Text = programData.Path; } + private void FillOffsets() + { + // Insert offset data + DataTable offset = DatabaseController.GetInstance().ReadOffsets(); + offsetGridView.DataSource = offset; + } + private void SaveCnDataButton_Click(object sender, EventArgs e) { NcDataModel ncData = new NcDataModel @@ -250,6 +258,11 @@ namespace Nc_Demo_Application DatabaseController.GetInstance().UpdateBinaryMemory((DataTable)binaryMemoryGridView.DataSource); } + private void saveOffsetButton_Click(object sender, EventArgs e) + { + DatabaseController.GetInstance().UpdateOffsets((DataTable)offsetGridView.DataSource); + } + private void ncProcessGridView_DataError(object sender, DataGridViewDataErrorEventArgs e) { // TODO 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 2cc08d7..4319165 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 @@ -135,6 +135,9 @@ 542, 17 + + 869, 17 + True @@ -156,8 +159,62 @@ True - - 869, 17 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + 752, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True True @@ -198,8 +255,14 @@ True - - 752, 17 + + True + + + True + + + 647, 17 True @@ -309,6 +372,171 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + 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 @@ -323,4 +551,7 @@ jm/GcW7031RP8zpHxQAAAABJRU5ErkJggg== + + 986, 17 + \ No newline at end of file