diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index 2bce764e..c748a3f1 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Model/DTOModels/DTOHeadModel.cs b/Step.Model/DTOModels/DTOHeadModel.cs index b46557e1..2ca99ed4 100644 --- a/Step.Model/DTOModels/DTOHeadModel.cs +++ b/Step.Model/DTOModels/DTOHeadModel.cs @@ -66,6 +66,7 @@ namespace Step.Model.DTOModels public ushort MountedTool; public bool Configured; public ROTATION Rotation; + public uint WorkedTime; public DTOToolInSpindleModel ToolData; public override bool Equals(object obj) @@ -92,6 +93,9 @@ namespace Step.Model.DTOModels if (Rotation != item.Rotation) return false; + if (WorkedTime != item.WorkedTime) + return false; + // Call Parent equals return base.Equals(item); } diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 333ece9e..720634a2 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -848,6 +848,7 @@ namespace Step.NC AbrasiveIsActive = head.AbrasiveIsActive, Configured = head.Configured, Rotation = head.Rotation, + WorkedTime = head.WorkedTime, ToolData = head.Tool == null ? null : new DTOToolInSpindleModel() { ChildId = head.Tool.ChildId, diff --git a/Step.UI/ServerControlWindow.Designer.cs b/Step.UI/ServerControlWindow.Designer.cs index cd55739d..1ff6b018 100644 --- a/Step.UI/ServerControlWindow.Designer.cs +++ b/Step.UI/ServerControlWindow.Designer.cs @@ -59,8 +59,8 @@ namespace Step.UI this.menuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.serviceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.passwordToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.goBackToStandardModeToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.resetSpindleHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.NotifyIconMenu.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -341,12 +341,6 @@ namespace Step.UI this.passwordToolStripMenuItem1.Text = "Password"; this.passwordToolStripMenuItem1.Click += new System.EventHandler(this.passwordToolStripMenuItem1_Click); // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6); - this.toolStripSeparator1.Visible = false; - // // goBackToStandardModeToolStripMenuItem1 // this.goBackToStandardModeToolStripMenuItem1.Name = "goBackToStandardModeToolStripMenuItem1"; @@ -355,6 +349,12 @@ namespace Step.UI this.goBackToStandardModeToolStripMenuItem1.Visible = false; this.goBackToStandardModeToolStripMenuItem1.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem1_Click); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6); + this.toolStripSeparator1.Visible = false; + // // resetSpindleHoursToolStripMenuItem1 // this.resetSpindleHoursToolStripMenuItem1.Name = "resetSpindleHoursToolStripMenuItem1";