diff --git a/Thermo.Active.Config/Config/serverConfig.xml b/Thermo.Active.Config/Config/serverConfig.xml index 3d7f5591..97876e61 100644 --- a/Thermo.Active.Config/Config/serverConfig.xml +++ b/Thermo.Active.Config/Config/serverConfig.xml @@ -148,5 +148,6 @@ + \ No newline at end of file diff --git a/Thermo.Active.Core/ThreadsFunctions.cs b/Thermo.Active.Core/ThreadsFunctions.cs index a4a24262..3fc853e5 100644 --- a/Thermo.Active.Core/ThreadsFunctions.cs +++ b/Thermo.Active.Core/ThreadsFunctions.cs @@ -230,21 +230,35 @@ public static class ThreadsFunctions internal static void StatThread() { + int samplePeriod = samplMsec("stats") > 0 ? samplMsec("stats") : 1000; + while (true) { + long totTime = 0; foreach (var value in Counter) { if (ThreadsHandler.RunningThreadStatus.ContainsKey(value.Key) && Counter[value.Key] != 0) { - ThreadsHandler.RunningThreadStatus[value.Key] = $"{(Timers[value.Key] / Counter[value.Key])} ms x {Counter[value.Key]}"; + totTime += Timers[value.Key]; + ThreadsHandler.RunningThreadStatus[value.Key] = $"{((double)Timers[value.Key] / samplePeriod):P1} | {(Timers[value.Key] / Counter[value.Key])} ms x {Counter[value.Key]}"; Timers[value.Key] = 0; Counter[value.Key] = 0; } } + // aggiungo totale + string grandTotal = $"{((double)totTime / samplePeriod):P1} | {totTime} ms"; + if (ThreadsHandler.RunningThreadStatus.ContainsKey(" TOTAL")) + { + ThreadsHandler.RunningThreadStatus[" TOTAL"] = grandTotal; + } + else + { + ThreadsHandler.RunningThreadStatus.Add(" TOTAL", grandTotal); + } MessageServices.Current.Publish(SEND_THREADS_STATUS, null, ThreadsHandler.RunningThreadStatus); - Thread.Sleep(2000); + Thread.Sleep(samplePeriod); } } diff --git a/Thermo.Active.UI/ServerControlWindow.Designer.cs b/Thermo.Active.UI/ServerControlWindow.Designer.cs index 0ef4ba3c..2a82ed6a 100644 --- a/Thermo.Active.UI/ServerControlWindow.Designer.cs +++ b/Thermo.Active.UI/ServerControlWindow.Designer.cs @@ -30,436 +30,436 @@ namespace Thermo.Active.UI /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerControlWindow)); - this.StepNotifyIcon = new System.Windows.Forms.NotifyIcon(this.components); - this.NotifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.adminMachineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.passwordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.goBackToStandardModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.resetSpindleHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resetCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resetMachineWorkingHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.StopServerItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TXTstatus = new System.Windows.Forms.TextBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.stopServerButton = new System.Windows.Forms.Button(); - this.openUiButton = new System.Windows.Forms.Button(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label3 = new System.Windows.Forms.Label(); - this.TXTVersion = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.TXTType = new System.Windows.Forms.Label(); - this.CHNcConnected = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); - this.TXTMachId = new System.Windows.Forms.Label(); - this.LISTThreadStatus = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.menuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.closeCMSServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.serviceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.passwordToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.goBackToStandardModeToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.resetSpindleHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.resetCountersToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.resetMachineWorkingHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.NotifyIconMenu.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.panel1.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // StepNotifyIcon - // - this.StepNotifyIcon.BalloonTipText = "Active"; - this.StepNotifyIcon.ContextMenuStrip = this.NotifyIconMenu; - this.StepNotifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("StepNotifyIcon.Icon"))); - this.StepNotifyIcon.Text = "Active"; - this.StepNotifyIcon.Visible = true; - this.StepNotifyIcon.DoubleClick += new System.EventHandler(this.NotifyIcon_Click); - // - // NotifyIconMenu - // - this.NotifyIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerControlWindow)); + this.StepNotifyIcon = new System.Windows.Forms.NotifyIcon(this.components); + this.NotifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.adminMachineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.passwordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.goBackToStandardModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.resetSpindleHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resetCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resetMachineWorkingHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.StopServerItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TXTstatus = new System.Windows.Forms.TextBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.stopServerButton = new System.Windows.Forms.Button(); + this.openUiButton = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); + this.TXTVersion = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.TXTType = new System.Windows.Forms.Label(); + this.CHNcConnected = new System.Windows.Forms.CheckBox(); + this.label2 = new System.Windows.Forms.Label(); + this.TXTMachId = new System.Windows.Forms.Label(); + this.LISTThreadStatus = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.menuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.closeCMSServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.serviceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.passwordToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.goBackToStandardModeToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.resetSpindleHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.resetCountersToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.resetMachineWorkingHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.NotifyIconMenu.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.panel1.SuspendLayout(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // StepNotifyIcon + // + this.StepNotifyIcon.BalloonTipText = "Active"; + this.StepNotifyIcon.ContextMenuStrip = this.NotifyIconMenu; + this.StepNotifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("StepNotifyIcon.Icon"))); + this.StepNotifyIcon.Text = "Active"; + this.StepNotifyIcon.Visible = true; + this.StepNotifyIcon.DoubleClick += new System.EventHandler(this.NotifyIcon_Click); + // + // NotifyIconMenu + // + this.NotifyIconMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.adminMachineToolStripMenuItem, this.toolStripSeparator3, this.StopServerItem}); - this.NotifyIconMenu.Name = "NotifyIconMenu"; - this.NotifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.NotifyIconMenu.Size = new System.Drawing.Size(175, 54); - // - // adminMachineToolStripMenuItem - // - this.adminMachineToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.NotifyIconMenu.Name = "NotifyIconMenu"; + this.NotifyIconMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.NotifyIconMenu.Size = new System.Drawing.Size(175, 54); + // + // adminMachineToolStripMenuItem + // + this.adminMachineToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.passwordToolStripMenuItem, this.goBackToStandardModeToolStripMenuItem, this.toolStripSeparator, this.resetSpindleHoursToolStripMenuItem, this.resetCountersToolStripMenuItem, this.resetMachineWorkingHoursToolStripMenuItem}); - this.adminMachineToolStripMenuItem.Name = "adminMachineToolStripMenuItem"; - this.adminMachineToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.adminMachineToolStripMenuItem.Text = "Service"; - // - // passwordToolStripMenuItem - // - this.passwordToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon; - this.passwordToolStripMenuItem.Name = "passwordToolStripMenuItem"; - this.passwordToolStripMenuItem.Size = new System.Drawing.Size(234, 22); - this.passwordToolStripMenuItem.Text = "Password"; - this.passwordToolStripMenuItem.Click += new System.EventHandler(this.passwordToolStripMenuItem_Click); - // - // goBackToStandardModeToolStripMenuItem - // - this.goBackToStandardModeToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon; - this.goBackToStandardModeToolStripMenuItem.Name = "goBackToStandardModeToolStripMenuItem"; - this.goBackToStandardModeToolStripMenuItem.Size = new System.Drawing.Size(234, 22); - this.goBackToStandardModeToolStripMenuItem.Text = "Go back to standard mode"; - this.goBackToStandardModeToolStripMenuItem.Visible = false; - this.goBackToStandardModeToolStripMenuItem.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem_Click); - // - // toolStripSeparator - // - this.toolStripSeparator.Name = "toolStripSeparator"; - this.toolStripSeparator.Size = new System.Drawing.Size(231, 6); - this.toolStripSeparator.Visible = false; - // - // resetSpindleHoursToolStripMenuItem - // - this.resetSpindleHoursToolStripMenuItem.Name = "resetSpindleHoursToolStripMenuItem"; - this.resetSpindleHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22); - this.resetSpindleHoursToolStripMenuItem.Text = "Reset Spindle Active Time"; - this.resetSpindleHoursToolStripMenuItem.Visible = false; - this.resetSpindleHoursToolStripMenuItem.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem_Click); - // - // resetCountersToolStripMenuItem - // - this.resetCountersToolStripMenuItem.Name = "resetCountersToolStripMenuItem"; - this.resetCountersToolStripMenuItem.Size = new System.Drawing.Size(234, 22); - this.resetCountersToolStripMenuItem.Text = "Reset CMS-Active Counters"; - this.resetCountersToolStripMenuItem.Visible = false; - this.resetCountersToolStripMenuItem.Click += new System.EventHandler(this.resetCountersToolStripMenuItem_Click); - // - // resetMachineWorkingHoursToolStripMenuItem - // - this.resetMachineWorkingHoursToolStripMenuItem.Name = "resetMachineWorkingHoursToolStripMenuItem"; - this.resetMachineWorkingHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22); - this.resetMachineWorkingHoursToolStripMenuItem.Text = "Reset Machine Working Hours"; - this.resetMachineWorkingHoursToolStripMenuItem.Visible = false; - this.resetMachineWorkingHoursToolStripMenuItem.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(171, 6); - // - // StopServerItem - // - this.StopServerItem.Name = "StopServerItem"; - this.StopServerItem.Size = new System.Drawing.Size(174, 22); - this.StopServerItem.Text = "Close Active Server"; - this.StopServerItem.Click += new System.EventHandler(this.StopServerItem_Click); - // - // TXTstatus - // - this.TXTstatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.adminMachineToolStripMenuItem.Name = "adminMachineToolStripMenuItem"; + this.adminMachineToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.adminMachineToolStripMenuItem.Text = "Service"; + // + // passwordToolStripMenuItem + // + this.passwordToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon; + this.passwordToolStripMenuItem.Name = "passwordToolStripMenuItem"; + this.passwordToolStripMenuItem.Size = new System.Drawing.Size(234, 22); + this.passwordToolStripMenuItem.Text = "Password"; + this.passwordToolStripMenuItem.Click += new System.EventHandler(this.passwordToolStripMenuItem_Click); + // + // goBackToStandardModeToolStripMenuItem + // + this.goBackToStandardModeToolStripMenuItem.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon; + this.goBackToStandardModeToolStripMenuItem.Name = "goBackToStandardModeToolStripMenuItem"; + this.goBackToStandardModeToolStripMenuItem.Size = new System.Drawing.Size(234, 22); + this.goBackToStandardModeToolStripMenuItem.Text = "Go back to standard mode"; + this.goBackToStandardModeToolStripMenuItem.Visible = false; + this.goBackToStandardModeToolStripMenuItem.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem_Click); + // + // toolStripSeparator + // + this.toolStripSeparator.Name = "toolStripSeparator"; + this.toolStripSeparator.Size = new System.Drawing.Size(231, 6); + this.toolStripSeparator.Visible = false; + // + // resetSpindleHoursToolStripMenuItem + // + this.resetSpindleHoursToolStripMenuItem.Name = "resetSpindleHoursToolStripMenuItem"; + this.resetSpindleHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22); + this.resetSpindleHoursToolStripMenuItem.Text = "Reset Spindle Active Time"; + this.resetSpindleHoursToolStripMenuItem.Visible = false; + this.resetSpindleHoursToolStripMenuItem.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem_Click); + // + // resetCountersToolStripMenuItem + // + this.resetCountersToolStripMenuItem.Name = "resetCountersToolStripMenuItem"; + this.resetCountersToolStripMenuItem.Size = new System.Drawing.Size(234, 22); + this.resetCountersToolStripMenuItem.Text = "Reset CMS-Active Counters"; + this.resetCountersToolStripMenuItem.Visible = false; + this.resetCountersToolStripMenuItem.Click += new System.EventHandler(this.resetCountersToolStripMenuItem_Click); + // + // resetMachineWorkingHoursToolStripMenuItem + // + this.resetMachineWorkingHoursToolStripMenuItem.Name = "resetMachineWorkingHoursToolStripMenuItem"; + this.resetMachineWorkingHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22); + this.resetMachineWorkingHoursToolStripMenuItem.Text = "Reset Machine Working Hours"; + this.resetMachineWorkingHoursToolStripMenuItem.Visible = false; + this.resetMachineWorkingHoursToolStripMenuItem.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(171, 6); + // + // StopServerItem + // + this.StopServerItem.Name = "StopServerItem"; + this.StopServerItem.Size = new System.Drawing.Size(174, 22); + this.StopServerItem.Text = "Close Active Server"; + this.StopServerItem.Click += new System.EventHandler(this.StopServerItem_Click); + // + // TXTstatus + // + this.TXTstatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.SetColumnSpan(this.TXTstatus, 2); - this.TXTstatus.Enabled = false; - this.TXTstatus.Location = new System.Drawing.Point(3, 435); - this.TXTstatus.Name = "TXTstatus"; - this.TXTstatus.ReadOnly = true; - this.TXTstatus.Size = new System.Drawing.Size(438, 20); - this.TXTstatus.TabIndex = 8; - this.TXTstatus.Text = "..."; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.tableLayoutPanel1.SetColumnSpan(this.TXTstatus, 2); + this.TXTstatus.Enabled = false; + this.TXTstatus.Location = new System.Drawing.Point(3, 620); + this.TXTstatus.Name = "TXTstatus"; + this.TXTstatus.ReadOnly = true; + this.TXTstatus.Size = new System.Drawing.Size(438, 20); + this.TXTstatus.TabIndex = 8; + this.TXTstatus.Text = "..."; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.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.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Controls.Add(this.stopServerButton, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.openUiButton, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.TXTstatus, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.LISTThreadStatus, 0, 0); - this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 27); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 89F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(444, 457); - this.tableLayoutPanel1.TabIndex = 58; - // - // stopServerButton - // - this.stopServerButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.stopServerButton, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.openUiButton, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.TXTstatus, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.LISTThreadStatus, 0, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 27); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 3; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 89F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 54F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(444, 642); + this.tableLayoutPanel1.TabIndex = 58; + // + // stopServerButton + // + this.stopServerButton.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.stopServerButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.stopServerButton.Location = new System.Drawing.Point(225, 381); - this.stopServerButton.Name = "stopServerButton"; - this.stopServerButton.Size = new System.Drawing.Size(216, 48); - this.stopServerButton.TabIndex = 3; - this.stopServerButton.TabStop = false; - this.stopServerButton.Text = "Close Active"; - this.stopServerButton.Click += new System.EventHandler(this.StopServerButton_Click); - // - // openUiButton - // - this.openUiButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.stopServerButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.stopServerButton.Location = new System.Drawing.Point(225, 566); + this.stopServerButton.Name = "stopServerButton"; + this.stopServerButton.Size = new System.Drawing.Size(216, 48); + this.stopServerButton.TabIndex = 3; + this.stopServerButton.TabStop = false; + this.stopServerButton.Text = "Close Active"; + this.stopServerButton.Click += new System.EventHandler(this.StopServerButton_Click); + // + // openUiButton + // + this.openUiButton.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.openUiButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.openUiButton.Location = new System.Drawing.Point(3, 381); - this.openUiButton.Name = "openUiButton"; - this.openUiButton.Size = new System.Drawing.Size(216, 48); - this.openUiButton.TabIndex = 58; - this.openUiButton.TabStop = false; - this.openUiButton.Text = "Open Active Client"; - this.openUiButton.Click += new System.EventHandler(this.OpenUiButton_Click); - // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.openUiButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.openUiButton.Location = new System.Drawing.Point(3, 566); + this.openUiButton.Name = "openUiButton"; + this.openUiButton.Size = new System.Drawing.Size(216, 48); + this.openUiButton.TabIndex = 58; + this.openUiButton.TabStop = false; + this.openUiButton.Text = "Open Active Client"; + this.openUiButton.Click += new System.EventHandler(this.OpenUiButton_Click); + // + // panel1 + // + this.panel1.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.tableLayoutPanel1.SetColumnSpan(this.panel1, 2); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.TXTVersion); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.TXTType); - this.panel1.Controls.Add(this.CHNcConnected); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.TXTMachId); - this.panel1.Location = new System.Drawing.Point(3, 292); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(438, 83); - this.panel1.TabIndex = 9; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 49); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(78, 13); - this.label3.TabIndex = 59; - this.label3.Text = "Active Version:"; - // - // TXTVersion - // - this.TXTVersion.AutoSize = true; - this.TXTVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TXTVersion.Location = new System.Drawing.Point(87, 49); - this.TXTVersion.Name = "TXTVersion"; - this.TXTVersion.Size = new System.Drawing.Size(19, 13); - this.TXTVersion.TabIndex = 58; - this.TXTVersion.Text = "---"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 24); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(44, 13); - this.label1.TabIndex = 54; - this.label1.Text = "Vendor:"; - // - // TXTType - // - this.TXTType.AutoSize = true; - this.TXTType.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TXTType.Location = new System.Drawing.Point(48, 24); - this.TXTType.Name = "TXTType"; - this.TXTType.Size = new System.Drawing.Size(19, 13); - this.TXTType.TabIndex = 53; - this.TXTType.Text = "---"; - // - // CHNcConnected - // - this.CHNcConnected.AutoCheck = false; - this.CHNcConnected.ForeColor = System.Drawing.SystemColors.ControlText; - this.CHNcConnected.Location = new System.Drawing.Point(340, 24); - this.CHNcConnected.Name = "CHNcConnected"; - this.CHNcConnected.Size = new System.Drawing.Size(81, 20); - this.CHNcConnected.TabIndex = 52; - this.CHNcConnected.Text = "Connected"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(142, 24); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(63, 13); - this.label2.TabIndex = 57; - this.label2.Text = "Machine Id:"; - // - // TXTMachId - // - this.TXTMachId.AutoSize = true; - this.TXTMachId.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TXTMachId.Location = new System.Drawing.Point(240, 24); - this.TXTMachId.Name = "TXTMachId"; - this.TXTMachId.Size = new System.Drawing.Size(19, 13); - this.TXTMachId.TabIndex = 56; - this.TXTMachId.Text = "---"; - // - // LISTThreadStatus - // - this.LISTThreadStatus.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.tableLayoutPanel1.SetColumnSpan(this.panel1, 2); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.TXTVersion); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.TXTType); + this.panel1.Controls.Add(this.CHNcConnected); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.TXTMachId); + this.panel1.Location = new System.Drawing.Point(3, 477); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(438, 83); + this.panel1.TabIndex = 9; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(3, 49); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(78, 13); + this.label3.TabIndex = 59; + this.label3.Text = "Active Version:"; + // + // TXTVersion + // + this.TXTVersion.AutoSize = true; + this.TXTVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.TXTVersion.Location = new System.Drawing.Point(87, 49); + this.TXTVersion.Name = "TXTVersion"; + this.TXTVersion.Size = new System.Drawing.Size(19, 13); + this.TXTVersion.TabIndex = 58; + this.TXTVersion.Text = "---"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 24); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(44, 13); + this.label1.TabIndex = 54; + this.label1.Text = "Vendor:"; + // + // TXTType + // + this.TXTType.AutoSize = true; + this.TXTType.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.TXTType.Location = new System.Drawing.Point(48, 24); + this.TXTType.Name = "TXTType"; + this.TXTType.Size = new System.Drawing.Size(19, 13); + this.TXTType.TabIndex = 53; + this.TXTType.Text = "---"; + // + // CHNcConnected + // + this.CHNcConnected.AutoCheck = false; + this.CHNcConnected.ForeColor = System.Drawing.SystemColors.ControlText; + this.CHNcConnected.Location = new System.Drawing.Point(340, 24); + this.CHNcConnected.Name = "CHNcConnected"; + this.CHNcConnected.Size = new System.Drawing.Size(81, 20); + this.CHNcConnected.TabIndex = 52; + this.CHNcConnected.Text = "Connected"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(142, 24); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(63, 13); + this.label2.TabIndex = 57; + this.label2.Text = "Machine Id:"; + // + // TXTMachId + // + this.TXTMachId.AutoSize = true; + this.TXTMachId.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.TXTMachId.Location = new System.Drawing.Point(240, 24); + this.TXTMachId.Name = "TXTMachId"; + this.TXTMachId.Size = new System.Drawing.Size(19, 13); + this.TXTMachId.TabIndex = 56; + this.TXTMachId.Text = "---"; + // + // LISTThreadStatus + // + this.LISTThreadStatus.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1, this.columnHeader2}); - this.tableLayoutPanel1.SetColumnSpan(this.LISTThreadStatus, 2); - this.LISTThreadStatus.Dock = System.Windows.Forms.DockStyle.Fill; - this.LISTThreadStatus.HideSelection = false; - this.LISTThreadStatus.Location = new System.Drawing.Point(3, 3); - this.LISTThreadStatus.Name = "LISTThreadStatus"; - this.LISTThreadStatus.Size = new System.Drawing.Size(438, 283); - this.LISTThreadStatus.TabIndex = 59; - this.LISTThreadStatus.UseCompatibleStateImageBehavior = false; - this.LISTThreadStatus.View = System.Windows.Forms.View.Details; - // - // columnHeader1 - // - this.columnHeader1.Text = "Thread Name"; - this.columnHeader1.Width = 328; - // - // columnHeader2 - // - this.columnHeader2.Text = "Time"; - this.columnHeader2.Width = 78; - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tableLayoutPanel1.SetColumnSpan(this.LISTThreadStatus, 2); + this.LISTThreadStatus.Dock = System.Windows.Forms.DockStyle.Fill; + this.LISTThreadStatus.HideSelection = false; + this.LISTThreadStatus.Location = new System.Drawing.Point(3, 3); + this.LISTThreadStatus.Name = "LISTThreadStatus"; + this.LISTThreadStatus.Size = new System.Drawing.Size(438, 468); + this.LISTThreadStatus.TabIndex = 59; + this.LISTThreadStatus.UseCompatibleStateImageBehavior = false; + this.LISTThreadStatus.View = System.Windows.Forms.View.Details; + // + // columnHeader1 + // + this.columnHeader1.Text = "Thread Name"; + this.columnHeader1.Width = 200; + // + // columnHeader2 + // + this.columnHeader2.Text = "Time"; + this.columnHeader2.Width = 230; + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(468, 24); - this.menuStrip1.TabIndex = 59; - this.menuStrip1.Text = "menuStrip1"; - // - // menuToolStripMenuItem - // - this.menuToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(468, 24); + this.menuStrip1.TabIndex = 59; + this.menuStrip1.Text = "menuStrip1"; + // + // menuToolStripMenuItem + // + this.menuToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.closeCMSServerToolStripMenuItem, this.toolStripSeparator2, this.serviceToolStripMenuItem}); - this.menuToolStripMenuItem.Name = "menuToolStripMenuItem"; - this.menuToolStripMenuItem.Size = new System.Drawing.Size(50, 20); - this.menuToolStripMenuItem.Text = "Menu"; - // - // closeCMSServerToolStripMenuItem - // - this.closeCMSServerToolStripMenuItem.Name = "closeCMSServerToolStripMenuItem"; - this.closeCMSServerToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.closeCMSServerToolStripMenuItem.Text = "Close Active Server"; - this.closeCMSServerToolStripMenuItem.Click += new System.EventHandler(this.closeCMSServerToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(171, 6); - // - // serviceToolStripMenuItem - // - this.serviceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuToolStripMenuItem.Name = "menuToolStripMenuItem"; + this.menuToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.menuToolStripMenuItem.Text = "Menu"; + // + // closeCMSServerToolStripMenuItem + // + this.closeCMSServerToolStripMenuItem.Name = "closeCMSServerToolStripMenuItem"; + this.closeCMSServerToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.closeCMSServerToolStripMenuItem.Text = "Close Active Server"; + this.closeCMSServerToolStripMenuItem.Click += new System.EventHandler(this.closeCMSServerToolStripMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(171, 6); + // + // serviceToolStripMenuItem + // + this.serviceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.passwordToolStripMenuItem1, this.goBackToStandardModeToolStripMenuItem1, this.toolStripSeparator1, this.resetSpindleHoursToolStripMenuItem1, this.resetCountersToolStripMenuItem1, this.resetMachineWorkingHoursToolStripMenuItem1}); - this.serviceToolStripMenuItem.Name = "serviceToolStripMenuItem"; - this.serviceToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.serviceToolStripMenuItem.Text = "Service"; - // - // passwordToolStripMenuItem1 - // - this.passwordToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon; - this.passwordToolStripMenuItem1.Name = "passwordToolStripMenuItem1"; - this.passwordToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); - this.passwordToolStripMenuItem1.Text = "Password"; - this.passwordToolStripMenuItem1.Click += new System.EventHandler(this.passwordToolStripMenuItem1_Click); - // - // goBackToStandardModeToolStripMenuItem1 - // - this.goBackToStandardModeToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon; - this.goBackToStandardModeToolStripMenuItem1.Name = "goBackToStandardModeToolStripMenuItem1"; - this.goBackToStandardModeToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); - this.goBackToStandardModeToolStripMenuItem1.Text = "Go back to standard mode"; - 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(231, 6); - this.toolStripSeparator1.Visible = false; - // - // resetSpindleHoursToolStripMenuItem1 - // - this.resetSpindleHoursToolStripMenuItem1.Name = "resetSpindleHoursToolStripMenuItem1"; - this.resetSpindleHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); - this.resetSpindleHoursToolStripMenuItem1.Text = "Reset Spindle Active Time"; - this.resetSpindleHoursToolStripMenuItem1.Visible = false; - this.resetSpindleHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem1_Click); - // - // resetCountersToolStripMenuItem1 - // - this.resetCountersToolStripMenuItem1.Name = "resetCountersToolStripMenuItem1"; - this.resetCountersToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); - this.resetCountersToolStripMenuItem1.Text = "Reset CMS-Active Counters"; - this.resetCountersToolStripMenuItem1.Visible = false; - this.resetCountersToolStripMenuItem1.Click += new System.EventHandler(this.resetCountersToolStripMenuItem1_Click); - // - // resetMachineWorkingHoursToolStripMenuItem1 - // - this.resetMachineWorkingHoursToolStripMenuItem1.Name = "resetMachineWorkingHoursToolStripMenuItem1"; - this.resetMachineWorkingHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); - this.resetMachineWorkingHoursToolStripMenuItem1.Text = "Reset Machine Working Hours"; - this.resetMachineWorkingHoursToolStripMenuItem1.Visible = false; - this.resetMachineWorkingHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem1_Click); - // - // ServerControlWindow - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(468, 496); - this.Controls.Add(this.menuStrip1); - this.Controls.Add(this.tableLayoutPanel1); - this.ForeColor = System.Drawing.SystemColors.ControlText; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.Margin = new System.Windows.Forms.Padding(2); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "ServerControlWindow"; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ServerControlWindow_FormClosing); - this.Load += new System.EventHandler(this.ServerControlWindow_Load); - this.NotifyIconMenu.ResumeLayout(false); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.serviceToolStripMenuItem.Name = "serviceToolStripMenuItem"; + this.serviceToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.serviceToolStripMenuItem.Text = "Service"; + // + // passwordToolStripMenuItem1 + // + this.passwordToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Lock_icon; + this.passwordToolStripMenuItem1.Name = "passwordToolStripMenuItem1"; + this.passwordToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); + this.passwordToolStripMenuItem1.Text = "Password"; + this.passwordToolStripMenuItem1.Click += new System.EventHandler(this.passwordToolStripMenuItem1_Click); + // + // goBackToStandardModeToolStripMenuItem1 + // + this.goBackToStandardModeToolStripMenuItem1.Image = global::Thermo.Active.UI.Properties.Resources.Apps_Unlock_icon; + this.goBackToStandardModeToolStripMenuItem1.Name = "goBackToStandardModeToolStripMenuItem1"; + this.goBackToStandardModeToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); + this.goBackToStandardModeToolStripMenuItem1.Text = "Go back to standard mode"; + 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(231, 6); + this.toolStripSeparator1.Visible = false; + // + // resetSpindleHoursToolStripMenuItem1 + // + this.resetSpindleHoursToolStripMenuItem1.Name = "resetSpindleHoursToolStripMenuItem1"; + this.resetSpindleHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); + this.resetSpindleHoursToolStripMenuItem1.Text = "Reset Spindle Active Time"; + this.resetSpindleHoursToolStripMenuItem1.Visible = false; + this.resetSpindleHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem1_Click); + // + // resetCountersToolStripMenuItem1 + // + this.resetCountersToolStripMenuItem1.Name = "resetCountersToolStripMenuItem1"; + this.resetCountersToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); + this.resetCountersToolStripMenuItem1.Text = "Reset CMS-Active Counters"; + this.resetCountersToolStripMenuItem1.Visible = false; + this.resetCountersToolStripMenuItem1.Click += new System.EventHandler(this.resetCountersToolStripMenuItem1_Click); + // + // resetMachineWorkingHoursToolStripMenuItem1 + // + this.resetMachineWorkingHoursToolStripMenuItem1.Name = "resetMachineWorkingHoursToolStripMenuItem1"; + this.resetMachineWorkingHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22); + this.resetMachineWorkingHoursToolStripMenuItem1.Text = "Reset Machine Working Hours"; + this.resetMachineWorkingHoursToolStripMenuItem1.Visible = false; + this.resetMachineWorkingHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem1_Click); + // + // ServerControlWindow + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(468, 681); + this.Controls.Add(this.menuStrip1); + this.Controls.Add(this.tableLayoutPanel1); + this.ForeColor = System.Drawing.SystemColors.ControlText; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(2); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ServerControlWindow"; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ServerControlWindow_FormClosing); + this.Load += new System.EventHandler(this.ServerControlWindow_Load); + this.NotifyIconMenu.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/Thermo.Active.UI/ServerControlWindow.cs b/Thermo.Active.UI/ServerControlWindow.cs index 1c2d72f2..81cfcba4 100644 --- a/Thermo.Active.UI/ServerControlWindow.cs +++ b/Thermo.Active.UI/ServerControlWindow.cs @@ -267,16 +267,18 @@ namespace Thermo.Active.UI if (!isUpdatingThreads) { isUpdatingThreads = true; - Dictionary Threads = new Dictionary((Dictionary)a); - //Begin the update - LISTThreadStatus.BeginUpdate(); - //clear the List - LISTThreadStatus.Items.Clear(); - //Add all items - foreach (KeyValuePair Thr in Threads) + Dictionary myThreads = new Dictionary((Dictionary)a); + //Begin the update + LISTThreadStatus.BeginUpdate(); + //clear the List + LISTThreadStatus.Items.Clear(); + //Add all items + foreach (KeyValuePair Thr in myThreads) + { LISTThreadStatus.Items.Add(new ListViewItem(new String[]{Thr.Key,Thr.Value })); - //End the update - LISTThreadStatus.EndUpdate(); + } + //End the update + LISTThreadStatus.EndUpdate(); isUpdatingThreads = false; } });