From 23a0f0e377f87e515651671e9f65d94fb03f42c7 Mon Sep 17 00:00:00 2001 From: Seonjae Date: Fri, 31 Mar 2023 10:47:21 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CurrentDisplay=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Log/ControlMenuLogAlarm.Designer.cs | 353 +++---- INT_PT002/Controls/Log/ControlMenuLogAlarm.cs | 38 +- .../Controls/Log/ControlMenuLogHistory.cs | 4 +- .../Log/ControlMenuLogInspection.Designer.cs | 116 +-- .../Controls/Log/ControlMenuLogInspection.cs | 4 +- .../ControlMenuManualIoTest.Designer.cs | 440 ++++---- .../Manual/ControlMenuManualIoTest.cs | 29 +- .../Recipe/ControlMenuRecipeSetting.cs | 9 +- .../System/ControlMenuSystemInformation.cs | 4 +- .../ControlMenuSystemStatus.Designer.cs | 112 +-- .../System/ControlMenuSystemStatus.cs | 107 +- .../User/ControlMenuUserGroupEditor.cs | 3 +- .../User/ControlMenuUserUserEditor.cs | 4 +- INT_PT002/DataStore/Define.cs | 39 +- INT_PT002/DataStore/SystemStatus.cs | 27 +- INT_PT002/DialogForms/DialogFormMessage.cs | 89 +- INT_PT002/Forms/FormMain.cs | 70 +- INT_PT002/Forms/FormMainDisplay1.cs | 2 +- INT_PT002/Forms/FormMainDisplay2.Designer.cs | 941 +++++++++--------- INT_PT002/Forms/FormMainDisplay2.cs | 69 +- INT_PT002/Forms/FormMenu.Designer.cs | 34 +- INT_PT002/Forms/FormMenu.cs | 105 +- 22 files changed, 1349 insertions(+), 1250 deletions(-) diff --git a/INT_PT002/Controls/Log/ControlMenuLogAlarm.Designer.cs b/INT_PT002/Controls/Log/ControlMenuLogAlarm.Designer.cs index fad1719..8da4b6d 100644 --- a/INT_PT002/Controls/Log/ControlMenuLogAlarm.Designer.cs +++ b/INT_PT002/Controls/Log/ControlMenuLogAlarm.Designer.cs @@ -29,17 +29,17 @@ private void InitializeComponent() { this.smartGroupBox1 = new SmartX.SmartGroupBox(); - this.smartLabel1 = new SmartX.SmartLabel(); + this.treeViewLogAlarm = new System.Windows.Forms.TreeView(); + this.smartLabel6 = new SmartX.SmartLabel(); + this.smartLabel5 = new SmartX.SmartLabel(); + this.smartLabel4 = new SmartX.SmartLabel(); + this.smartLabel3 = new SmartX.SmartLabel(); + this.smartLabel2 = new SmartX.SmartLabel(); + this.labelPath = new SmartX.SmartLabel(); this.buttonBackup = new SmartX.SmartButton(); this.labelCount = new SmartX.SmartLabel(); - this.smartListBox1 = new SmartX.SmartListBox(); - this.treeViewLogAlarm = new System.Windows.Forms.TreeView(); - this.smartLabel2 = new SmartX.SmartLabel(); - this.smartLabel3 = new SmartX.SmartLabel(); - this.smartLabel4 = new SmartX.SmartLabel(); - this.smartLabel5 = new SmartX.SmartLabel(); - this.smartLabel6 = new SmartX.SmartLabel(); this.smartLabel7 = new SmartX.SmartLabel(); + this.smartListBox1 = new SmartX.SmartListBox(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -54,7 +54,7 @@ this.smartGroupBox1.Controls.Add(this.smartLabel4); this.smartGroupBox1.Controls.Add(this.smartLabel3); this.smartGroupBox1.Controls.Add(this.smartLabel2); - this.smartGroupBox1.Controls.Add(this.smartLabel1); + this.smartGroupBox1.Controls.Add(this.labelPath); this.smartGroupBox1.Controls.Add(this.buttonBackup); this.smartGroupBox1.Controls.Add(this.labelCount); this.smartGroupBox1.Controls.Add(this.smartListBox1); @@ -72,28 +72,150 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // - // smartLabel1 + // treeViewLogAlarm // - this.smartLabel1.BackGround = this.smartGroupBox1; - this.smartLabel1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(64)))), ((int)(((byte)(66))))); - this.smartLabel1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel1.Font = new System.Drawing.Font("새굴림", 17F, System.Drawing.FontStyle.Bold); - this.smartLabel1.LineSpacing = 0F; - this.smartLabel1.Location = new System.Drawing.Point(333, 69); - this.smartLabel1.Name = "smartLabel1"; - this.smartLabel1.OverlapOptimize = true; - this.smartLabel1.PasswordChar = '\0'; - this.smartLabel1.Radius = 10; - this.smartLabel1.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); - this.smartLabel1.Size = new System.Drawing.Size(460, 41); - this.smartLabel1.TabIndex = 85; - this.smartLabel1.Text = "00"; - this.smartLabel1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel1.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel1.Wordwrap = false; + this.treeViewLogAlarm.Location = new System.Drawing.Point(32, 157); + this.treeViewLogAlarm.Name = "treeViewLogAlarm"; + this.treeViewLogAlarm.Size = new System.Drawing.Size(282, 483); + this.treeViewLogAlarm.TabIndex = 81; + this.treeViewLogAlarm.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeViewLogAlarm_AfterSelect); + // + // smartLabel6 + // + this.smartLabel6.BackGround = this.smartGroupBox1; + this.smartLabel6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(64)))), ((int)(((byte)(66))))); + this.smartLabel6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.smartLabel6.Font = new System.Drawing.Font("New Gulim", 17F, System.Drawing.FontStyle.Bold); + this.smartLabel6.LineSpacing = 0F; + this.smartLabel6.Location = new System.Drawing.Point(24, 148); + this.smartLabel6.Name = "smartLabel6"; + this.smartLabel6.OverlapOptimize = true; + this.smartLabel6.PasswordChar = '\0'; + this.smartLabel6.Radius = 10; + this.smartLabel6.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); + this.smartLabel6.Size = new System.Drawing.Size(299, 500); + this.smartLabel6.TabIndex = 90; + this.smartLabel6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel6.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel6.Wordwrap = false; + // + // smartLabel5 + // + this.smartLabel5.BackGround = this.smartGroupBox1; + this.smartLabel5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); + this.smartLabel5.BorderColor = System.Drawing.Color.Black; + this.smartLabel5.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel5.LineSpacing = 0F; + this.smartLabel5.Location = new System.Drawing.Point(333, 124); + this.smartLabel5.Name = "smartLabel5"; + this.smartLabel5.OverlapOptimize = true; + this.smartLabel5.PasswordChar = '\0'; + this.smartLabel5.Radius = 3; + this.smartLabel5.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel5.Size = new System.Drawing.Size(556, 18); + this.smartLabel5.TabIndex = 89; + this.smartLabel5.Text = "Contents"; + this.smartLabel5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel5.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel5.Wordwrap = false; + // + // smartLabel4 + // + this.smartLabel4.BackGround = this.smartGroupBox1; + this.smartLabel4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); + this.smartLabel4.BorderColor = System.Drawing.Color.Black; + this.smartLabel4.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel4.LineSpacing = 0F; + this.smartLabel4.Location = new System.Drawing.Point(24, 124); + this.smartLabel4.Name = "smartLabel4"; + this.smartLabel4.OverlapOptimize = true; + this.smartLabel4.PasswordChar = '\0'; + this.smartLabel4.Radius = 3; + this.smartLabel4.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel4.Size = new System.Drawing.Size(299, 18); + this.smartLabel4.TabIndex = 88; + this.smartLabel4.Text = "List"; + this.smartLabel4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel4.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel4.Wordwrap = false; + // + // smartLabel3 + // + this.smartLabel3.BackGround = this.smartGroupBox1; + this.smartLabel3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); + this.smartLabel3.BorderColor = System.Drawing.Color.Black; + this.smartLabel3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel3.LineSpacing = 0F; + this.smartLabel3.Location = new System.Drawing.Point(333, 47); + this.smartLabel3.Name = "smartLabel3"; + this.smartLabel3.OverlapOptimize = true; + this.smartLabel3.PasswordChar = '\0'; + this.smartLabel3.Radius = 3; + this.smartLabel3.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel3.Size = new System.Drawing.Size(460, 18); + this.smartLabel3.TabIndex = 87; + this.smartLabel3.Text = "File name"; + this.smartLabel3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel3.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel3.Wordwrap = false; + // + // smartLabel2 + // + this.smartLabel2.BackGround = this.smartGroupBox1; + this.smartLabel2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); + this.smartLabel2.BorderColor = System.Drawing.Color.Black; + this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel2.LineSpacing = 0F; + this.smartLabel2.Location = new System.Drawing.Point(24, 47); + this.smartLabel2.Name = "smartLabel2"; + this.smartLabel2.OverlapOptimize = true; + this.smartLabel2.PasswordChar = '\0'; + this.smartLabel2.Radius = 3; + this.smartLabel2.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel2.Size = new System.Drawing.Size(299, 18); + this.smartLabel2.TabIndex = 86; + this.smartLabel2.Text = "Count"; + this.smartLabel2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel2.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel2.Wordwrap = false; + // + // labelPath + // + this.labelPath.BackGround = this.smartGroupBox1; + this.labelPath.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(64)))), ((int)(((byte)(66))))); + this.labelPath.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.labelPath.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelPath.Font = new System.Drawing.Font("New Gulim", 17F, System.Drawing.FontStyle.Bold); + this.labelPath.LineSpacing = 0F; + this.labelPath.Location = new System.Drawing.Point(333, 69); + this.labelPath.Name = "labelPath"; + this.labelPath.OverlapOptimize = true; + this.labelPath.PasswordChar = '\0'; + this.labelPath.Radius = 10; + this.labelPath.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); + this.labelPath.Size = new System.Drawing.Size(460, 41); + this.labelPath.TabIndex = 85; + this.labelPath.Text = "00"; + this.labelPath.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.labelPath.TextColorDisable = System.Drawing.Color.Gray; + this.labelPath.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelPath.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelPath.Wordwrap = false; // // buttonBackup // @@ -136,7 +258,7 @@ this.labelCount.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(64)))), ((int)(((byte)(66))))); this.labelCount.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); this.labelCount.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelCount.Font = new System.Drawing.Font("새굴림", 17F, System.Drawing.FontStyle.Bold); + this.labelCount.Font = new System.Drawing.Font("New Gulim", 17F, System.Drawing.FontStyle.Bold); this.labelCount.LineSpacing = 0F; this.labelCount.Location = new System.Drawing.Point(24, 69); this.labelCount.Name = "labelCount"; @@ -153,6 +275,28 @@ this.labelCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelCount.Wordwrap = false; // + // smartLabel7 + // + this.smartLabel7.BackGround = this.smartGroupBox1; + this.smartLabel7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(64)))), ((int)(((byte)(66))))); + this.smartLabel7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.smartLabel7.Font = new System.Drawing.Font("New Gulim", 17F, System.Drawing.FontStyle.Bold); + this.smartLabel7.LineSpacing = 0F; + this.smartLabel7.Location = new System.Drawing.Point(333, 148); + this.smartLabel7.Name = "smartLabel7"; + this.smartLabel7.OverlapOptimize = true; + this.smartLabel7.PasswordChar = '\0'; + this.smartLabel7.Radius = 10; + this.smartLabel7.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); + this.smartLabel7.Size = new System.Drawing.Size(556, 500); + this.smartLabel7.TabIndex = 91; + this.smartLabel7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); + this.smartLabel7.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel7.Wordwrap = false; + // // smartListBox1 // this.smartListBox1.BackGround = null; @@ -263,149 +407,6 @@ this.smartListBox1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartListBox1.TextColorDisable = System.Drawing.Color.Gray; // - // treeViewLogAlarm - // - this.treeViewLogAlarm.Location = new System.Drawing.Point(32, 157); - this.treeViewLogAlarm.Name = "treeViewLogAlarm"; - this.treeViewLogAlarm.Size = new System.Drawing.Size(282, 483); - this.treeViewLogAlarm.TabIndex = 81; - // - // smartLabel2 - // - this.smartLabel2.BackGround = this.smartGroupBox1; - this.smartLabel2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); - this.smartLabel2.BorderColor = System.Drawing.Color.Black; - this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel2.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(24, 47); - this.smartLabel2.Name = "smartLabel2"; - this.smartLabel2.OverlapOptimize = true; - this.smartLabel2.PasswordChar = '\0'; - this.smartLabel2.Radius = 3; - this.smartLabel2.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel2.Size = new System.Drawing.Size(299, 18); - this.smartLabel2.TabIndex = 86; - this.smartLabel2.Text = "Count"; - this.smartLabel2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel2.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel2.Wordwrap = false; - // - // smartLabel3 - // - this.smartLabel3.BackGround = this.smartGroupBox1; - this.smartLabel3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); - this.smartLabel3.BorderColor = System.Drawing.Color.Black; - this.smartLabel3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel3.LineSpacing = 0F; - this.smartLabel3.Location = new System.Drawing.Point(333, 47); - this.smartLabel3.Name = "smartLabel3"; - this.smartLabel3.OverlapOptimize = true; - this.smartLabel3.PasswordChar = '\0'; - this.smartLabel3.Radius = 3; - this.smartLabel3.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel3.Size = new System.Drawing.Size(460, 18); - this.smartLabel3.TabIndex = 87; - this.smartLabel3.Text = "File name"; - this.smartLabel3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel3.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel3.Wordwrap = false; - // - // smartLabel4 - // - this.smartLabel4.BackGround = this.smartGroupBox1; - this.smartLabel4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); - this.smartLabel4.BorderColor = System.Drawing.Color.Black; - this.smartLabel4.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel4.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel4.LineSpacing = 0F; - this.smartLabel4.Location = new System.Drawing.Point(24, 124); - this.smartLabel4.Name = "smartLabel4"; - this.smartLabel4.OverlapOptimize = true; - this.smartLabel4.PasswordChar = '\0'; - this.smartLabel4.Radius = 3; - this.smartLabel4.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel4.Size = new System.Drawing.Size(299, 18); - this.smartLabel4.TabIndex = 88; - this.smartLabel4.Text = "List"; - this.smartLabel4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel4.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel4.Wordwrap = false; - // - // smartLabel5 - // - this.smartLabel5.BackGround = this.smartGroupBox1; - this.smartLabel5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); - this.smartLabel5.BorderColor = System.Drawing.Color.Black; - this.smartLabel5.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel5.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(333, 124); - this.smartLabel5.Name = "smartLabel5"; - this.smartLabel5.OverlapOptimize = true; - this.smartLabel5.PasswordChar = '\0'; - this.smartLabel5.Radius = 3; - this.smartLabel5.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel5.Size = new System.Drawing.Size(556, 18); - this.smartLabel5.TabIndex = 89; - this.smartLabel5.Text = "Contents"; - this.smartLabel5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel5.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel5.Wordwrap = false; - // - // smartLabel6 - // - this.smartLabel6.BackGround = this.smartGroupBox1; - this.smartLabel6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(64)))), ((int)(((byte)(66))))); - this.smartLabel6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel6.Font = new System.Drawing.Font("새굴림", 17F, System.Drawing.FontStyle.Bold); - this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(24, 148); - this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.OverlapOptimize = true; - this.smartLabel6.PasswordChar = '\0'; - this.smartLabel6.Radius = 10; - this.smartLabel6.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); - this.smartLabel6.Size = new System.Drawing.Size(299, 500); - this.smartLabel6.TabIndex = 90; - this.smartLabel6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel6.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel6.Wordwrap = false; - // - // smartLabel7 - // - this.smartLabel7.BackGround = this.smartGroupBox1; - this.smartLabel7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(64)))), ((int)(((byte)(66))))); - this.smartLabel7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel7.Font = new System.Drawing.Font("새굴림", 17F, System.Drawing.FontStyle.Bold); - this.smartLabel7.LineSpacing = 0F; - this.smartLabel7.Location = new System.Drawing.Point(333, 148); - this.smartLabel7.Name = "smartLabel7"; - this.smartLabel7.OverlapOptimize = true; - this.smartLabel7.PasswordChar = '\0'; - this.smartLabel7.Radius = 10; - this.smartLabel7.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); - this.smartLabel7.Size = new System.Drawing.Size(556, 500); - this.smartLabel7.TabIndex = 91; - this.smartLabel7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); - this.smartLabel7.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel7.Wordwrap = false; - // // ControlMenuLogAlarm // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -423,14 +424,14 @@ private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartButton buttonBackup; private SmartX.SmartLabel labelCount; - private SmartX.SmartListBox smartListBox1; private System.Windows.Forms.TreeView treeViewLogAlarm; - private SmartX.SmartLabel smartLabel1; + private SmartX.SmartLabel labelPath; private SmartX.SmartLabel smartLabel3; private SmartX.SmartLabel smartLabel2; private SmartX.SmartLabel smartLabel6; private SmartX.SmartLabel smartLabel5; private SmartX.SmartLabel smartLabel4; private SmartX.SmartLabel smartLabel7; + private SmartX.SmartListBox smartListBox1; } } diff --git a/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs b/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs index 5ca527d..cc127f5 100644 --- a/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs +++ b/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs @@ -133,32 +133,28 @@ namespace INT_PT002.Controls } } - this.labelCount.Text = fileCount.ToString(); + this.labelCount.Text = string.Format("{0} ", fileCount); } private List DayAlarmDirectorySort(FileInfo[] files) { List listFile = new List(); Dictionary dirNames = new Dictionary(); - - #region File List 품번 순서대로 정렬 - foreach (FileInfo file in files) - dirNames.Add(file.Name, int.Parse(file.Name.Substring(10, 1))); - - var vrList = dirNames.OrderBy(x => x.Value); - foreach (var v in vrList) - listFile.Add(v.Key); - #endregion + Dictionary dirNamesSort = new Dictionary(); #region File List 날짜 순서대로 정렬 - dirNames = new Dictionary(); - foreach (string f in listFile) - dirNames.Add(f, int.Parse(f.Substring(1, 8))); + foreach (FileInfo file in files) + dirNames.Add(file.Name, int.Parse(file.Name.Substring(0, 8))); + + var vrList = dirNames.Keys.ToList(); + vrList.Sort(); - listFile.Clear(); - vrList = dirNames.OrderBy(x => x.Value); foreach (var v in vrList) + dirNamesSort.Add(v, dirNames[v]); + + foreach (var v in dirNamesSort) listFile.Add(v.Key); + #endregion return listFile; @@ -166,8 +162,7 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormAlarmList; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Menu); this.SelecteDataType = Define.E_DataType.None; @@ -183,6 +178,15 @@ namespace INT_PT002.Controls } #endregion + private void treeViewLogAlarm_AfterSelect(object sender, TreeViewEventArgs e) + { + //this.labelPath.Text = e.Node.Text; + //for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) + // this.CollectionListBox[i].ClearAll(); + //this.listBoxTime.ClearAll(); + //this.LoadFile(this.ParentForm.ParentForm.PathDataInspectionFolder + this.treeViewInspection.SelectedNode.FullPath); + } + #region Event Handler #endregion diff --git a/INT_PT002/Controls/Log/ControlMenuLogHistory.cs b/INT_PT002/Controls/Log/ControlMenuLogHistory.cs index d0a001e..37dbf16 100644 --- a/INT_PT002/Controls/Log/ControlMenuLogHistory.cs +++ b/INT_PT002/Controls/Log/ControlMenuLogHistory.cs @@ -191,8 +191,8 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormCheckLog; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.LogHistory; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Menu); this.SelecteDataType = Define.E_DataType.None; diff --git a/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs b/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs index 550d772..b83f9ac 100644 --- a/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs +++ b/INT_PT002/Controls/Log/ControlMenuLogInspection.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.labelCount = new SmartX.SmartLabel(); this.smartLabel32 = new SmartX.SmartLabel(); this.smartLabel33 = new SmartX.SmartLabel(); this.labelPassCount10 = new SmartX.SmartLabel(); @@ -80,7 +81,6 @@ this.buttonBackup = new SmartX.SmartButton(); this.listBoxTime = new SmartX.SmartListBox(); this.smartFile1 = new SmartX.SmartFile(); - this.labelCount = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -153,13 +153,36 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // + // labelCount + // + this.labelCount.BackGround = this.smartGroupBox1; + this.labelCount.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.labelCount.BorderColor = System.Drawing.Color.Black; + this.labelCount.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); + this.labelCount.LineSpacing = 0F; + this.labelCount.Location = new System.Drawing.Point(22, 51); + this.labelCount.Name = "labelCount"; + this.labelCount.OverlapOptimize = true; + this.labelCount.PasswordChar = '\0'; + this.labelCount.Radius = 3; + this.labelCount.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelCount.Size = new System.Drawing.Size(240, 50); + this.labelCount.TabIndex = 130; + this.labelCount.Text = "00"; + this.labelCount.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelCount.TextColorDisable = System.Drawing.Color.Gray; + this.labelCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelCount.Wordwrap = false; + // // smartLabel32 // this.smartLabel32.BackGround = this.smartGroupBox1; this.smartLabel32.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel32.BorderColor = System.Drawing.Color.Black; this.smartLabel32.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel32.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel32.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel32.LineSpacing = 0F; this.smartLabel32.Location = new System.Drawing.Point(268, 603); this.smartLabel32.Name = "smartLabel32"; @@ -182,7 +205,7 @@ this.smartLabel33.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel33.BorderColor = System.Drawing.Color.Black; this.smartLabel33.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel33.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel33.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel33.LineSpacing = 0F; this.smartLabel33.Location = new System.Drawing.Point(268, 622); this.smartLabel33.Name = "smartLabel33"; @@ -205,7 +228,7 @@ this.labelPassCount10.BackGroundColor = System.Drawing.Color.White; this.labelPassCount10.BorderColor = System.Drawing.Color.Black; this.labelPassCount10.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount10.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount10.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount10.LineSpacing = 0F; this.labelPassCount10.Location = new System.Drawing.Point(788, 603); this.labelPassCount10.Name = "labelPassCount10"; @@ -228,7 +251,7 @@ this.labelLeakCount10.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount10.BorderColor = System.Drawing.Color.Black; this.labelLeakCount10.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount10.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount10.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount10.LineSpacing = 0F; this.labelLeakCount10.Location = new System.Drawing.Point(788, 622); this.labelLeakCount10.Name = "labelLeakCount10"; @@ -251,7 +274,7 @@ this.labelPassCount9.BackGroundColor = System.Drawing.Color.White; this.labelPassCount9.BorderColor = System.Drawing.Color.Black; this.labelPassCount9.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount9.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount9.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount9.LineSpacing = 0F; this.labelPassCount9.Location = new System.Drawing.Point(739, 603); this.labelPassCount9.Name = "labelPassCount9"; @@ -274,7 +297,7 @@ this.labelLeakCount9.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount9.BorderColor = System.Drawing.Color.Black; this.labelLeakCount9.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount9.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount9.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount9.LineSpacing = 0F; this.labelLeakCount9.Location = new System.Drawing.Point(739, 622); this.labelLeakCount9.Name = "labelLeakCount9"; @@ -297,7 +320,7 @@ this.labelPassCount8.BackGroundColor = System.Drawing.Color.White; this.labelPassCount8.BorderColor = System.Drawing.Color.Black; this.labelPassCount8.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount8.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount8.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount8.LineSpacing = 0F; this.labelPassCount8.Location = new System.Drawing.Point(690, 603); this.labelPassCount8.Name = "labelPassCount8"; @@ -320,7 +343,7 @@ this.labelLeakCount8.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount8.BorderColor = System.Drawing.Color.Black; this.labelLeakCount8.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount8.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount8.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount8.LineSpacing = 0F; this.labelLeakCount8.Location = new System.Drawing.Point(690, 622); this.labelLeakCount8.Name = "labelLeakCount8"; @@ -343,7 +366,7 @@ this.labelPassCount7.BackGroundColor = System.Drawing.Color.White; this.labelPassCount7.BorderColor = System.Drawing.Color.Black; this.labelPassCount7.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount7.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount7.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount7.LineSpacing = 0F; this.labelPassCount7.Location = new System.Drawing.Point(641, 603); this.labelPassCount7.Name = "labelPassCount7"; @@ -366,7 +389,7 @@ this.labelLeakCount7.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount7.BorderColor = System.Drawing.Color.Black; this.labelLeakCount7.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount7.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount7.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount7.LineSpacing = 0F; this.labelLeakCount7.Location = new System.Drawing.Point(641, 622); this.labelLeakCount7.Name = "labelLeakCount7"; @@ -389,7 +412,7 @@ this.labelPassCount6.BackGroundColor = System.Drawing.Color.White; this.labelPassCount6.BorderColor = System.Drawing.Color.Black; this.labelPassCount6.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount6.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount6.LineSpacing = 0F; this.labelPassCount6.Location = new System.Drawing.Point(592, 603); this.labelPassCount6.Name = "labelPassCount6"; @@ -412,7 +435,7 @@ this.labelLeakCount6.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount6.BorderColor = System.Drawing.Color.Black; this.labelLeakCount6.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount6.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount6.LineSpacing = 0F; this.labelLeakCount6.Location = new System.Drawing.Point(592, 622); this.labelLeakCount6.Name = "labelLeakCount6"; @@ -435,7 +458,7 @@ this.labelPassCount5.BackGroundColor = System.Drawing.Color.White; this.labelPassCount5.BorderColor = System.Drawing.Color.Black; this.labelPassCount5.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount5.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount5.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount5.LineSpacing = 0F; this.labelPassCount5.Location = new System.Drawing.Point(543, 603); this.labelPassCount5.Name = "labelPassCount5"; @@ -458,7 +481,7 @@ this.labelLeakCount5.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount5.BorderColor = System.Drawing.Color.Black; this.labelLeakCount5.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount5.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount5.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount5.LineSpacing = 0F; this.labelLeakCount5.Location = new System.Drawing.Point(543, 622); this.labelLeakCount5.Name = "labelLeakCount5"; @@ -481,7 +504,7 @@ this.labelPassCount4.BackGroundColor = System.Drawing.Color.White; this.labelPassCount4.BorderColor = System.Drawing.Color.Black; this.labelPassCount4.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount4.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount4.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount4.LineSpacing = 0F; this.labelPassCount4.Location = new System.Drawing.Point(494, 603); this.labelPassCount4.Name = "labelPassCount4"; @@ -504,7 +527,7 @@ this.labelLeakCount4.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount4.BorderColor = System.Drawing.Color.Black; this.labelLeakCount4.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount4.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount4.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount4.LineSpacing = 0F; this.labelLeakCount4.Location = new System.Drawing.Point(494, 622); this.labelLeakCount4.Name = "labelLeakCount4"; @@ -527,7 +550,7 @@ this.labelPassCount3.BackGroundColor = System.Drawing.Color.White; this.labelPassCount3.BorderColor = System.Drawing.Color.Black; this.labelPassCount3.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount3.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount3.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount3.LineSpacing = 0F; this.labelPassCount3.Location = new System.Drawing.Point(445, 603); this.labelPassCount3.Name = "labelPassCount3"; @@ -550,7 +573,7 @@ this.labelLeakCount3.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount3.BorderColor = System.Drawing.Color.Black; this.labelLeakCount3.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount3.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount3.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount3.LineSpacing = 0F; this.labelLeakCount3.Location = new System.Drawing.Point(445, 622); this.labelLeakCount3.Name = "labelLeakCount3"; @@ -573,7 +596,7 @@ this.labelPassCount2.BackGroundColor = System.Drawing.Color.White; this.labelPassCount2.BorderColor = System.Drawing.Color.Black; this.labelPassCount2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount2.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount2.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount2.LineSpacing = 0F; this.labelPassCount2.Location = new System.Drawing.Point(396, 603); this.labelPassCount2.Name = "labelPassCount2"; @@ -596,7 +619,7 @@ this.labelLeakCount2.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount2.BorderColor = System.Drawing.Color.Black; this.labelLeakCount2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount2.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount2.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount2.LineSpacing = 0F; this.labelLeakCount2.Location = new System.Drawing.Point(396, 622); this.labelLeakCount2.Name = "labelLeakCount2"; @@ -619,7 +642,7 @@ this.labelPassCount1.BackGroundColor = System.Drawing.Color.White; this.labelPassCount1.BorderColor = System.Drawing.Color.Black; this.labelPassCount1.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelPassCount1.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelPassCount1.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelPassCount1.LineSpacing = 0F; this.labelPassCount1.Location = new System.Drawing.Point(347, 603); this.labelPassCount1.Name = "labelPassCount1"; @@ -642,7 +665,7 @@ this.labelLeakCount1.BackGroundColor = System.Drawing.Color.White; this.labelLeakCount1.BorderColor = System.Drawing.Color.Black; this.labelLeakCount1.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelLeakCount1.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.labelLeakCount1.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Regular); this.labelLeakCount1.LineSpacing = 0F; this.labelLeakCount1.Location = new System.Drawing.Point(347, 622); this.labelLeakCount1.Name = "labelLeakCount1"; @@ -665,7 +688,7 @@ this.labelPath.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelPath.BorderColor = System.Drawing.Color.Black; this.labelPath.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelPath.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelPath.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); this.labelPath.LineSpacing = 0F; this.labelPath.Location = new System.Drawing.Point(268, 51); this.labelPath.Name = "labelPath"; @@ -803,7 +826,7 @@ this.smartLabel11.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel11.BorderColor = System.Drawing.Color.Black; this.smartLabel11.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel11.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel11.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel11.LineSpacing = 1F; this.smartLabel11.Location = new System.Drawing.Point(788, 107); this.smartLabel11.Name = "smartLabel11"; @@ -826,7 +849,7 @@ this.smartLabel10.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel10.BorderColor = System.Drawing.Color.Black; this.smartLabel10.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel10.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel10.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel10.LineSpacing = 1F; this.smartLabel10.Location = new System.Drawing.Point(739, 107); this.smartLabel10.Name = "smartLabel10"; @@ -849,7 +872,7 @@ this.smartLabel9.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel9.BorderColor = System.Drawing.Color.Black; this.smartLabel9.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel9.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel9.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel9.LineSpacing = 1F; this.smartLabel9.Location = new System.Drawing.Point(690, 107); this.smartLabel9.Name = "smartLabel9"; @@ -872,7 +895,7 @@ this.smartLabel8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel8.BorderColor = System.Drawing.Color.Black; this.smartLabel8.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel8.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel8.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel8.LineSpacing = 1F; this.smartLabel8.Location = new System.Drawing.Point(641, 107); this.smartLabel8.Name = "smartLabel8"; @@ -895,7 +918,7 @@ this.smartLabel7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel7.BorderColor = System.Drawing.Color.Black; this.smartLabel7.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel7.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel7.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel7.LineSpacing = 1F; this.smartLabel7.Location = new System.Drawing.Point(592, 107); this.smartLabel7.Name = "smartLabel7"; @@ -918,7 +941,7 @@ this.smartLabel6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel6.BorderColor = System.Drawing.Color.Black; this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel6.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel6.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel6.LineSpacing = 1F; this.smartLabel6.Location = new System.Drawing.Point(543, 107); this.smartLabel6.Name = "smartLabel6"; @@ -941,7 +964,7 @@ this.smartLabel5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel5.BorderColor = System.Drawing.Color.Black; this.smartLabel5.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel5.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel5.LineSpacing = 1F; this.smartLabel5.Location = new System.Drawing.Point(494, 107); this.smartLabel5.Name = "smartLabel5"; @@ -964,7 +987,7 @@ this.smartLabel4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel4.BorderColor = System.Drawing.Color.Black; this.smartLabel4.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel4.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel4.LineSpacing = 1F; this.smartLabel4.Location = new System.Drawing.Point(445, 107); this.smartLabel4.Name = "smartLabel4"; @@ -987,7 +1010,7 @@ this.smartLabel3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel3.BorderColor = System.Drawing.Color.Black; this.smartLabel3.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel3.LineSpacing = 1F; this.smartLabel3.Location = new System.Drawing.Point(396, 107); this.smartLabel3.Name = "smartLabel3"; @@ -1010,7 +1033,7 @@ this.smartLabel2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel2.BorderColor = System.Drawing.Color.Black; this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel2.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel2.LineSpacing = 1F; this.smartLabel2.Location = new System.Drawing.Point(347, 107); this.smartLabel2.Name = "smartLabel2"; @@ -1033,7 +1056,7 @@ this.smartLabel1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartLabel1.BorderColor = System.Drawing.Color.Black; this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.smartLabel1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.smartLabel1.LineSpacing = 1F; this.smartLabel1.Location = new System.Drawing.Point(268, 107); this.smartLabel1.Name = "smartLabel1"; @@ -2332,29 +2355,6 @@ // this.smartFile1.FilePathName = ""; // - // labelCount - // - this.labelCount.BackGround = this.smartGroupBox1; - this.labelCount.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelCount.BorderColor = System.Drawing.Color.Black; - this.labelCount.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelCount.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); - this.labelCount.LineSpacing = 0F; - this.labelCount.Location = new System.Drawing.Point(22, 51); - this.labelCount.Name = "labelCount"; - this.labelCount.OverlapOptimize = true; - this.labelCount.PasswordChar = '\0'; - this.labelCount.Radius = 3; - this.labelCount.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelCount.Size = new System.Drawing.Size(240, 50); - this.labelCount.TabIndex = 130; - this.labelCount.Text = "00"; - this.labelCount.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelCount.TextColorDisable = System.Drawing.Color.Gray; - this.labelCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelCount.Wordwrap = false; - // // ControlMenuLogInspection // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT_PT002/Controls/Log/ControlMenuLogInspection.cs b/INT_PT002/Controls/Log/ControlMenuLogInspection.cs index 42c8ed7..a087462 100644 --- a/INT_PT002/Controls/Log/ControlMenuLogInspection.cs +++ b/INT_PT002/Controls/Log/ControlMenuLogInspection.cs @@ -291,8 +291,8 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormEquipmentLog; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.LogInspection; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Menu); this.SelecteDataType = Define.E_DataType.None; diff --git a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs index 6050e2d..5a905ef 100644 --- a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs +++ b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs @@ -60,11 +60,11 @@ this.smartLabel83 = new SmartX.SmartLabel(); this.labelDisp6 = new SmartX.SmartLabel(); this.smartLabel85 = new SmartX.SmartLabel(); - this.smartLabel86 = new SmartX.SmartLabel(); - this.smartLabel87 = new SmartX.SmartLabel(); - this.smartLabel88 = new SmartX.SmartLabel(); - this.smartLabel89 = new SmartX.SmartLabel(); - this.smartLabel90 = new SmartX.SmartLabel(); + this.labelSbAlarm10 = new SmartX.SmartLabel(); + this.labelSbAlarm9 = new SmartX.SmartLabel(); + this.labelSbAlarm8 = new SmartX.SmartLabel(); + this.labelSbAlarm7 = new SmartX.SmartLabel(); + this.labelSbAlarm6 = new SmartX.SmartLabel(); this.smartLabel91 = new SmartX.SmartLabel(); this.smartLabel92 = new SmartX.SmartLabel(); this.smartLabel93 = new SmartX.SmartLabel(); @@ -100,11 +100,11 @@ this.smartLabel21 = new SmartX.SmartLabel(); this.labelDisp1 = new SmartX.SmartLabel(); this.smartLabel32 = new SmartX.SmartLabel(); - this.smartLabel18 = new SmartX.SmartLabel(); - this.smartLabel11 = new SmartX.SmartLabel(); - this.smartLabel16 = new SmartX.SmartLabel(); - this.smartLabel24 = new SmartX.SmartLabel(); - this.smartLabel25 = new SmartX.SmartLabel(); + this.labelSbAlarm5 = new SmartX.SmartLabel(); + this.labelSbAlarm4 = new SmartX.SmartLabel(); + this.labelSbAlarm3 = new SmartX.SmartLabel(); + this.labelSbAlarm2 = new SmartX.SmartLabel(); + this.labelSbAlarm1 = new SmartX.SmartLabel(); this.smartLabel31 = new SmartX.SmartLabel(); this.smartLabel34 = new SmartX.SmartLabel(); this.smartLabel35 = new SmartX.SmartLabel(); @@ -214,11 +214,11 @@ this.smartGroupBox4.Controls.Add(this.smartLabel83); this.smartGroupBox4.Controls.Add(this.labelDisp6); this.smartGroupBox4.Controls.Add(this.smartLabel85); - this.smartGroupBox4.Controls.Add(this.smartLabel86); - this.smartGroupBox4.Controls.Add(this.smartLabel87); - this.smartGroupBox4.Controls.Add(this.smartLabel88); - this.smartGroupBox4.Controls.Add(this.smartLabel89); - this.smartGroupBox4.Controls.Add(this.smartLabel90); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm10); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm9); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm8); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm7); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm6); this.smartGroupBox4.Controls.Add(this.smartLabel91); this.smartGroupBox4.Controls.Add(this.smartLabel92); this.smartGroupBox4.Controls.Add(this.smartLabel93); @@ -254,11 +254,11 @@ this.smartGroupBox4.Controls.Add(this.smartLabel21); this.smartGroupBox4.Controls.Add(this.labelDisp1); this.smartGroupBox4.Controls.Add(this.smartLabel32); - this.smartGroupBox4.Controls.Add(this.smartLabel18); - this.smartGroupBox4.Controls.Add(this.smartLabel11); - this.smartGroupBox4.Controls.Add(this.smartLabel16); - this.smartGroupBox4.Controls.Add(this.smartLabel24); - this.smartGroupBox4.Controls.Add(this.smartLabel25); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm5); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm4); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm3); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm2); + this.smartGroupBox4.Controls.Add(this.labelSbAlarm1); this.smartGroupBox4.Controls.Add(this.smartLabel31); this.smartGroupBox4.Controls.Add(this.smartLabel34); this.smartGroupBox4.Controls.Add(this.smartLabel35); @@ -967,110 +967,110 @@ this.smartLabel85.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel85.Wordwrap = false; // - // smartLabel86 + // labelSbAlarm10 // - this.smartLabel86.BackGround = null; - this.smartLabel86.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel86.BorderColor = System.Drawing.Color.Lime; - this.smartLabel86.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel86.LineSpacing = 0F; - this.smartLabel86.Location = new System.Drawing.Point(791, 113); - this.smartLabel86.Name = "smartLabel86"; - this.smartLabel86.OverlapOptimize = true; - this.smartLabel86.PasswordChar = '\0'; - this.smartLabel86.Radius = 20; - this.smartLabel86.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel86.Size = new System.Drawing.Size(20, 20); - this.smartLabel86.TabIndex = 168; - this.smartLabel86.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel86.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel86.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel86.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel86.Wordwrap = false; + this.labelSbAlarm10.BackGround = null; + this.labelSbAlarm10.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm10.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm10.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm10.LineSpacing = 0F; + this.labelSbAlarm10.Location = new System.Drawing.Point(791, 113); + this.labelSbAlarm10.Name = "labelSbAlarm10"; + this.labelSbAlarm10.OverlapOptimize = true; + this.labelSbAlarm10.PasswordChar = '\0'; + this.labelSbAlarm10.Radius = 20; + this.labelSbAlarm10.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm10.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm10.TabIndex = 168; + this.labelSbAlarm10.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm10.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm10.Wordwrap = false; // - // smartLabel87 + // labelSbAlarm9 // - this.smartLabel87.BackGround = null; - this.smartLabel87.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel87.BorderColor = System.Drawing.Color.Lime; - this.smartLabel87.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel87.LineSpacing = 0F; - this.smartLabel87.Location = new System.Drawing.Point(630, 113); - this.smartLabel87.Name = "smartLabel87"; - this.smartLabel87.OverlapOptimize = true; - this.smartLabel87.PasswordChar = '\0'; - this.smartLabel87.Radius = 20; - this.smartLabel87.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel87.Size = new System.Drawing.Size(20, 20); - this.smartLabel87.TabIndex = 167; - this.smartLabel87.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel87.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel87.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel87.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel87.Wordwrap = false; + this.labelSbAlarm9.BackGround = null; + this.labelSbAlarm9.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm9.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm9.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm9.LineSpacing = 0F; + this.labelSbAlarm9.Location = new System.Drawing.Point(630, 113); + this.labelSbAlarm9.Name = "labelSbAlarm9"; + this.labelSbAlarm9.OverlapOptimize = true; + this.labelSbAlarm9.PasswordChar = '\0'; + this.labelSbAlarm9.Radius = 20; + this.labelSbAlarm9.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm9.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm9.TabIndex = 167; + this.labelSbAlarm9.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm9.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm9.Wordwrap = false; // - // smartLabel88 + // labelSbAlarm8 // - this.smartLabel88.BackGround = null; - this.smartLabel88.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel88.BorderColor = System.Drawing.Color.Lime; - this.smartLabel88.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel88.LineSpacing = 0F; - this.smartLabel88.Location = new System.Drawing.Point(469, 113); - this.smartLabel88.Name = "smartLabel88"; - this.smartLabel88.OverlapOptimize = true; - this.smartLabel88.PasswordChar = '\0'; - this.smartLabel88.Radius = 20; - this.smartLabel88.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel88.Size = new System.Drawing.Size(20, 20); - this.smartLabel88.TabIndex = 166; - this.smartLabel88.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel88.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel88.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel88.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel88.Wordwrap = false; + this.labelSbAlarm8.BackGround = null; + this.labelSbAlarm8.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm8.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm8.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm8.LineSpacing = 0F; + this.labelSbAlarm8.Location = new System.Drawing.Point(469, 113); + this.labelSbAlarm8.Name = "labelSbAlarm8"; + this.labelSbAlarm8.OverlapOptimize = true; + this.labelSbAlarm8.PasswordChar = '\0'; + this.labelSbAlarm8.Radius = 20; + this.labelSbAlarm8.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm8.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm8.TabIndex = 166; + this.labelSbAlarm8.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm8.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm8.Wordwrap = false; // - // smartLabel89 + // labelSbAlarm7 // - this.smartLabel89.BackGround = null; - this.smartLabel89.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel89.BorderColor = System.Drawing.Color.Lime; - this.smartLabel89.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel89.LineSpacing = 0F; - this.smartLabel89.Location = new System.Drawing.Point(308, 113); - this.smartLabel89.Name = "smartLabel89"; - this.smartLabel89.OverlapOptimize = true; - this.smartLabel89.PasswordChar = '\0'; - this.smartLabel89.Radius = 20; - this.smartLabel89.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel89.Size = new System.Drawing.Size(20, 20); - this.smartLabel89.TabIndex = 165; - this.smartLabel89.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel89.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel89.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel89.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel89.Wordwrap = false; + this.labelSbAlarm7.BackGround = null; + this.labelSbAlarm7.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm7.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm7.LineSpacing = 0F; + this.labelSbAlarm7.Location = new System.Drawing.Point(308, 113); + this.labelSbAlarm7.Name = "labelSbAlarm7"; + this.labelSbAlarm7.OverlapOptimize = true; + this.labelSbAlarm7.PasswordChar = '\0'; + this.labelSbAlarm7.Radius = 20; + this.labelSbAlarm7.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm7.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm7.TabIndex = 165; + this.labelSbAlarm7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm7.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm7.Wordwrap = false; // - // smartLabel90 + // labelSbAlarm6 // - this.smartLabel90.BackGround = null; - this.smartLabel90.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel90.BorderColor = System.Drawing.Color.Lime; - this.smartLabel90.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel90.LineSpacing = 0F; - this.smartLabel90.Location = new System.Drawing.Point(147, 113); - this.smartLabel90.Name = "smartLabel90"; - this.smartLabel90.OverlapOptimize = true; - this.smartLabel90.PasswordChar = '\0'; - this.smartLabel90.Radius = 20; - this.smartLabel90.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel90.Size = new System.Drawing.Size(20, 20); - this.smartLabel90.TabIndex = 164; - this.smartLabel90.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel90.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel90.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel90.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel90.Wordwrap = false; + this.labelSbAlarm6.BackGround = null; + this.labelSbAlarm6.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm6.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm6.LineSpacing = 0F; + this.labelSbAlarm6.Location = new System.Drawing.Point(147, 113); + this.labelSbAlarm6.Name = "labelSbAlarm6"; + this.labelSbAlarm6.OverlapOptimize = true; + this.labelSbAlarm6.PasswordChar = '\0'; + this.labelSbAlarm6.Radius = 20; + this.labelSbAlarm6.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm6.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm6.TabIndex = 164; + this.labelSbAlarm6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm6.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm6.Wordwrap = false; // // smartLabel91 // @@ -1877,110 +1877,110 @@ this.smartLabel32.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel32.Wordwrap = false; // - // smartLabel18 + // labelSbAlarm5 // - this.smartLabel18.BackGround = null; - this.smartLabel18.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel18.BorderColor = System.Drawing.Color.Lime; - this.smartLabel18.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel18.LineSpacing = 0F; - this.smartLabel18.Location = new System.Drawing.Point(791, 12); - this.smartLabel18.Name = "smartLabel18"; - this.smartLabel18.OverlapOptimize = true; - this.smartLabel18.PasswordChar = '\0'; - this.smartLabel18.Radius = 20; - this.smartLabel18.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel18.Size = new System.Drawing.Size(20, 20); - this.smartLabel18.TabIndex = 123; - this.smartLabel18.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel18.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel18.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel18.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel18.Wordwrap = false; + this.labelSbAlarm5.BackGround = null; + this.labelSbAlarm5.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm5.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm5.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm5.LineSpacing = 0F; + this.labelSbAlarm5.Location = new System.Drawing.Point(791, 12); + this.labelSbAlarm5.Name = "labelSbAlarm5"; + this.labelSbAlarm5.OverlapOptimize = true; + this.labelSbAlarm5.PasswordChar = '\0'; + this.labelSbAlarm5.Radius = 20; + this.labelSbAlarm5.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm5.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm5.TabIndex = 123; + this.labelSbAlarm5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm5.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm5.Wordwrap = false; // - // smartLabel11 + // labelSbAlarm4 // - this.smartLabel11.BackGround = null; - this.smartLabel11.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel11.BorderColor = System.Drawing.Color.Lime; - this.smartLabel11.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel11.LineSpacing = 0F; - this.smartLabel11.Location = new System.Drawing.Point(630, 12); - this.smartLabel11.Name = "smartLabel11"; - this.smartLabel11.OverlapOptimize = true; - this.smartLabel11.PasswordChar = '\0'; - this.smartLabel11.Radius = 20; - this.smartLabel11.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel11.Size = new System.Drawing.Size(20, 20); - this.smartLabel11.TabIndex = 122; - this.smartLabel11.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel11.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel11.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel11.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel11.Wordwrap = false; + this.labelSbAlarm4.BackGround = null; + this.labelSbAlarm4.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm4.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm4.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm4.LineSpacing = 0F; + this.labelSbAlarm4.Location = new System.Drawing.Point(630, 12); + this.labelSbAlarm4.Name = "labelSbAlarm4"; + this.labelSbAlarm4.OverlapOptimize = true; + this.labelSbAlarm4.PasswordChar = '\0'; + this.labelSbAlarm4.Radius = 20; + this.labelSbAlarm4.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm4.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm4.TabIndex = 122; + this.labelSbAlarm4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm4.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm4.Wordwrap = false; // - // smartLabel16 + // labelSbAlarm3 // - this.smartLabel16.BackGround = null; - this.smartLabel16.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel16.BorderColor = System.Drawing.Color.Lime; - this.smartLabel16.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel16.LineSpacing = 0F; - this.smartLabel16.Location = new System.Drawing.Point(469, 12); - this.smartLabel16.Name = "smartLabel16"; - this.smartLabel16.OverlapOptimize = true; - this.smartLabel16.PasswordChar = '\0'; - this.smartLabel16.Radius = 20; - this.smartLabel16.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel16.Size = new System.Drawing.Size(20, 20); - this.smartLabel16.TabIndex = 121; - this.smartLabel16.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel16.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel16.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel16.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel16.Wordwrap = false; + this.labelSbAlarm3.BackGround = null; + this.labelSbAlarm3.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm3.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm3.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm3.LineSpacing = 0F; + this.labelSbAlarm3.Location = new System.Drawing.Point(469, 12); + this.labelSbAlarm3.Name = "labelSbAlarm3"; + this.labelSbAlarm3.OverlapOptimize = true; + this.labelSbAlarm3.PasswordChar = '\0'; + this.labelSbAlarm3.Radius = 20; + this.labelSbAlarm3.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm3.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm3.TabIndex = 121; + this.labelSbAlarm3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm3.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm3.Wordwrap = false; // - // smartLabel24 + // labelSbAlarm2 // - this.smartLabel24.BackGround = null; - this.smartLabel24.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel24.BorderColor = System.Drawing.Color.Lime; - this.smartLabel24.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel24.LineSpacing = 0F; - this.smartLabel24.Location = new System.Drawing.Point(308, 12); - this.smartLabel24.Name = "smartLabel24"; - this.smartLabel24.OverlapOptimize = true; - this.smartLabel24.PasswordChar = '\0'; - this.smartLabel24.Radius = 20; - this.smartLabel24.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel24.Size = new System.Drawing.Size(20, 20); - this.smartLabel24.TabIndex = 120; - this.smartLabel24.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel24.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel24.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel24.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel24.Wordwrap = false; + this.labelSbAlarm2.BackGround = null; + this.labelSbAlarm2.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm2.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm2.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm2.LineSpacing = 0F; + this.labelSbAlarm2.Location = new System.Drawing.Point(308, 12); + this.labelSbAlarm2.Name = "labelSbAlarm2"; + this.labelSbAlarm2.OverlapOptimize = true; + this.labelSbAlarm2.PasswordChar = '\0'; + this.labelSbAlarm2.Radius = 20; + this.labelSbAlarm2.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm2.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm2.TabIndex = 120; + this.labelSbAlarm2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm2.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm2.Wordwrap = false; // - // smartLabel25 + // labelSbAlarm1 // - this.smartLabel25.BackGround = null; - this.smartLabel25.BackGroundColor = System.Drawing.Color.Lime; - this.smartLabel25.BorderColor = System.Drawing.Color.Lime; - this.smartLabel25.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.smartLabel25.LineSpacing = 0F; - this.smartLabel25.Location = new System.Drawing.Point(147, 12); - this.smartLabel25.Name = "smartLabel25"; - this.smartLabel25.OverlapOptimize = true; - this.smartLabel25.PasswordChar = '\0'; - this.smartLabel25.Radius = 20; - this.smartLabel25.RoundRectFillColor = System.Drawing.Color.Lime; - this.smartLabel25.Size = new System.Drawing.Size(20, 20); - this.smartLabel25.TabIndex = 119; - this.smartLabel25.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel25.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel25.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel25.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.smartLabel25.Wordwrap = false; + this.labelSbAlarm1.BackGround = null; + this.labelSbAlarm1.BackGroundColor = System.Drawing.Color.Lime; + this.labelSbAlarm1.BorderColor = System.Drawing.Color.Lime; + this.labelSbAlarm1.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm1.LineSpacing = 0F; + this.labelSbAlarm1.Location = new System.Drawing.Point(147, 12); + this.labelSbAlarm1.Name = "labelSbAlarm1"; + this.labelSbAlarm1.OverlapOptimize = true; + this.labelSbAlarm1.PasswordChar = '\0'; + this.labelSbAlarm1.Radius = 20; + this.labelSbAlarm1.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelSbAlarm1.Size = new System.Drawing.Size(20, 20); + this.labelSbAlarm1.TabIndex = 119; + this.labelSbAlarm1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm1.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm1.Wordwrap = false; // // smartLabel31 // @@ -3352,11 +3352,11 @@ private SmartX.SmartLabel smartLabel10; private SmartX.SmartSeparatorLine smartSeparatorLine1; private SmartX.SmartGroupBox smartGroupBox4; - public SmartX.SmartLabel smartLabel18; - public SmartX.SmartLabel smartLabel11; - public SmartX.SmartLabel smartLabel16; - public SmartX.SmartLabel smartLabel24; - public SmartX.SmartLabel smartLabel25; + public SmartX.SmartLabel labelSbAlarm5; + public SmartX.SmartLabel labelSbAlarm4; + public SmartX.SmartLabel labelSbAlarm3; + public SmartX.SmartLabel labelSbAlarm2; + public SmartX.SmartLabel labelSbAlarm1; private SmartX.SmartLabel smartLabel31; private SmartX.SmartLabel smartLabel34; private SmartX.SmartLabel smartLabel35; @@ -3398,11 +3398,11 @@ private SmartX.SmartLabel smartLabel83; private SmartX.SmartLabel labelDisp6; private SmartX.SmartLabel smartLabel85; - public SmartX.SmartLabel smartLabel86; - public SmartX.SmartLabel smartLabel87; - public SmartX.SmartLabel smartLabel88; - public SmartX.SmartLabel smartLabel89; - public SmartX.SmartLabel smartLabel90; + public SmartX.SmartLabel labelSbAlarm10; + public SmartX.SmartLabel labelSbAlarm9; + public SmartX.SmartLabel labelSbAlarm8; + public SmartX.SmartLabel labelSbAlarm7; + public SmartX.SmartLabel labelSbAlarm6; private SmartX.SmartLabel smartLabel91; private SmartX.SmartLabel smartLabel92; private SmartX.SmartLabel smartLabel93; diff --git a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs index c1741cb..ebf520c 100644 --- a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs +++ b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs @@ -26,6 +26,7 @@ namespace INT_PT002.Controls private Collection CollLabelDisp; private Collection CollLabelVacu; private Collection CollLabelInput; + private Collection CollLabelSbAlarm; #endregion #region Constructor @@ -97,11 +98,25 @@ namespace INT_PT002.Controls this.CollLabelInput.Add(this.labelInput4); this.CollLabelInput.Add(this.labelInput5); + this.CollLabelSbAlarm = new Collection(); + this.CollLabelSbAlarm.Clear(); + this.CollLabelSbAlarm.Add(this.labelSbAlarm1); + this.CollLabelSbAlarm.Add(this.labelSbAlarm2); + this.CollLabelSbAlarm.Add(this.labelSbAlarm3); + this.CollLabelSbAlarm.Add(this.labelSbAlarm4); + this.CollLabelSbAlarm.Add(this.labelSbAlarm5); + this.CollLabelSbAlarm.Add(this.labelSbAlarm6); + this.CollLabelSbAlarm.Add(this.labelSbAlarm7); + this.CollLabelSbAlarm.Add(this.labelSbAlarm8); + this.CollLabelSbAlarm.Add(this.labelSbAlarm9); + this.CollLabelSbAlarm.Add(this.labelSbAlarm10); + for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) { this.CollLabelDiff[i].Text = "0.00"; this.CollLabelDisp[i].Text = "0.00"; this.CollLabelVacu[i].Text = "0.0"; + this.CollLabelSbAlarm[i].Visible = false; } for (int i = 0; i < this.CollLabelInput.Count; i++) @@ -149,12 +164,22 @@ namespace INT_PT002.Controls public void UpdateDisplayAlarmView(AlarmList alarm) { + this.CollLabelSbAlarm[0].Visible = alarm.CollectionIsSensorBoardError[0]; + this.CollLabelSbAlarm[1].Visible = alarm.CollectionIsSensorBoardError[1]; + this.CollLabelSbAlarm[2].Visible = alarm.CollectionIsSensorBoardError[2]; + this.CollLabelSbAlarm[3].Visible = alarm.CollectionIsSensorBoardError[3]; + this.CollLabelSbAlarm[4].Visible = alarm.CollectionIsSensorBoardError[4]; + this.CollLabelSbAlarm[5].Visible = alarm.CollectionIsSensorBoardError[5]; + this.CollLabelSbAlarm[6].Visible = alarm.CollectionIsSensorBoardError[6]; + this.CollLabelSbAlarm[7].Visible = alarm.CollectionIsSensorBoardError[7]; + this.CollLabelSbAlarm[8].Visible = alarm.CollectionIsSensorBoardError[8]; + this.CollLabelSbAlarm[9].Visible = alarm.CollectionIsSensorBoardError[9]; } public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormIOTest; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.IOTest); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.IOTest; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.IOTest); } #endregion diff --git a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs index 466fc01..8f5e087 100644 --- a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs +++ b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs @@ -144,8 +144,7 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormProduct; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Menu); this.UpdateDisplayControlData(this.ParentForm.ParentForm.CurrentRecipe); this.UpdateDisplayControlData(this.ParentForm.ParentForm.SystemConfig); } @@ -154,9 +153,9 @@ namespace INT_PT002.Controls #region Event Handler private void labelNumber_Click(object sender, EventArgs e) { - string afterValue = ""; + string before = "", after = ""; - afterValue = this.labelNumber.Text; + before = this.labelNumber.Text; DialogFormNumKeyPad myKeypad = new DialogFormNumKeyPad(this.smartLabel17.Text, this.labelNumber.Text, 4, 0, false); if (myKeypad.ShowDialog() == DialogResult.OK) @@ -164,7 +163,7 @@ namespace INT_PT002.Controls if (myKeypad.IntValue < 1 || myKeypad.IntValue > 1000) { this.MessageBoxRange = "1 ~ 1000"; - this.labelPressureLevel.Text = afterValue; + this.labelPressureLevel.Text = before; this.smartTimerMessageShow.Start(); return; } diff --git a/INT_PT002/Controls/System/ControlMenuSystemInformation.cs b/INT_PT002/Controls/System/ControlMenuSystemInformation.cs index 8ca7927..64de11a 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemInformation.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemInformation.cs @@ -260,8 +260,8 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormInformation; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.Information; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Menu); this.smartKeyboard1.Hide(); diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs b/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs index ffb6cfe..e1702e0 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemStatus.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.smartGroupBox1 = new SmartX.SmartGroupBox(); - this.buttonStart = new SmartX.SmartButton(); + this.buttonInspection = new SmartX.SmartButton(); this.labelProgress5 = new SmartX.SmartLabel(); this.smartGroupBox4 = new SmartX.SmartGroupBox(); this.labelDiffMean3 = new SmartX.SmartLabel(); @@ -310,7 +310,7 @@ this.smartGroupBox1.BackGround = null; this.smartGroupBox1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.smartGroupBox1.BackImage = null; - this.smartGroupBox1.Controls.Add(this.buttonStart); + this.smartGroupBox1.Controls.Add(this.buttonInspection); this.smartGroupBox1.Controls.Add(this.labelProgress5); this.smartGroupBox1.Controls.Add(this.smartGroupBox4); this.smartGroupBox1.Controls.Add(this.smartGroupBox5); @@ -343,40 +343,40 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // - // buttonStart + // buttonInspection // - this.buttonStart.BackGround = this.smartGroupBox1; - this.buttonStart.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.buttonStart.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); - this.buttonStart.ButtonDownColor = System.Drawing.Color.SlateGray; - this.buttonStart.ButtonImageAutoSize = true; - this.buttonStart.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.buttonStart.ButtonText = "Inspection"; - this.buttonStart.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonStart.GroupID = 0; - this.buttonStart.ImageDisable = null; - this.buttonStart.ImageDown = null; - this.buttonStart.ImageUp = null; - this.buttonStart.Location = new System.Drawing.Point(819, 37); - this.buttonStart.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonStart.Name = "buttonStart"; - this.buttonStart.NestedClickEventPrevent = false; - this.buttonStart.OutlinePixel = 2; - this.buttonStart.OverlapOptimize = true; - this.buttonStart.RepeatInterval = 200; - this.buttonStart.RepeatIntervalAccelerate = null; - this.buttonStart.RoundSize = 10; - this.buttonStart.SafeInterval = 200; - this.buttonStart.Size = new System.Drawing.Size(84, 40); - this.buttonStart.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonStart.TabIndex = 91; - this.buttonStart.Text = null; - this.buttonStart.TextColor = System.Drawing.Color.White; - this.buttonStart.TextColorDisable = System.Drawing.Color.Gray; - this.buttonStart.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); - this.buttonStart.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonStart.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonStart.Click += new System.EventHandler(this.buttonStart_Click); + this.buttonInspection.BackGround = this.smartGroupBox1; + this.buttonInspection.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.buttonInspection.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.buttonInspection.ButtonDownColor = System.Drawing.Color.SlateGray; + this.buttonInspection.ButtonImageAutoSize = true; + this.buttonInspection.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.buttonInspection.ButtonText = "Inspection"; + this.buttonInspection.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonInspection.GroupID = 0; + this.buttonInspection.ImageDisable = null; + this.buttonInspection.ImageDown = null; + this.buttonInspection.ImageUp = null; + this.buttonInspection.Location = new System.Drawing.Point(819, 37); + this.buttonInspection.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonInspection.Name = "buttonInspection"; + this.buttonInspection.NestedClickEventPrevent = false; + this.buttonInspection.OutlinePixel = 2; + this.buttonInspection.OverlapOptimize = true; + this.buttonInspection.RepeatInterval = 200; + this.buttonInspection.RepeatIntervalAccelerate = null; + this.buttonInspection.RoundSize = 10; + this.buttonInspection.SafeInterval = 200; + this.buttonInspection.Size = new System.Drawing.Size(84, 40); + this.buttonInspection.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonInspection.TabIndex = 91; + this.buttonInspection.Text = null; + this.buttonInspection.TextColor = System.Drawing.Color.White; + this.buttonInspection.TextColorDisable = System.Drawing.Color.Gray; + this.buttonInspection.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonInspection.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonInspection.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonInspection.Click += new System.EventHandler(this.buttonInspection_Click); // // labelProgress5 // @@ -1038,7 +1038,7 @@ this.labelDispRData1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData1.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData1.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData1.LineSpacing = 0F; this.labelDispRData1.Location = new System.Drawing.Point(79, 61); this.labelDispRData1.Name = "labelDispRData1"; @@ -1048,7 +1048,7 @@ this.labelDispRData1.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData1.Size = new System.Drawing.Size(90, 20); this.labelDispRData1.TabIndex = 12; - this.labelDispRData1.Text = "-9.23 / -10.00"; + this.labelDispRData1.Text = "-9.23"; this.labelDispRData1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData1.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1478,7 +1478,7 @@ this.labelDispRData3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData3.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData3.LineSpacing = 0F; this.labelDispRData3.Location = new System.Drawing.Point(80, 61); this.labelDispRData3.Name = "labelDispRData3"; @@ -1488,7 +1488,7 @@ this.labelDispRData3.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData3.Size = new System.Drawing.Size(90, 20); this.labelDispRData3.TabIndex = 28; - this.labelDispRData3.Text = "-9.23 / -10.00"; + this.labelDispRData3.Text = "-9.23"; this.labelDispRData3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData3.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -2043,7 +2043,7 @@ this.labelDispRData4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData4.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData4.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData4.LineSpacing = 0F; this.labelDispRData4.Location = new System.Drawing.Point(80, 61); this.labelDispRData4.Name = "labelDispRData4"; @@ -2053,7 +2053,7 @@ this.labelDispRData4.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData4.Size = new System.Drawing.Size(90, 20); this.labelDispRData4.TabIndex = 28; - this.labelDispRData4.Text = "-9.23 / -10.00"; + this.labelDispRData4.Text = "-9.23"; this.labelDispRData4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData4.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -2608,7 +2608,7 @@ this.labelDispRData2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData2.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData2.LineSpacing = 0F; this.labelDispRData2.Location = new System.Drawing.Point(80, 61); this.labelDispRData2.Name = "labelDispRData2"; @@ -2618,7 +2618,7 @@ this.labelDispRData2.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData2.Size = new System.Drawing.Size(90, 20); this.labelDispRData2.TabIndex = 28; - this.labelDispRData2.Text = "-9.23 / -10.00"; + this.labelDispRData2.Text = "-9.23"; this.labelDispRData2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData2.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -3173,7 +3173,7 @@ this.labelDispRData5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData5.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData5.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData5.LineSpacing = 0F; this.labelDispRData5.Location = new System.Drawing.Point(80, 61); this.labelDispRData5.Name = "labelDispRData5"; @@ -3183,7 +3183,7 @@ this.labelDispRData5.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData5.Size = new System.Drawing.Size(90, 20); this.labelDispRData5.TabIndex = 28; - this.labelDispRData5.Text = "-9.23 / -10.00"; + this.labelDispRData5.Text = "-9.23"; this.labelDispRData5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData5.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -3738,7 +3738,7 @@ this.labelDispRData9.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData9.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData9.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData9.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData9.LineSpacing = 0F; this.labelDispRData9.Location = new System.Drawing.Point(80, 61); this.labelDispRData9.Name = "labelDispRData9"; @@ -3748,7 +3748,7 @@ this.labelDispRData9.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData9.Size = new System.Drawing.Size(90, 20); this.labelDispRData9.TabIndex = 28; - this.labelDispRData9.Text = "-9.23 / -10.00"; + this.labelDispRData9.Text = "-9.23"; this.labelDispRData9.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData9.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -4486,7 +4486,7 @@ this.labelDispRData10.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData10.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData10.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData10.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData10.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData10.LineSpacing = 0F; this.labelDispRData10.Location = new System.Drawing.Point(80, 61); this.labelDispRData10.Name = "labelDispRData10"; @@ -4496,7 +4496,7 @@ this.labelDispRData10.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData10.Size = new System.Drawing.Size(90, 20); this.labelDispRData10.TabIndex = 28; - this.labelDispRData10.Text = "-9.23 / -10.00"; + this.labelDispRData10.Text = "-9.23"; this.labelDispRData10.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData10.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -5050,7 +5050,7 @@ this.labelDispRData8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData8.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData8.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData8.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData8.LineSpacing = 0F; this.labelDispRData8.Location = new System.Drawing.Point(77, 61); this.labelDispRData8.Name = "labelDispRData8"; @@ -5060,7 +5060,7 @@ this.labelDispRData8.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData8.Size = new System.Drawing.Size(90, 20); this.labelDispRData8.TabIndex = 28; - this.labelDispRData8.Text = "-9.23 / -10.00"; + this.labelDispRData8.Text = "-9.23"; this.labelDispRData8.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData8.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -5614,7 +5614,7 @@ this.labelDispRData7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData7.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData7.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData7.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData7.LineSpacing = 0F; this.labelDispRData7.Location = new System.Drawing.Point(80, 61); this.labelDispRData7.Name = "labelDispRData7"; @@ -5624,7 +5624,7 @@ this.labelDispRData7.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData7.Size = new System.Drawing.Size(90, 20); this.labelDispRData7.TabIndex = 28; - this.labelDispRData7.Text = "-9.23 / -10.00"; + this.labelDispRData7.Text = "-9.23"; this.labelDispRData7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData7.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -6178,7 +6178,7 @@ this.labelDispRData6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelDispRData6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData6.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDispRData6.Font = new System.Drawing.Font("New Gulim", 8F, System.Drawing.FontStyle.Bold); + this.labelDispRData6.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelDispRData6.LineSpacing = 0F; this.labelDispRData6.Location = new System.Drawing.Point(79, 61); this.labelDispRData6.Name = "labelDispRData6"; @@ -6188,7 +6188,7 @@ this.labelDispRData6.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelDispRData6.Size = new System.Drawing.Size(90, 20); this.labelDispRData6.TabIndex = 28; - this.labelDispRData6.Text = "-9.23 / -10.00"; + this.labelDispRData6.Text = "-9.23"; this.labelDispRData6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDispRData6.TextColorDisable = System.Drawing.Color.Gray; this.labelDispRData6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -6557,7 +6557,7 @@ private SmartX.SmartLabel smartLabel69; private SmartX.SmartSeparatorLine smartSeparatorLine16; private SmartX.SmartLabel labelResult6; - private SmartX.SmartButton buttonStart; + private SmartX.SmartButton buttonInspection; private SmartX.SmartTimer timerOn; private SmartX.SmartTimer timerOff; } diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus.cs b/INT_PT002/Controls/System/ControlMenuSystemStatus.cs index de97849..1499dfa 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemStatus.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemStatus.cs @@ -48,6 +48,7 @@ namespace INT_PT002.Controls this.ParentForm = parent; this.Initialize(); + this.InitializeData(); } #endregion @@ -62,7 +63,7 @@ namespace INT_PT002.Controls #region Method private void Initialize() { - this.smartGroupBox1.Text = "System > E.Test"; + this.smartGroupBox1.Text = "System > Equipment"; this.ColorProgressOff = Color.Azure; this.ColorProgressOn = Color.Lime; @@ -283,6 +284,8 @@ namespace INT_PT002.Controls this.timerOn.Stop(); this.timerOff.Stop(); + this.ParentForm.Set_Equipment_ButtonEnable(true); + if (this.CollectionResult[0].Text == "검사 중..") { for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) @@ -304,6 +307,8 @@ namespace INT_PT002.Controls this.labelProgress7.BackGroundColor = this.ColorProgressOff; this.labelProgress8.BackGroundColor = this.ColorProgressOff; + this.ParentForm.Set_Equipment_ButtonEnable(false); + // Label Initialize //this.InitializeLabel(); break; @@ -495,98 +500,7 @@ namespace INT_PT002.Controls } public void UpdateDisplayAlarmView(AlarmList alarm) { - //if (alarm.IsServoEmergencyStop == true) - // this.labelAlarm.Text = "a1_Servo emergency stop"; - //if (alarm.IsServo1Alarm == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a2_Servo1"; - //} - //if (alarm.IsServo2Alarm == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a3_Servo2"; - //} - //if (alarm.IsServoTorque1AlarmTorque == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a4_Servo1 Torque"; - //} - //if (alarm.IsServoTorque2AlarmTorque == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a5_Servo2 Torque"; - //} - //if (alarm.IsPressureError == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a6_Pressure"; - //} - //if (alarm.CollectionIsSensorBoardError[0] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a7_Sensor board 1"; - //} - //if (alarm.CollectionIsSensorBoardError[1] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a8_Sensor board 2"; - //} - //if (alarm.CollectionIsSensorBoardError[2] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a9_Sensor board 3"; - //} - //if (alarm.CollectionIsSensorBoardError[3] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a10_Sensor board 4"; - //} - //if (alarm.CollectionIsSensorBoardError[4] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a11_Sensor board 5"; - //} - //if (alarm.CollectionIsSensorBoardError[5] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a12_Sensor board 6"; - //} - //if (alarm.CollectionIsSensorBoardError[6] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a13_Sensor board 7"; - //} - //if (alarm.CollectionIsSensorBoardError[7] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a14_Sensor board 8"; - //} - //if (alarm.CollectionIsSensorBoardError[8] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a15_Sensor board 9"; - //} - //if (alarm.CollectionIsSensorBoardError[9] == true) - //{ - // if (this.labelAlarm.Text != "") - // this.labelAlarm.Text += " "; - // this.labelAlarm.Text += "a16_Sensor board 10"; - //} + } public void UpdateDisplayJudgmentData(LeakData datas) @@ -651,14 +565,15 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormStatus; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Normal); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.Equipment; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Normal); } #endregion #region Event Handler - private void buttonStart_Click(object sender, EventArgs e) + private void buttonInspection_Click(object sender, EventArgs e) { + this.InitializeData(); this.ParentForm.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard); } diff --git a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs index 54f2b90..3c7fb8f 100644 --- a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs +++ b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs @@ -142,8 +142,7 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormUserGroupEditor; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Menu); this.UpdateDisplay(this.ParentForm.ParentForm.CurrentUserGroup, this.ParentForm.ParentForm.SystemConfig); diff --git a/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs b/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs index f6c9931..faf6259 100644 --- a/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs +++ b/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs @@ -737,8 +737,8 @@ namespace INT_PT002.Controls public void DisplayRefresh() { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormUserEditor; - this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.UserEditor; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Menu); this.UpdateInitializeUserDisplay(this.ParentForm.ParentForm.SystemConfig); this.UpdateUserListBoxDisplay(this.ParentForm.ParentForm.ListDllUserName); diff --git a/INT_PT002/DataStore/Define.cs b/INT_PT002/DataStore/Define.cs index 2935fa1..7f95bea 100644 --- a/INT_PT002/DataStore/Define.cs +++ b/INT_PT002/DataStore/Define.cs @@ -15,7 +15,14 @@ namespace INT_PT002.DataStore Start = 1, } - public enum E_DisplayMode + public enum E_FormStore + { + FormNone = 0, + FormMainDisplay, + FormMenu, + } + + public enum E_EquipmentMode { Normal, Menu, @@ -61,6 +68,20 @@ namespace INT_PT002.DataStore _2_Status, } + public enum E_DisplayModeStore + { + MainDisplay, + Recipe, + UserEditor, + UserGroupEditor, + IOTest, + LogInspection, + LogHistory, + LogAlarm, + Information, + Equipment, + } + public enum E_ProcessStatus { _0_None = 0, @@ -113,22 +134,6 @@ namespace INT_PT002.DataStore Asterisk, } - public enum E_FormStore - { - FormNone = 0, - FormMainDisplay, - FormMenu, - FormProduct, - FormUserEditor, - FormUserGroupEditor, - FormIOTest, - FormEquipmentLog, - FormCheckLog, - FormAlarmList, - FormInformation, - FormStatus, - } - public enum E_UserGroup { f0_Level1 = 0, diff --git a/INT_PT002/DataStore/SystemStatus.cs b/INT_PT002/DataStore/SystemStatus.cs index f0df42e..38b1cf3 100644 --- a/INT_PT002/DataStore/SystemStatus.cs +++ b/INT_PT002/DataStore/SystemStatus.cs @@ -12,9 +12,10 @@ namespace INT_PT002.DataStore private UserItem m_CurrentUser; - private Define.E_DisplayMode m_CurrentMode; + private Define.E_EquipmentMode m_CurrentEquipmentMode; private Define.E_EquipmentStatus m_EquipmentStatus; - private Define.E_FormStore m_CurrentDisplay; + private Define.E_FormStore m_CurrentForm; + private Define.E_DisplayModeStore m_CurrentDisplayMode; #endregion #region Constructor @@ -37,20 +38,25 @@ namespace INT_PT002.DataStore set { this.m_CurrentUser = value; } } - public Define.E_DisplayMode CurrentMode + public Define.E_EquipmentMode CurrentEquipmentMode { - get { return this.m_CurrentMode; } - set { this.m_CurrentMode = value; } + get { return this.m_CurrentEquipmentMode; } + set { this.m_CurrentEquipmentMode = value; } } public Define.E_EquipmentStatus EquipmentStatus { get { return this.m_EquipmentStatus; } set { this.m_EquipmentStatus = value; } } - public Define.E_FormStore CurrentDisplay + public Define.E_FormStore CurrentForm { - get { return this.m_CurrentDisplay; } - set { this.m_CurrentDisplay = value; } + get { return this.m_CurrentForm; } + set { this.m_CurrentForm = value; } + } + public Define.E_DisplayModeStore CurrentDisplayMode + { + get { return this.m_CurrentDisplayMode; } + set { this.m_CurrentDisplayMode = value; } } #endregion @@ -64,9 +70,10 @@ namespace INT_PT002.DataStore this.CurrentUser.Password = ""; this.CurrentUser.UserGroup = Define.E_UserGroup.f0_Level1; - this.CurrentMode = Define.E_DisplayMode.Normal; + this.CurrentEquipmentMode = Define.E_EquipmentMode.Normal; this.EquipmentStatus = Define.E_EquipmentStatus.Stop; - this.CurrentDisplay = Define.E_FormStore.FormMainDisplay; + this.CurrentForm = Define.E_FormStore.FormMainDisplay; + this.CurrentDisplayMode = Define.E_DisplayModeStore.MainDisplay; } #endregion } diff --git a/INT_PT002/DialogForms/DialogFormMessage.cs b/INT_PT002/DialogForms/DialogFormMessage.cs index 307a768..3854a00 100644 --- a/INT_PT002/DialogForms/DialogFormMessage.cs +++ b/INT_PT002/DialogForms/DialogFormMessage.cs @@ -221,6 +221,13 @@ namespace INT_PT002.DialogForms this.labelMessage1.Text = "4~10자 입력 하세요!"; this.labelMessage2.Text = ""; break; + case 36: + this.PictureBoxVisible(false); + + this.smartGroupBox1.Text = ""; + this.labelMessage1.Text = "데이터가 없습니다"; + this.labelMessage2.Text = ""; + break; default: this.smartGroupBox1.Text = "Error 99"; this.labelMessage1.Text = "제조사에 문의하세요"; @@ -650,88 +657,6 @@ namespace INT_PT002.DialogForms break; } } - public DialogFormMessage(int code, int productNo, string underRange, string overRange, Define.E_LanguageID language) - { - InitializeComponent(); - - this.smartGroupBox1.Text = ""; - this.labelMessage1.Text = ""; - this.labelMessage2.Text = ""; - - if (language == Define.E_LanguageID.Korean) - { - this.buttonOK.ButtonText = "OK"; - - #region 한글 - switch (code) - { - case 28: - if (productNo == 996) - { - this.smartGroupBox1.Text = "Error 28"; - this.labelMessage1.Text = "No." + productNo.ToString() + " : ~ " + overRange; - this.labelMessage2.Text = ""; - } - else if (productNo == 1000) - { - this.smartGroupBox1.Text = "Error 28"; - this.labelMessage1.Text = "No." + productNo.ToString() + " : " + underRange + " ~"; - this.labelMessage2.Text = ""; - } - else - { - this.smartGroupBox1.Text = "Error 28"; - this.labelMessage1.Text = "No." + productNo.ToString() + " : " + underRange + " ~ " + overRange; - this.labelMessage2.Text = ""; - } - break; - default: - this.smartGroupBox1.Text = "Error 99"; - this.labelMessage1.Text = "제조사에 문의하세요"; - this.labelMessage2.Text = ""; - break; - } - #endregion - } - else if (language == Define.E_LanguageID.English) - { - this.buttonOK.ButtonText = "OK"; - - #region 영문 - switch (code) - { - case 28: - if (productNo == 996) - { - this.smartGroupBox1.Text = "Error 28"; - this.labelMessage1.Text = "No." + productNo.ToString() + " : ~ " + overRange; - this.labelMessage2.Text = ""; - } - else if (productNo == 1000) - { - this.smartGroupBox1.Text = "Error 28"; - this.labelMessage1.Text = "No." + productNo.ToString() + " : " + underRange + " ~"; - this.labelMessage2.Text = ""; - } - else - { - this.smartGroupBox1.Text = "Error 28"; - this.labelMessage1.Text = "No." + productNo.ToString() + " : " + underRange + " ~ " + overRange; - this.labelMessage2.Text = ""; - } - break; - default: - this.smartGroupBox1.Text = "Error 99"; - this.labelMessage1.Text = "Please contact a manufacturer"; - break; - } - #endregion - } - else - { - - } - } public DialogFormMessage(Define.E_MessageBoxIcon icon, string code, string message1, string message2, int autoClose_sec) { InitializeComponent(); diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs index 9ccc4d7..3ed36e7 100644 --- a/INT_PT002/Forms/FormMain.cs +++ b/INT_PT002/Forms/FormMain.cs @@ -298,25 +298,25 @@ namespace INT_PT002.Forms /// Set Mode /// /// - public void SetDisplayMode(Define.E_DisplayMode mode) + public void SetDisplayMode(Define.E_EquipmentMode mode) { - if (this.CurrentSystemStatus.CurrentMode == mode) + if (this.CurrentSystemStatus.CurrentEquipmentMode == mode) return; else - this.CurrentSystemStatus.CurrentMode = mode; + this.CurrentSystemStatus.CurrentEquipmentMode = mode; switch (mode) { - case Define.E_DisplayMode.Normal: + case Define.E_EquipmentMode.Normal: this.TransferData(CommunicationCommand.ModeNormal, CommunicationID.MainBoard); break; - case Define.E_DisplayMode.Menu: + case Define.E_EquipmentMode.Menu: this.TransferData(CommunicationCommand.ModeMenu, CommunicationID.MainBoard); break; - case Define.E_DisplayMode.IOTest: + case Define.E_EquipmentMode.IOTest: this.TransferData(CommunicationCommand.ModeIOTest, CommunicationID.MainBoard); break; - case Define.E_DisplayMode.EquipmentTest: + case Define.E_EquipmentMode.EquipmentTest: this.TransferData(CommunicationCommand.ModeEquipmentTest, CommunicationID.MainBoard); break; default: @@ -441,7 +441,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_user_list_t userList = (UserManager.UserMgr_user_list_t)data; - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormUserEditor) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.UserEditor) this.ChildFormMenu.CallBackGetUserData(userList); } catch @@ -454,7 +454,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_login_timeout_t loginTimeout = (UserManager.UserMgr_login_timeout_t)data; - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay) this.ChildFormMainDisplay.CallBackUserListLoginTimeoutDataEvent(loginTimeout); } catch (Exception e) @@ -467,7 +467,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_user_lock_t user = (UserManager.UserMgr_user_lock_t)data; - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormUserEditor) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.UserEditor) this.ChildFormMenu.CallBackUserListLockDataEvent(user); } catch @@ -1156,6 +1156,7 @@ namespace INT_PT002.Forms case "CI0": this.CurrentSystemStatus.EquipmentStatus = Define.E_EquipmentStatus.Stop; this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.EquipmentStatus); + this.ChildFormMenu.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.EquipmentStatus); this.TransferSystemParameter9039(); break; @@ -1163,11 +1164,13 @@ namespace INT_PT002.Forms this.CurrentSystemStatus.EquipmentStatus = DataStore.Define.E_EquipmentStatus.Start; this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.EquipmentStatus); + this.ChildFormMenu.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.EquipmentStatus); break; case "CBT": this.CurrentSystemStatus.EquipmentStatus = Define.E_EquipmentStatus.Stop; this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.EquipmentStatus); + this.ChildFormMenu.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.EquipmentStatus); break; default: break; @@ -1380,8 +1383,10 @@ namespace INT_PT002.Forms for (int i = 0; i < this.CurrentSystemStatus.EquipmentColumn; i++) this.CurrentLeakData.CollJudgment[i] = Helper.StringToJudgmentStatus(receiveData.Substring(i * 1, 1)); #endregion - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.UpdateDisplayJudgmentData(this.CurrentLeakData); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) + this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData(this.CurrentLeakData); break; default: break; @@ -1407,8 +1412,10 @@ namespace INT_PT002.Forms #region Value Assign this.CurrentLeakData.ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 1)); #endregion - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakData.ProcessStatus); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) + this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakData.ProcessStatus); break; default: break; @@ -1440,10 +1447,12 @@ namespace INT_PT002.Forms this.CurrentLeakData.CollDiffData[i].DiffMean = receiveData.Substring((i * 32) + 24, 8).Trim(); } #endregion - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.UpdateDisplayDiffData(this.CurrentLeakData.CollDiffData); - else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) - this.ChildFormMenu.UpdateDisplayEquipmentTestDiffData(this.CurrentLeakData.CollDiffData); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.IOTest) + this.ChildFormMenu.UpdateDisplayIOTestDiffData(this.CurrentLeakData.CollDiffData); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) + this.ChildFormMenu.UpdateDisplayEquipmentDiffData(this.CurrentLeakData.CollDiffData); break; default: break; @@ -1475,10 +1484,12 @@ namespace INT_PT002.Forms this.CurrentLeakData.CollDispData[i].STD = receiveData.Substring((i * 24) + 18, 6).Trim(); } #endregion - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.UpdateDisplayDispData(this.CurrentLeakData.CollDispData); - else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) - this.ChildFormMenu.UpdateDisplayEquipmentTestDispData(this.CurrentLeakData.CollDispData); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.IOTest) + this.ChildFormMenu.UpdateDisplayIOTestDispData(this.CurrentLeakData.CollDispData); + else if(this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) + this.ChildFormMenu.UpdateDisplayEquipmentDispData(this.CurrentLeakData.CollDispData); break; default: break; @@ -1510,10 +1521,12 @@ namespace INT_PT002.Forms string.Format("{0}{1}", receiveData.Substring((i * 6) + 60, 1), receiveData.Substring((i * 6) + 61, 5).Trim()); } #endregion - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.UpdateDisplayPresData(this.CurrentLeakData.CollPresData); - else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) - this.ChildFormMenu.UpdateDisplayEquipmentTestPresData(this.CurrentLeakData.CollPresData); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.IOTest) + this.ChildFormMenu.UpdateDisplayIOTestPresData(this.CurrentLeakData.CollPresData); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) + this.ChildFormMenu.UpdateDisplayEquipmentPresData(this.CurrentLeakData.CollPresData); break; default: break; @@ -1539,11 +1552,8 @@ namespace INT_PT002.Forms this.CollectionIOTest_InputData[i] = receiveData.Substring(i, 1); #endregion - //if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) - // this.ChildFormIOTest.UpdateInputRead(this.CollectionIOTest_InputData); - - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) - this.ChildFormMenu.UpdateDisplayEquipmentTestInputData(this.CollectionIOTest_InputData); + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.IOTest) + this.ChildFormMenu.UpdateDisplayIOTestInputData(this.CollectionIOTest_InputData); break; default: break; @@ -1563,10 +1573,10 @@ namespace INT_PT002.Forms this.CurrentAlarmList.SetAlarm(receiveData.Substring(0, 8)); #endregion - if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList); - else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) - this.ChildFormMenu.UpdateDisplayAlarmView(this.CurrentAlarmList); + else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.IOTest) + this.ChildFormMenu.UpdateDisplayIOTestAlarmView(this.CurrentAlarmList); break; default: @@ -1643,7 +1653,7 @@ namespace INT_PT002.Forms DateTime time = DateTime.Now; folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month); - fileName = string.Format("{0:yyyyMMdd}_Inspection_{1}", time, this.CurrentRecipe.NUMBER); + fileName = string.Format("{0:yyyyMMdd}_Inspection_{1}.csv", time, this.CurrentRecipe.NUMBER); } public void TrackingInspectionData(LeakData item) { diff --git a/INT_PT002/Forms/FormMainDisplay1.cs b/INT_PT002/Forms/FormMainDisplay1.cs index 55af514..81c934f 100644 --- a/INT_PT002/Forms/FormMainDisplay1.cs +++ b/INT_PT002/Forms/FormMainDisplay1.cs @@ -811,7 +811,7 @@ namespace INT_PT002.Forms public void DisplayRefresh() { - this.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormMainDisplay; + this.ParentForm.CurrentSystemStatus.CurrentForm = Define.E_FormStore.FormMainDisplay; } #endregion diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs index 0cb5043..f467cd8 100644 --- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs @@ -30,6 +30,26 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMainDisplay2)); this.smartForm1 = new SmartX.SmartForm(); + this.labelSbAlarm10 = new SmartX.SmartLabel(); + this.labelSbAlarm5 = new SmartX.SmartLabel(); + this.labelSbAlarm9 = new SmartX.SmartLabel(); + this.labelSbAlarm4 = new SmartX.SmartLabel(); + this.labelSbAlarm8 = new SmartX.SmartLabel(); + this.labelSbAlarm3 = new SmartX.SmartLabel(); + this.labelSbAlarm7 = new SmartX.SmartLabel(); + this.labelSbAlarm2 = new SmartX.SmartLabel(); + this.labelSbAlarm6 = new SmartX.SmartLabel(); + this.labelSbAlarm1 = new SmartX.SmartLabel(); + this.labelLrSec10 = new SmartX.SmartLabel(); + this.labelLrSec9 = new SmartX.SmartLabel(); + this.labelLrSec8 = new SmartX.SmartLabel(); + this.labelLrSec5 = new SmartX.SmartLabel(); + this.labelLrSec4 = new SmartX.SmartLabel(); + this.labelLrSec3 = new SmartX.SmartLabel(); + this.labelLrSec2 = new SmartX.SmartLabel(); + this.labelLrSec6 = new SmartX.SmartLabel(); + this.labelLrSec7 = new SmartX.SmartLabel(); + this.labelLrSec1 = new SmartX.SmartLabel(); this.labelPressure1 = new SmartX.SmartLabel(); this.smartButton2 = new SmartX.SmartButton(); this.labelSensorStatus9 = new SmartX.SmartLabel(); @@ -111,26 +131,7 @@ this.buttonDisplay = new SmartX.SmartButton(); this.smartTimerAlarm = new SmartX.SmartTimer(); this.smartTimerMessageShow = new SmartX.SmartTimer(); - this.labelLrSec1 = new SmartX.SmartLabel(); - this.labelLrSec7 = new SmartX.SmartLabel(); - this.labelLrSec6 = new SmartX.SmartLabel(); - this.labelLrSec2 = new SmartX.SmartLabel(); - this.labelLrSec3 = new SmartX.SmartLabel(); - this.labelLrSec4 = new SmartX.SmartLabel(); - this.labelLrSec5 = new SmartX.SmartLabel(); - this.labelLrSec8 = new SmartX.SmartLabel(); - this.labelLrSec9 = new SmartX.SmartLabel(); - this.labelLrSec10 = new SmartX.SmartLabel(); - this.labelSbAlarm1 = new SmartX.SmartLabel(); - this.labelSbAlarm6 = new SmartX.SmartLabel(); - this.labelSbAlarm7 = new SmartX.SmartLabel(); - this.labelSbAlarm2 = new SmartX.SmartLabel(); - this.labelSbAlarm8 = new SmartX.SmartLabel(); - this.labelSbAlarm3 = new SmartX.SmartLabel(); - this.labelSbAlarm9 = new SmartX.SmartLabel(); - this.labelSbAlarm4 = new SmartX.SmartLabel(); - this.labelSbAlarm10 = new SmartX.SmartLabel(); - this.labelSbAlarm5 = new SmartX.SmartLabel(); + this.smartButton3 = new SmartX.SmartButton(); this.smartForm1.SuspendLayout(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -141,6 +142,7 @@ this.smartForm1.BackGroundFillStyle = SmartXUIBase.SmartUIControlFormBase.BackGroundFillStyles.UseBackImage; this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage"))); this.smartForm1.CenterLocation = false; + this.smartForm1.Controls.Add(this.smartButton3); this.smartForm1.Controls.Add(this.labelSbAlarm10); this.smartForm1.Controls.Add(this.labelSbAlarm5); this.smartForm1.Controls.Add(this.labelSbAlarm9); @@ -251,6 +253,436 @@ this.smartForm1.SpecialFunctionClickPointSize = 100; this.smartForm1.UseMainMenu = false; // + // labelSbAlarm10 + // + this.labelSbAlarm10.BackGround = null; + this.labelSbAlarm10.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm10.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm10.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm10.LineSpacing = 0F; + this.labelSbAlarm10.Location = new System.Drawing.Point(749, 733); + this.labelSbAlarm10.Name = "labelSbAlarm10"; + this.labelSbAlarm10.OverlapOptimize = true; + this.labelSbAlarm10.PasswordChar = '\0'; + this.labelSbAlarm10.Radius = 20; + this.labelSbAlarm10.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm10.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm10.TabIndex = 258; + this.labelSbAlarm10.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm10.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm10.Wordwrap = false; + // + // labelSbAlarm5 + // + this.labelSbAlarm5.BackGround = null; + this.labelSbAlarm5.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm5.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm5.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm5.LineSpacing = 0F; + this.labelSbAlarm5.Location = new System.Drawing.Point(749, 666); + this.labelSbAlarm5.Name = "labelSbAlarm5"; + this.labelSbAlarm5.OverlapOptimize = true; + this.labelSbAlarm5.PasswordChar = '\0'; + this.labelSbAlarm5.Radius = 20; + this.labelSbAlarm5.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm5.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm5.TabIndex = 257; + this.labelSbAlarm5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm5.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm5.Wordwrap = false; + // + // labelSbAlarm9 + // + this.labelSbAlarm9.BackGround = null; + this.labelSbAlarm9.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm9.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm9.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm9.LineSpacing = 0F; + this.labelSbAlarm9.Location = new System.Drawing.Point(578, 733); + this.labelSbAlarm9.Name = "labelSbAlarm9"; + this.labelSbAlarm9.OverlapOptimize = true; + this.labelSbAlarm9.PasswordChar = '\0'; + this.labelSbAlarm9.Radius = 20; + this.labelSbAlarm9.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm9.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm9.TabIndex = 256; + this.labelSbAlarm9.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm9.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm9.Wordwrap = false; + // + // labelSbAlarm4 + // + this.labelSbAlarm4.BackGround = null; + this.labelSbAlarm4.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm4.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm4.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm4.LineSpacing = 0F; + this.labelSbAlarm4.Location = new System.Drawing.Point(578, 666); + this.labelSbAlarm4.Name = "labelSbAlarm4"; + this.labelSbAlarm4.OverlapOptimize = true; + this.labelSbAlarm4.PasswordChar = '\0'; + this.labelSbAlarm4.Radius = 20; + this.labelSbAlarm4.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm4.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm4.TabIndex = 255; + this.labelSbAlarm4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm4.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm4.Wordwrap = false; + // + // labelSbAlarm8 + // + this.labelSbAlarm8.BackGround = null; + this.labelSbAlarm8.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm8.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm8.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm8.LineSpacing = 0F; + this.labelSbAlarm8.Location = new System.Drawing.Point(408, 733); + this.labelSbAlarm8.Name = "labelSbAlarm8"; + this.labelSbAlarm8.OverlapOptimize = true; + this.labelSbAlarm8.PasswordChar = '\0'; + this.labelSbAlarm8.Radius = 20; + this.labelSbAlarm8.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm8.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm8.TabIndex = 254; + this.labelSbAlarm8.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm8.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm8.Wordwrap = false; + // + // labelSbAlarm3 + // + this.labelSbAlarm3.BackGround = null; + this.labelSbAlarm3.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm3.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm3.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm3.LineSpacing = 0F; + this.labelSbAlarm3.Location = new System.Drawing.Point(408, 666); + this.labelSbAlarm3.Name = "labelSbAlarm3"; + this.labelSbAlarm3.OverlapOptimize = true; + this.labelSbAlarm3.PasswordChar = '\0'; + this.labelSbAlarm3.Radius = 20; + this.labelSbAlarm3.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm3.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm3.TabIndex = 253; + this.labelSbAlarm3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm3.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm3.Wordwrap = false; + // + // labelSbAlarm7 + // + this.labelSbAlarm7.BackGround = null; + this.labelSbAlarm7.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm7.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm7.LineSpacing = 0F; + this.labelSbAlarm7.Location = new System.Drawing.Point(238, 733); + this.labelSbAlarm7.Name = "labelSbAlarm7"; + this.labelSbAlarm7.OverlapOptimize = true; + this.labelSbAlarm7.PasswordChar = '\0'; + this.labelSbAlarm7.Radius = 20; + this.labelSbAlarm7.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm7.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm7.TabIndex = 252; + this.labelSbAlarm7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm7.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm7.Wordwrap = false; + // + // labelSbAlarm2 + // + this.labelSbAlarm2.BackGround = null; + this.labelSbAlarm2.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm2.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm2.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm2.LineSpacing = 0F; + this.labelSbAlarm2.Location = new System.Drawing.Point(238, 666); + this.labelSbAlarm2.Name = "labelSbAlarm2"; + this.labelSbAlarm2.OverlapOptimize = true; + this.labelSbAlarm2.PasswordChar = '\0'; + this.labelSbAlarm2.Radius = 20; + this.labelSbAlarm2.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm2.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm2.TabIndex = 251; + this.labelSbAlarm2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm2.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm2.Wordwrap = false; + // + // labelSbAlarm6 + // + this.labelSbAlarm6.BackGround = null; + this.labelSbAlarm6.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm6.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm6.LineSpacing = 0F; + this.labelSbAlarm6.Location = new System.Drawing.Point(68, 733); + this.labelSbAlarm6.Name = "labelSbAlarm6"; + this.labelSbAlarm6.OverlapOptimize = true; + this.labelSbAlarm6.PasswordChar = '\0'; + this.labelSbAlarm6.Radius = 20; + this.labelSbAlarm6.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm6.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm6.TabIndex = 250; + this.labelSbAlarm6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm6.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm6.Wordwrap = false; + // + // labelSbAlarm1 + // + this.labelSbAlarm1.BackGround = null; + this.labelSbAlarm1.BackGroundColor = System.Drawing.Color.Red; + this.labelSbAlarm1.BorderColor = System.Drawing.Color.Red; + this.labelSbAlarm1.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelSbAlarm1.LineSpacing = 0F; + this.labelSbAlarm1.Location = new System.Drawing.Point(68, 666); + this.labelSbAlarm1.Name = "labelSbAlarm1"; + this.labelSbAlarm1.OverlapOptimize = true; + this.labelSbAlarm1.PasswordChar = '\0'; + this.labelSbAlarm1.Radius = 20; + this.labelSbAlarm1.RoundRectFillColor = System.Drawing.Color.Red; + this.labelSbAlarm1.Size = new System.Drawing.Size(10, 10); + this.labelSbAlarm1.TabIndex = 249; + this.labelSbAlarm1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelSbAlarm1.TextColorDisable = System.Drawing.Color.Gray; + this.labelSbAlarm1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelSbAlarm1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelSbAlarm1.Wordwrap = false; + // + // labelLrSec10 + // + this.labelLrSec10.BackGround = this.smartForm1; + this.labelLrSec10.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec10.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec10.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec10.LineSpacing = 0F; + this.labelLrSec10.Location = new System.Drawing.Point(765, 712); + this.labelLrSec10.Name = "labelLrSec10"; + this.labelLrSec10.OverlapOptimize = true; + this.labelLrSec10.PasswordChar = '\0'; + this.labelLrSec10.Radius = 3; + this.labelLrSec10.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec10.Size = new System.Drawing.Size(115, 23); + this.labelLrSec10.TabIndex = 248; + this.labelLrSec10.Text = "-100.0"; + this.labelLrSec10.TextColor = System.Drawing.Color.White; + this.labelLrSec10.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec10.Wordwrap = false; + // + // labelLrSec9 + // + this.labelLrSec9.BackGround = this.smartForm1; + this.labelLrSec9.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec9.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec9.LineSpacing = 0F; + this.labelLrSec9.Location = new System.Drawing.Point(595, 712); + this.labelLrSec9.Name = "labelLrSec9"; + this.labelLrSec9.OverlapOptimize = true; + this.labelLrSec9.PasswordChar = '\0'; + this.labelLrSec9.Radius = 3; + this.labelLrSec9.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec9.Size = new System.Drawing.Size(115, 23); + this.labelLrSec9.TabIndex = 247; + this.labelLrSec9.Text = "-100.0"; + this.labelLrSec9.TextColor = System.Drawing.Color.White; + this.labelLrSec9.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec9.Wordwrap = false; + // + // labelLrSec8 + // + this.labelLrSec8.BackGround = this.smartForm1; + this.labelLrSec8.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec8.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec8.LineSpacing = 0F; + this.labelLrSec8.Location = new System.Drawing.Point(425, 712); + this.labelLrSec8.Name = "labelLrSec8"; + this.labelLrSec8.OverlapOptimize = true; + this.labelLrSec8.PasswordChar = '\0'; + this.labelLrSec8.Radius = 3; + this.labelLrSec8.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec8.Size = new System.Drawing.Size(115, 23); + this.labelLrSec8.TabIndex = 246; + this.labelLrSec8.Text = "-100.0"; + this.labelLrSec8.TextColor = System.Drawing.Color.White; + this.labelLrSec8.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec8.Wordwrap = false; + // + // labelLrSec5 + // + this.labelLrSec5.BackGround = this.smartForm1; + this.labelLrSec5.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec5.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec5.LineSpacing = 0F; + this.labelLrSec5.Location = new System.Drawing.Point(765, 645); + this.labelLrSec5.Name = "labelLrSec5"; + this.labelLrSec5.OverlapOptimize = true; + this.labelLrSec5.PasswordChar = '\0'; + this.labelLrSec5.Radius = 3; + this.labelLrSec5.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec5.Size = new System.Drawing.Size(115, 23); + this.labelLrSec5.TabIndex = 245; + this.labelLrSec5.Text = "-100.0"; + this.labelLrSec5.TextColor = System.Drawing.Color.White; + this.labelLrSec5.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec5.Wordwrap = false; + // + // labelLrSec4 + // + this.labelLrSec4.BackGround = this.smartForm1; + this.labelLrSec4.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec4.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec4.LineSpacing = 0F; + this.labelLrSec4.Location = new System.Drawing.Point(595, 645); + this.labelLrSec4.Name = "labelLrSec4"; + this.labelLrSec4.OverlapOptimize = true; + this.labelLrSec4.PasswordChar = '\0'; + this.labelLrSec4.Radius = 3; + this.labelLrSec4.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec4.Size = new System.Drawing.Size(115, 23); + this.labelLrSec4.TabIndex = 244; + this.labelLrSec4.Text = "-100.0"; + this.labelLrSec4.TextColor = System.Drawing.Color.White; + this.labelLrSec4.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec4.Wordwrap = false; + // + // labelLrSec3 + // + this.labelLrSec3.BackGround = this.smartForm1; + this.labelLrSec3.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec3.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec3.LineSpacing = 0F; + this.labelLrSec3.Location = new System.Drawing.Point(425, 645); + this.labelLrSec3.Name = "labelLrSec3"; + this.labelLrSec3.OverlapOptimize = true; + this.labelLrSec3.PasswordChar = '\0'; + this.labelLrSec3.Radius = 3; + this.labelLrSec3.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec3.Size = new System.Drawing.Size(115, 23); + this.labelLrSec3.TabIndex = 243; + this.labelLrSec3.Text = "-100.0"; + this.labelLrSec3.TextColor = System.Drawing.Color.White; + this.labelLrSec3.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec3.Wordwrap = false; + // + // labelLrSec2 + // + this.labelLrSec2.BackGround = this.smartForm1; + this.labelLrSec2.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec2.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec2.LineSpacing = 0F; + this.labelLrSec2.Location = new System.Drawing.Point(255, 645); + this.labelLrSec2.Name = "labelLrSec2"; + this.labelLrSec2.OverlapOptimize = true; + this.labelLrSec2.PasswordChar = '\0'; + this.labelLrSec2.Radius = 3; + this.labelLrSec2.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec2.Size = new System.Drawing.Size(115, 23); + this.labelLrSec2.TabIndex = 242; + this.labelLrSec2.Text = "-100.0"; + this.labelLrSec2.TextColor = System.Drawing.Color.White; + this.labelLrSec2.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec2.Wordwrap = false; + // + // labelLrSec6 + // + this.labelLrSec6.BackGround = this.smartForm1; + this.labelLrSec6.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec6.LineSpacing = 0F; + this.labelLrSec6.Location = new System.Drawing.Point(85, 712); + this.labelLrSec6.Name = "labelLrSec6"; + this.labelLrSec6.OverlapOptimize = true; + this.labelLrSec6.PasswordChar = '\0'; + this.labelLrSec6.Radius = 3; + this.labelLrSec6.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec6.Size = new System.Drawing.Size(115, 23); + this.labelLrSec6.TabIndex = 241; + this.labelLrSec6.Text = "-100.0"; + this.labelLrSec6.TextColor = System.Drawing.Color.White; + this.labelLrSec6.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec6.Wordwrap = false; + // + // labelLrSec7 + // + this.labelLrSec7.BackGround = this.smartForm1; + this.labelLrSec7.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec7.LineSpacing = 0F; + this.labelLrSec7.Location = new System.Drawing.Point(255, 712); + this.labelLrSec7.Name = "labelLrSec7"; + this.labelLrSec7.OverlapOptimize = true; + this.labelLrSec7.PasswordChar = '\0'; + this.labelLrSec7.Radius = 3; + this.labelLrSec7.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec7.Size = new System.Drawing.Size(115, 23); + this.labelLrSec7.TabIndex = 240; + this.labelLrSec7.Text = "-100.0"; + this.labelLrSec7.TextColor = System.Drawing.Color.White; + this.labelLrSec7.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec7.Wordwrap = false; + // + // labelLrSec1 + // + this.labelLrSec1.BackGround = this.smartForm1; + this.labelLrSec1.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelLrSec1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.labelLrSec1.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelLrSec1.LineSpacing = 0F; + this.labelLrSec1.Location = new System.Drawing.Point(85, 645); + this.labelLrSec1.Name = "labelLrSec1"; + this.labelLrSec1.OverlapOptimize = true; + this.labelLrSec1.PasswordChar = '\0'; + this.labelLrSec1.Radius = 3; + this.labelLrSec1.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); + this.labelLrSec1.Size = new System.Drawing.Size(115, 23); + this.labelLrSec1.TabIndex = 239; + this.labelLrSec1.Text = "-100.0"; + this.labelLrSec1.TextColor = System.Drawing.Color.White; + this.labelLrSec1.TextColorDisable = System.Drawing.Color.Gray; + this.labelLrSec1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelLrSec1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelLrSec1.Wordwrap = false; + // // labelPressure1 // this.labelPressure1.BackGround = this.smartForm1; @@ -287,7 +719,7 @@ this.smartButton2.ImageDisable = null; this.smartButton2.ImageDown = null; this.smartButton2.ImageUp = null; - this.smartButton2.Location = new System.Drawing.Point(917, 409); + this.smartButton2.Location = new System.Drawing.Point(917, 391); this.smartButton2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.smartButton2.Name = "smartButton2"; this.smartButton2.NestedClickEventPrevent = false; @@ -306,6 +738,7 @@ this.smartButton2.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.smartButton2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.smartButton2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton2.Click += new System.EventHandler(this.smartButton2_Click); // // labelSensorStatus9 // @@ -1284,9 +1717,9 @@ this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(51)))), ((int)(((byte)(53))))); this.label1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular); this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(23, 22); + this.label1.Location = new System.Drawing.Point(6, 22); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(466, 25); + this.label1.Size = new System.Drawing.Size(545, 25); this.label1.Text = "a1_Servo emergency stop"; // // labelAlarm @@ -2054,435 +2487,40 @@ this.smartTimerMessageShow.TimeFormStringSeparator = ":"; this.smartTimerMessageShow.Tick += new System.EventHandler(this.smartTimerMessageShow_Tick); // - // labelLrSec1 + // smartButton3 // - this.labelLrSec1.BackGround = this.smartForm1; - this.labelLrSec1.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec1.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec1.LineSpacing = 0F; - this.labelLrSec1.Location = new System.Drawing.Point(85, 645); - this.labelLrSec1.Name = "labelLrSec1"; - this.labelLrSec1.OverlapOptimize = true; - this.labelLrSec1.PasswordChar = '\0'; - this.labelLrSec1.Radius = 3; - this.labelLrSec1.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec1.Size = new System.Drawing.Size(115, 23); - this.labelLrSec1.TabIndex = 239; - this.labelLrSec1.Text = "-100.0"; - this.labelLrSec1.TextColor = System.Drawing.Color.White; - this.labelLrSec1.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec1.Wordwrap = false; - // - // labelLrSec7 - // - this.labelLrSec7.BackGround = this.smartForm1; - this.labelLrSec7.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec7.LineSpacing = 0F; - this.labelLrSec7.Location = new System.Drawing.Point(255, 712); - this.labelLrSec7.Name = "labelLrSec7"; - this.labelLrSec7.OverlapOptimize = true; - this.labelLrSec7.PasswordChar = '\0'; - this.labelLrSec7.Radius = 3; - this.labelLrSec7.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec7.Size = new System.Drawing.Size(115, 23); - this.labelLrSec7.TabIndex = 240; - this.labelLrSec7.Text = "-100.0"; - this.labelLrSec7.TextColor = System.Drawing.Color.White; - this.labelLrSec7.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec7.Wordwrap = false; - // - // labelLrSec6 - // - this.labelLrSec6.BackGround = this.smartForm1; - this.labelLrSec6.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec6.LineSpacing = 0F; - this.labelLrSec6.Location = new System.Drawing.Point(85, 712); - this.labelLrSec6.Name = "labelLrSec6"; - this.labelLrSec6.OverlapOptimize = true; - this.labelLrSec6.PasswordChar = '\0'; - this.labelLrSec6.Radius = 3; - this.labelLrSec6.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec6.Size = new System.Drawing.Size(115, 23); - this.labelLrSec6.TabIndex = 241; - this.labelLrSec6.Text = "-100.0"; - this.labelLrSec6.TextColor = System.Drawing.Color.White; - this.labelLrSec6.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec6.Wordwrap = false; - // - // labelLrSec2 - // - this.labelLrSec2.BackGround = this.smartForm1; - this.labelLrSec2.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec2.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec2.LineSpacing = 0F; - this.labelLrSec2.Location = new System.Drawing.Point(255, 645); - this.labelLrSec2.Name = "labelLrSec2"; - this.labelLrSec2.OverlapOptimize = true; - this.labelLrSec2.PasswordChar = '\0'; - this.labelLrSec2.Radius = 3; - this.labelLrSec2.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec2.Size = new System.Drawing.Size(115, 23); - this.labelLrSec2.TabIndex = 242; - this.labelLrSec2.Text = "-100.0"; - this.labelLrSec2.TextColor = System.Drawing.Color.White; - this.labelLrSec2.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec2.Wordwrap = false; - // - // labelLrSec3 - // - this.labelLrSec3.BackGround = this.smartForm1; - this.labelLrSec3.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec3.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec3.LineSpacing = 0F; - this.labelLrSec3.Location = new System.Drawing.Point(425, 645); - this.labelLrSec3.Name = "labelLrSec3"; - this.labelLrSec3.OverlapOptimize = true; - this.labelLrSec3.PasswordChar = '\0'; - this.labelLrSec3.Radius = 3; - this.labelLrSec3.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec3.Size = new System.Drawing.Size(115, 23); - this.labelLrSec3.TabIndex = 243; - this.labelLrSec3.Text = "-100.0"; - this.labelLrSec3.TextColor = System.Drawing.Color.White; - this.labelLrSec3.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec3.Wordwrap = false; - // - // labelLrSec4 - // - this.labelLrSec4.BackGround = this.smartForm1; - this.labelLrSec4.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec4.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec4.LineSpacing = 0F; - this.labelLrSec4.Location = new System.Drawing.Point(595, 645); - this.labelLrSec4.Name = "labelLrSec4"; - this.labelLrSec4.OverlapOptimize = true; - this.labelLrSec4.PasswordChar = '\0'; - this.labelLrSec4.Radius = 3; - this.labelLrSec4.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec4.Size = new System.Drawing.Size(115, 23); - this.labelLrSec4.TabIndex = 244; - this.labelLrSec4.Text = "-100.0"; - this.labelLrSec4.TextColor = System.Drawing.Color.White; - this.labelLrSec4.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec4.Wordwrap = false; - // - // labelLrSec5 - // - this.labelLrSec5.BackGround = this.smartForm1; - this.labelLrSec5.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec5.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec5.LineSpacing = 0F; - this.labelLrSec5.Location = new System.Drawing.Point(765, 645); - this.labelLrSec5.Name = "labelLrSec5"; - this.labelLrSec5.OverlapOptimize = true; - this.labelLrSec5.PasswordChar = '\0'; - this.labelLrSec5.Radius = 3; - this.labelLrSec5.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec5.Size = new System.Drawing.Size(115, 23); - this.labelLrSec5.TabIndex = 245; - this.labelLrSec5.Text = "-100.0"; - this.labelLrSec5.TextColor = System.Drawing.Color.White; - this.labelLrSec5.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec5.Wordwrap = false; - // - // labelLrSec8 - // - this.labelLrSec8.BackGround = this.smartForm1; - this.labelLrSec8.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec8.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec8.LineSpacing = 0F; - this.labelLrSec8.Location = new System.Drawing.Point(425, 712); - this.labelLrSec8.Name = "labelLrSec8"; - this.labelLrSec8.OverlapOptimize = true; - this.labelLrSec8.PasswordChar = '\0'; - this.labelLrSec8.Radius = 3; - this.labelLrSec8.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec8.Size = new System.Drawing.Size(115, 23); - this.labelLrSec8.TabIndex = 246; - this.labelLrSec8.Text = "-100.0"; - this.labelLrSec8.TextColor = System.Drawing.Color.White; - this.labelLrSec8.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec8.Wordwrap = false; - // - // labelLrSec9 - // - this.labelLrSec9.BackGround = this.smartForm1; - this.labelLrSec9.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec9.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec9.LineSpacing = 0F; - this.labelLrSec9.Location = new System.Drawing.Point(595, 712); - this.labelLrSec9.Name = "labelLrSec9"; - this.labelLrSec9.OverlapOptimize = true; - this.labelLrSec9.PasswordChar = '\0'; - this.labelLrSec9.Radius = 3; - this.labelLrSec9.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec9.Size = new System.Drawing.Size(115, 23); - this.labelLrSec9.TabIndex = 247; - this.labelLrSec9.Text = "-100.0"; - this.labelLrSec9.TextColor = System.Drawing.Color.White; - this.labelLrSec9.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec9.Wordwrap = false; - // - // labelLrSec10 - // - this.labelLrSec10.BackGround = this.smartForm1; - this.labelLrSec10.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelLrSec10.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.labelLrSec10.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelLrSec10.LineSpacing = 0F; - this.labelLrSec10.Location = new System.Drawing.Point(765, 712); - this.labelLrSec10.Name = "labelLrSec10"; - this.labelLrSec10.OverlapOptimize = true; - this.labelLrSec10.PasswordChar = '\0'; - this.labelLrSec10.Radius = 3; - this.labelLrSec10.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(52)))), ((int)(((byte)(52))))); - this.labelLrSec10.Size = new System.Drawing.Size(115, 23); - this.labelLrSec10.TabIndex = 248; - this.labelLrSec10.Text = "-100.0"; - this.labelLrSec10.TextColor = System.Drawing.Color.White; - this.labelLrSec10.TextColorDisable = System.Drawing.Color.Gray; - this.labelLrSec10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelLrSec10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelLrSec10.Wordwrap = false; - // - // labelSbAlarm1 - // - this.labelSbAlarm1.BackGround = null; - this.labelSbAlarm1.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm1.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm1.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm1.LineSpacing = 0F; - this.labelSbAlarm1.Location = new System.Drawing.Point(68, 666); - this.labelSbAlarm1.Name = "labelSbAlarm1"; - this.labelSbAlarm1.OverlapOptimize = true; - this.labelSbAlarm1.PasswordChar = '\0'; - this.labelSbAlarm1.Radius = 20; - this.labelSbAlarm1.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm1.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm1.TabIndex = 249; - this.labelSbAlarm1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm1.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm1.Wordwrap = false; - // - // labelSbAlarm6 - // - this.labelSbAlarm6.BackGround = null; - this.labelSbAlarm6.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm6.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm6.LineSpacing = 0F; - this.labelSbAlarm6.Location = new System.Drawing.Point(68, 733); - this.labelSbAlarm6.Name = "labelSbAlarm6"; - this.labelSbAlarm6.OverlapOptimize = true; - this.labelSbAlarm6.PasswordChar = '\0'; - this.labelSbAlarm6.Radius = 20; - this.labelSbAlarm6.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm6.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm6.TabIndex = 250; - this.labelSbAlarm6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm6.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm6.Wordwrap = false; - // - // labelSbAlarm7 - // - this.labelSbAlarm7.BackGround = null; - this.labelSbAlarm7.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm7.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm7.LineSpacing = 0F; - this.labelSbAlarm7.Location = new System.Drawing.Point(238, 733); - this.labelSbAlarm7.Name = "labelSbAlarm7"; - this.labelSbAlarm7.OverlapOptimize = true; - this.labelSbAlarm7.PasswordChar = '\0'; - this.labelSbAlarm7.Radius = 20; - this.labelSbAlarm7.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm7.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm7.TabIndex = 252; - this.labelSbAlarm7.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm7.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm7.Wordwrap = false; - // - // labelSbAlarm2 - // - this.labelSbAlarm2.BackGround = null; - this.labelSbAlarm2.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm2.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm2.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm2.LineSpacing = 0F; - this.labelSbAlarm2.Location = new System.Drawing.Point(238, 666); - this.labelSbAlarm2.Name = "labelSbAlarm2"; - this.labelSbAlarm2.OverlapOptimize = true; - this.labelSbAlarm2.PasswordChar = '\0'; - this.labelSbAlarm2.Radius = 20; - this.labelSbAlarm2.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm2.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm2.TabIndex = 251; - this.labelSbAlarm2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm2.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm2.Wordwrap = false; - // - // labelSbAlarm8 - // - this.labelSbAlarm8.BackGround = null; - this.labelSbAlarm8.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm8.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm8.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm8.LineSpacing = 0F; - this.labelSbAlarm8.Location = new System.Drawing.Point(408, 733); - this.labelSbAlarm8.Name = "labelSbAlarm8"; - this.labelSbAlarm8.OverlapOptimize = true; - this.labelSbAlarm8.PasswordChar = '\0'; - this.labelSbAlarm8.Radius = 20; - this.labelSbAlarm8.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm8.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm8.TabIndex = 254; - this.labelSbAlarm8.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm8.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm8.Wordwrap = false; - // - // labelSbAlarm3 - // - this.labelSbAlarm3.BackGround = null; - this.labelSbAlarm3.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm3.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm3.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm3.LineSpacing = 0F; - this.labelSbAlarm3.Location = new System.Drawing.Point(408, 666); - this.labelSbAlarm3.Name = "labelSbAlarm3"; - this.labelSbAlarm3.OverlapOptimize = true; - this.labelSbAlarm3.PasswordChar = '\0'; - this.labelSbAlarm3.Radius = 20; - this.labelSbAlarm3.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm3.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm3.TabIndex = 253; - this.labelSbAlarm3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm3.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm3.Wordwrap = false; - // - // labelSbAlarm9 - // - this.labelSbAlarm9.BackGround = null; - this.labelSbAlarm9.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm9.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm9.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm9.LineSpacing = 0F; - this.labelSbAlarm9.Location = new System.Drawing.Point(578, 733); - this.labelSbAlarm9.Name = "labelSbAlarm9"; - this.labelSbAlarm9.OverlapOptimize = true; - this.labelSbAlarm9.PasswordChar = '\0'; - this.labelSbAlarm9.Radius = 20; - this.labelSbAlarm9.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm9.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm9.TabIndex = 256; - this.labelSbAlarm9.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm9.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm9.Wordwrap = false; - // - // labelSbAlarm4 - // - this.labelSbAlarm4.BackGround = null; - this.labelSbAlarm4.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm4.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm4.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm4.LineSpacing = 0F; - this.labelSbAlarm4.Location = new System.Drawing.Point(578, 666); - this.labelSbAlarm4.Name = "labelSbAlarm4"; - this.labelSbAlarm4.OverlapOptimize = true; - this.labelSbAlarm4.PasswordChar = '\0'; - this.labelSbAlarm4.Radius = 20; - this.labelSbAlarm4.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm4.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm4.TabIndex = 255; - this.labelSbAlarm4.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm4.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm4.Wordwrap = false; - // - // labelSbAlarm10 - // - this.labelSbAlarm10.BackGround = null; - this.labelSbAlarm10.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm10.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm10.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm10.LineSpacing = 0F; - this.labelSbAlarm10.Location = new System.Drawing.Point(749, 733); - this.labelSbAlarm10.Name = "labelSbAlarm10"; - this.labelSbAlarm10.OverlapOptimize = true; - this.labelSbAlarm10.PasswordChar = '\0'; - this.labelSbAlarm10.Radius = 20; - this.labelSbAlarm10.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm10.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm10.TabIndex = 258; - this.labelSbAlarm10.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm10.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm10.Wordwrap = false; - // - // labelSbAlarm5 - // - this.labelSbAlarm5.BackGround = null; - this.labelSbAlarm5.BackGroundColor = System.Drawing.Color.Red; - this.labelSbAlarm5.BorderColor = System.Drawing.Color.Red; - this.labelSbAlarm5.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelSbAlarm5.LineSpacing = 0F; - this.labelSbAlarm5.Location = new System.Drawing.Point(749, 666); - this.labelSbAlarm5.Name = "labelSbAlarm5"; - this.labelSbAlarm5.OverlapOptimize = true; - this.labelSbAlarm5.PasswordChar = '\0'; - this.labelSbAlarm5.Radius = 20; - this.labelSbAlarm5.RoundRectFillColor = System.Drawing.Color.Red; - this.labelSbAlarm5.Size = new System.Drawing.Size(10, 10); - this.labelSbAlarm5.TabIndex = 257; - this.labelSbAlarm5.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelSbAlarm5.TextColorDisable = System.Drawing.Color.Gray; - this.labelSbAlarm5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelSbAlarm5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelSbAlarm5.Wordwrap = false; + this.smartButton3.BackGround = this.smartForm1; + this.smartButton3.BackGroundColor = System.Drawing.Color.LightBlue; + this.smartButton3.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartButton3.ButtonDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(76)))), ((int)(((byte)(129))))); + this.smartButton3.ButtonImageAutoSize = true; + this.smartButton3.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton3.ButtonText = "smartButton1"; + this.smartButton3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton3.GroupID = 0; + this.smartButton3.ImageDisable = null; + this.smartButton3.ImageDown = null; + this.smartButton3.ImageUp = null; + this.smartButton3.Location = new System.Drawing.Point(917, 440); + this.smartButton3.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton3.Name = "smartButton3"; + this.smartButton3.NestedClickEventPrevent = false; + this.smartButton3.OutlinePixel = 2; + this.smartButton3.OverlapOptimize = true; + this.smartButton3.RepeatInterval = 200; + this.smartButton3.RepeatIntervalAccelerate = null; + this.smartButton3.RoundSize = 10; + this.smartButton3.SafeInterval = 200; + this.smartButton3.Size = new System.Drawing.Size(100, 43); + this.smartButton3.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton3.TabIndex = 267; + this.smartButton3.Text = null; + this.smartButton3.TextColor = System.Drawing.Color.White; + this.smartButton3.TextColorDisable = System.Drawing.Color.Gray; + this.smartButton3.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.smartButton3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton3.Click += new System.EventHandler(this.smartButton3_Click); // // FormMainDisplay2 // @@ -2604,5 +2642,6 @@ public SmartX.SmartLabel labelSbAlarm5; public SmartX.SmartLabel labelSbAlarm9; public SmartX.SmartLabel labelSbAlarm4; + private SmartX.SmartButton smartButton3; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index f01b232..b9171b4 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -594,10 +594,11 @@ namespace INT_PT002.Forms this.CollectionLabelSbAlarm[9].Visible = alarm.CollectionIsSensorBoardError[9]; value = value.Trim(); - this.label1.Size = new Size(value.Length * 7, 20); + this.label1.Size = new Size(value.Length * 8, 20); this.label1.Text = value; + this.label1.Location = new Point(6, 22); - if (this.label1.Width > 655) + if (this.label1.Width > 548) { if (this.label1.Text != "") this.smartTimerAlarm.Start(); @@ -639,8 +640,9 @@ namespace INT_PT002.Forms public void DisplayRefresh() { - this.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormMainDisplay; - this.ParentForm.SetDisplayMode(Define.E_DisplayMode.Normal); + this.ParentForm.CurrentSystemStatus.CurrentForm = Define.E_FormStore.FormMainDisplay; + this.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.MainDisplay; + this.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Normal); this.buttonRecipeNo.ButtonText = this.ParentForm.CurrentRecipe.NUMBER.ToString(); } @@ -783,6 +785,8 @@ namespace INT_PT002.Forms { string value = ""; + this.smartTimerAlarm.Stop(); + value = "a1_Servo emergency stop "; value += "a2_Servo1 "; value += "a3_Servo2 "; @@ -791,11 +795,62 @@ namespace INT_PT002.Forms //value += "a6_Pressure "; value = value.Trim(); - this.label1.Size = new Size(value.Length * 7, 20); + this.label1.Size = new Size(value.Length * 8, 20); this.label1.Text = value; - if (this.label1.Text != "") - this.smartTimerAlarm.Start(); + if (this.label1.Width > 548) + { + if (this.label1.Text != "") + this.smartTimerAlarm.Start(); + } + } + + private void smartButton2_Click(object sender, EventArgs e) + { + string value = ""; + + this.smartTimerAlarm.Stop(); + + value = "a1_Servo emergency stop "; + value += "a2_Servo1 "; + value += "a3_Servo2 "; + value += "a4_Servo1 Torque "; + //value += "a5_Servo2 Torque "; + //value += "a6_Pressure "; + + value = value.Trim(); + this.label1.Size = new Size(value.Length * 8, 20); + this.label1.Text = value; + + if (this.label1.Width > 548) + { + if (this.label1.Text != "") + this.smartTimerAlarm.Start(); + } + } + + private void smartButton3_Click(object sender, EventArgs e) + { + string value = ""; + + this.smartTimerAlarm.Stop(); + + value = "a1_Servo emergency stop "; + value += "a2_Servo1 "; + value += "a3_Servo2 "; + value += "a4_Servo1 Torque "; + value += "a5_Servo2 Torque "; + value += "a6_Pressure "; + + value = value.Trim(); + this.label1.Size = new Size(value.Length * 8, 20); + this.label1.Text = value; + + if (this.label1.Width > 548) + { + if (this.label1.Text != "") + this.smartTimerAlarm.Start(); + } } } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMenu.Designer.cs b/INT_PT002/Forms/FormMenu.Designer.cs index cad5f39..cb35180 100644 --- a/INT_PT002/Forms/FormMenu.Designer.cs +++ b/INT_PT002/Forms/FormMenu.Designer.cs @@ -46,6 +46,7 @@ this.buttonRecipe = new SmartX.SmartButton(); this.buttonHome = new SmartX.SmartButton(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.labelStart = new SmartX.SmartLabel(); this.smartForm1.SuspendLayout(); this.SuspendLayout(); // @@ -54,6 +55,8 @@ this.smartForm1.BackGroundFillStyle = SmartXUIBase.SmartUIControlFormBase.BackGroundFillStyles.UseBackImage; this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage"))); this.smartForm1.CenterLocation = false; + this.smartForm1.Controls.Add(this.labelStop); + this.smartForm1.Controls.Add(this.labelStart); this.smartForm1.Controls.Add(this.buttonUser); this.smartForm1.Controls.Add(this.labelUserID); this.smartForm1.Controls.Add(this.labelUserLevel); @@ -66,7 +69,6 @@ this.smartForm1.Controls.Add(this.buttonSystem); this.smartForm1.Controls.Add(this.buttonLog); this.smartForm1.Controls.Add(this.buttonManual); - this.smartForm1.Controls.Add(this.labelStop); this.smartForm1.Controls.Add(this.buttonRecipe); this.smartForm1.Controls.Add(this.buttonHome); this.smartForm1.Controls.Add(this.smartGroupBox1); @@ -124,7 +126,7 @@ this.labelUserID.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelUserID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelUserID.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelUserID.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserID.LineSpacing = 0F; this.labelUserID.Location = new System.Drawing.Point(743, 3); this.labelUserID.Name = "labelUserID"; @@ -147,7 +149,7 @@ this.labelUserLevel.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelUserLevel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelUserLevel.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelUserLevel.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserLevel.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserLevel.LineSpacing = 0F; this.labelUserLevel.Location = new System.Drawing.Point(849, 3); this.labelUserLevel.Name = "labelUserLevel"; @@ -461,6 +463,7 @@ this.labelStop.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelStop.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelStop.Wordwrap = false; + this.labelStop.Click += new System.EventHandler(this.labelStop_Click); // // buttonRecipe // @@ -550,6 +553,30 @@ this.smartGroupBox1.Text = "기본 > "; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // + // labelStart + // + this.labelStart.BackGround = null; + this.labelStart.BackGroundColor = System.Drawing.Color.DarkGreen; + this.labelStart.BorderColor = System.Drawing.Color.DarkGreen; + this.labelStart.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelStart.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelStart.LineSpacing = 0F; + this.labelStart.Location = new System.Drawing.Point(911, 3); + this.labelStart.Name = "labelStart"; + this.labelStart.OverlapOptimize = true; + this.labelStart.PasswordChar = '\0'; + this.labelStart.Radius = 10; + this.labelStart.RoundRectFillColor = System.Drawing.Color.DarkGreen; + this.labelStart.Size = new System.Drawing.Size(110, 30); + this.labelStart.TabIndex = 88; + this.labelStart.Text = "START"; + this.labelStart.TextColor = System.Drawing.Color.White; + this.labelStart.TextColorDisable = System.Drawing.Color.Gray; + this.labelStart.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelStart.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStart.Wordwrap = false; + this.labelStart.Click += new System.EventHandler(this.labelStart_Click); + // // FormMenu // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -584,5 +611,6 @@ private SmartX.SmartLabel labelUserID; private SmartX.SmartLabel labelUserLevel; private SmartX.SmartButton buttonUser; + private SmartX.SmartLabel labelStart; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMenu.cs b/INT_PT002/Forms/FormMenu.cs index ce5c736..04fc43b 100644 --- a/INT_PT002/Forms/FormMenu.cs +++ b/INT_PT002/Forms/FormMenu.cs @@ -448,7 +448,7 @@ namespace INT_PT002.Forms this.buttonSystem.ButtonDown(); this.buttonBottom1.ButtonText = "Information"; - this.buttonBottom2.ButtonText = "E.Test"; + this.buttonBottom2.ButtonText = "Equipment"; this.buttonBottom1.Visible = true; this.buttonBottom2.Visible = true; @@ -590,29 +590,85 @@ namespace INT_PT002.Forms } } + // Menu + public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) + { + if (status == Define.E_EquipmentStatus.Start) + { + #region Start + this.labelStart.Visible = true; + this.labelStop.Visible = false; + #endregion + } + else + { + #region Stop + this.labelStart.Visible = false; + this.labelStop.Visible = true; + #endregion + } + } + public void Set_Equipment_ButtonEnable(bool data) + { + if (data == true) + { + this.buttonRecipe.Enabled = true; + this.buttonUser.Enabled = true; + this.buttonManual.Enabled = true; + this.buttonLog.Enabled = true; + this.buttonSystem.Enabled = true; + + this.buttonBottom1.Enabled = true; + this.buttonBottom2.Enabled = true; + this.buttonBottom3.Enabled = true; + this.buttonBottom4.Enabled = true; + + this.buttonHome.Enabled = true; + } + else + { + this.buttonRecipe.Enabled = false; + this.buttonUser.Enabled = false; + this.buttonManual.Enabled = false; + this.buttonLog.Enabled = false; + this.buttonSystem.Enabled = false; + + this.buttonBottom1.Enabled = false; + this.buttonBottom2.Enabled = false; + this.buttonBottom3.Enabled = false; + this.buttonBottom4.Enabled = false; + + this.buttonHome.Enabled = false; + } + } + // Menu Recipe public void UpdateDisplayRecipeData(Recipe item) { this.Child_Recipe_Setting.UpdateDisplayControlData(item); } - // Menu Equipment - public void UpdateDisplayEquipmentTestInputData(Collection datas) + // Menu Manual + public void UpdateDisplayIOTestInputData(Collection datas) { this.Child_Manual_IoTest.UpdateDisplayInputData(datas); } - public void UpdateDisplayEquipmentTestDispData(Collection datas) + public void UpdateDisplayIOTestDispData(Collection datas) { this.Child_Manual_IoTest.UpdateDisplayDispData(datas); } - public void UpdateDisplayEquipmentTestDiffData(Collection datas) + public void UpdateDisplayIOTestDiffData(Collection datas) { this.Child_Manual_IoTest.UpdateDisplayDiffData(datas); } - public void UpdateDisplayEquipmentTestPresData(Collection datas) + public void UpdateDisplayIOTestPresData(Collection datas) { this.Child_Manual_IoTest.UpdateDisplayPresData(datas); } + public void UpdateDisplayIOTestAlarmView(AlarmList data) + { + this.Child_Manual_IoTest.UpdateDisplayAlarmView(data); + } // Menu System public void UpdateMainBoardVersionDisplay(string data) @@ -646,10 +702,30 @@ namespace INT_PT002.Forms this.Child_User_UserEditor.CallBackUserListNewData(user); } - // Menu Manual - public void UpdateDisplayAlarmView(AlarmList data) + // Menu System + public void UpdateDisplayEquipmentDispData(Collection datas) { - this.Child_Manual_IoTest.UpdateDisplayAlarmView(data); + this.Child_System_Status.UpdateDisplayDispData(datas); + } + public void UpdateDisplayEquipmentDiffData(Collection datas) + { + this.Child_System_Status.UpdateDisplayDiffData(datas); + } + public void UpdateDisplayEquipmentPresData(Collection datas) + { + this.Child_System_Status.UpdateDisplayPresData(datas); + } + public void UpdateDisplayEquipmentAlarmView(AlarmList data) + { + this.Child_System_Status.UpdateDisplayAlarmView(data); + } + public void UpdateDisplayEquipmentJudgmentData(LeakData datas) + { + this.Child_System_Status.UpdateDisplayJudgmentData(datas); + } + public void UpdateDisplayEquipmentProcessStatusDisplay(Define.E_ProcessStatus status) + { + this.Child_System_Status.UpdateProcessStatusDisplay(status); } public void DisplayRefresh(SystemStatus status) @@ -821,6 +897,17 @@ namespace INT_PT002.Forms break; } } + + private void labelStart_Click(object sender, EventArgs e) + { + if (this.ParentForm.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) + this.ParentForm.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + } + private void labelStop_Click(object sender, EventArgs e) + { + if (this.ParentForm.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) + this.ParentForm.TransferData(CommunicationCommand.Start, CommunicationID.MainBoard); + } #endregion } } \ No newline at end of file From 3234629296b688edce8498d03c9565011fd425fc Mon Sep 17 00:00:00 2001 From: Seonjae Date: Fri, 31 Mar 2023 13:32:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ControlMenuUserGroupEditor.Designer.cs | 794 ++++++++---------- .../User/ControlMenuUserGroupEditor.cs | 56 +- .../ControlMenuUserUserEditor.Designer.cs | 32 +- .../User/ControlMenuUserUserEditor.cs | 69 +- INT_PT002/DataStore/SystemConfiguration.cs | 52 +- .../DialogForms/DialogFormLogOn.Designer.cs | 48 +- INT_PT002/DialogForms/DialogFormLogOn.cs | 52 +- INT_PT002/Forms/FormMain.Designer.cs | 7 + INT_PT002/Forms/FormMain.cs | 128 +-- INT_PT002/Forms/FormMain.resx | 3 + INT_PT002/Forms/FormMainDisplay.cs | 2 +- INT_PT002/Forms/FormMainDisplay1.cs | 2 +- INT_PT002/Forms/FormMainDisplay2.Designer.cs | 3 +- INT_PT002/Forms/FormMainDisplay2.cs | 66 +- INT_PT002/INT_PT002.csproj | 365 -------- 15 files changed, 598 insertions(+), 1081 deletions(-) delete mode 100644 INT_PT002/INT_PT002.csproj diff --git a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs index ff9bbe5..2d0a2ff 100644 --- a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs +++ b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs @@ -42,7 +42,6 @@ this.checkBoxDefaultMainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxDefaultMainClear = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxDefaultMainWeightSetting = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuCheckLog = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuStatus = new SmartX.SmartCheckBox(); this.checkBoxDefaultMenuAlarmList = new SmartX.SmartCheckBox(); @@ -56,11 +55,10 @@ this.checkBoxL3MenuIOTest = new SmartX.SmartCheckBox(); this.checkBoxL3MainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxL3MainClear = new SmartX.SmartCheckBox(); - this.checkBoxL3MenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxL3MainWeightSetting = new SmartX.SmartCheckBox(); - this.checkBoxL3MenuCheckLog = new SmartX.SmartCheckBox(); + this.checkBoxL3MenuHistoryLog = new SmartX.SmartCheckBox(); + this.checkBoxL3MenuInspectionLog = new SmartX.SmartCheckBox(); this.checkBoxL3MenuStatus = new SmartX.SmartCheckBox(); - this.checkBoxL3MenuAlarmList = new SmartX.SmartCheckBox(); + this.checkBoxL3MenuAlarmLog = new SmartX.SmartCheckBox(); this.checkBoxL3MenuInformation = new SmartX.SmartCheckBox(); this.groupBoxLevel2 = new SmartX.SmartGroupBox(); this.textBoxLevel2 = new System.Windows.Forms.TextBox(); @@ -71,11 +69,10 @@ this.checkBoxL2MenuIOTest = new SmartX.SmartCheckBox(); this.checkBoxL2MainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxL2MainClear = new SmartX.SmartCheckBox(); - this.checkBoxL2MenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxL2MainWeightSetting = new SmartX.SmartCheckBox(); - this.checkBoxL2MenuCheckLog = new SmartX.SmartCheckBox(); + this.checkBoxL2MenuHistoryLog = new SmartX.SmartCheckBox(); + this.checkBoxL2MenuInspectionLog = new SmartX.SmartCheckBox(); this.checkBoxL2MenuStatus = new SmartX.SmartCheckBox(); - this.checkBoxL2MenuAlarmList = new SmartX.SmartCheckBox(); + this.checkBoxL2MenuAlarmLog = new SmartX.SmartCheckBox(); this.checkBoxL2MenuInformation = new SmartX.SmartCheckBox(); this.groupBoxLevel1 = new SmartX.SmartGroupBox(); this.textBoxLevel1 = new System.Windows.Forms.TextBox(); @@ -86,23 +83,21 @@ this.checkBoxL1MenuIOTest = new SmartX.SmartCheckBox(); this.checkBoxL1MainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxL1MainClear = new SmartX.SmartCheckBox(); - this.checkBoxL1MenuEquipmentLog = new SmartX.SmartCheckBox(); - this.checkBoxL1MainWeightSetting = new SmartX.SmartCheckBox(); - this.checkBoxL1MenuCheckLog = new SmartX.SmartCheckBox(); + this.checkBoxL1MenuHistoryLog = new SmartX.SmartCheckBox(); + this.checkBoxL1MenuInspectionLog = new SmartX.SmartCheckBox(); this.checkBoxL1MenuStatus = new SmartX.SmartCheckBox(); - this.checkBoxL1MenuAlarmList = new SmartX.SmartCheckBox(); + this.checkBoxL1MenuAlarmLog = new SmartX.SmartCheckBox(); this.checkBoxL1MenuInformation = new SmartX.SmartCheckBox(); this.labelTitleMenuStatus = new SmartX.SmartLabel(); this.labelTitleMenuInformation = new SmartX.SmartLabel(); - this.labelTitleMenuAlarmList = new SmartX.SmartLabel(); - this.labelTitleMenuCheckLog = new SmartX.SmartLabel(); - this.labelTitleMenuEquipmentLog = new SmartX.SmartLabel(); + this.labelTitleMenuAlarmLog = new SmartX.SmartLabel(); + this.labelTitleMenuInspectionLog = new SmartX.SmartLabel(); + this.labelTitleMenuHistoryLog = new SmartX.SmartLabel(); this.labelTitleMenuIOTest = new SmartX.SmartLabel(); this.labelTitleMenuUserSetting = new SmartX.SmartLabel(); this.labelTitleMenuProduct = new SmartX.SmartLabel(); this.labelTitleMainSubMenu = new SmartX.SmartLabel(); this.labelTitleMainClear = new SmartX.SmartLabel(); - this.labelTitleMainWeightSetting = new SmartX.SmartLabel(); this.labelTitleMainProductChange = new SmartX.SmartLabel(); this.buttonSave = new SmartX.SmartButton(); this.labelTitleMain = new SmartX.SmartLabel(); @@ -128,15 +123,14 @@ this.smartGroupBox1.Controls.Add(this.groupBoxLevel1); this.smartGroupBox1.Controls.Add(this.labelTitleMenuStatus); this.smartGroupBox1.Controls.Add(this.labelTitleMenuInformation); - this.smartGroupBox1.Controls.Add(this.labelTitleMenuAlarmList); - this.smartGroupBox1.Controls.Add(this.labelTitleMenuCheckLog); - this.smartGroupBox1.Controls.Add(this.labelTitleMenuEquipmentLog); + this.smartGroupBox1.Controls.Add(this.labelTitleMenuAlarmLog); + this.smartGroupBox1.Controls.Add(this.labelTitleMenuInspectionLog); + this.smartGroupBox1.Controls.Add(this.labelTitleMenuHistoryLog); this.smartGroupBox1.Controls.Add(this.labelTitleMenuIOTest); this.smartGroupBox1.Controls.Add(this.labelTitleMenuUserSetting); this.smartGroupBox1.Controls.Add(this.labelTitleMenuProduct); this.smartGroupBox1.Controls.Add(this.labelTitleMainSubMenu); this.smartGroupBox1.Controls.Add(this.labelTitleMainClear); - this.smartGroupBox1.Controls.Add(this.labelTitleMainWeightSetting); this.smartGroupBox1.Controls.Add(this.labelTitleMainProductChange); this.smartGroupBox1.Controls.Add(this.buttonSave); this.smartGroupBox1.Controls.Add(this.labelTitleMain); @@ -242,7 +236,7 @@ this.labelTitleMenuUserGroupEditor.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuUserGroupEditor.LineSpacing = 0F; - this.labelTitleMenuUserGroupEditor.Location = new System.Drawing.Point(158, 370); + this.labelTitleMenuUserGroupEditor.Location = new System.Drawing.Point(158, 341); this.labelTitleMenuUserGroupEditor.Name = "labelTitleMenuUserGroupEditor"; this.labelTitleMenuUserGroupEditor.OverlapOptimize = true; this.labelTitleMenuUserGroupEditor.PasswordChar = '\0'; @@ -270,7 +264,6 @@ this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMainSubMenu); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMainClear); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuEquipmentLog); - this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMainWeightSetting); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuCheckLog); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuStatus); this.groupBoxDefault.Controls.Add(this.checkBoxDefaultMenuAlarmList); @@ -302,7 +295,7 @@ this.checkBoxDefaultMenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuUserGroupEditor.ImageCheckBox = null; this.checkBoxDefaultMenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxDefaultMenuUserGroupEditor.Location = new System.Drawing.Point(48, 272); + this.checkBoxDefaultMenuUserGroupEditor.Location = new System.Drawing.Point(48, 243); this.checkBoxDefaultMenuUserGroupEditor.Name = "checkBoxDefaultMenuUserGroupEditor"; this.checkBoxDefaultMenuUserGroupEditor.OverlapOptimize = true; this.checkBoxDefaultMenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -347,7 +340,7 @@ this.checkBoxDefaultMenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuUserSetting.ImageCheckBox = null; this.checkBoxDefaultMenuUserSetting.ImageUnCheckBox = null; - this.checkBoxDefaultMenuUserSetting.Location = new System.Drawing.Point(48, 243); + this.checkBoxDefaultMenuUserSetting.Location = new System.Drawing.Point(48, 214); this.checkBoxDefaultMenuUserSetting.Name = "checkBoxDefaultMenuUserSetting"; this.checkBoxDefaultMenuUserSetting.OverlapOptimize = true; this.checkBoxDefaultMenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -370,7 +363,7 @@ this.checkBoxDefaultMenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuProduct.ImageCheckBox = null; this.checkBoxDefaultMenuProduct.ImageUnCheckBox = null; - this.checkBoxDefaultMenuProduct.Location = new System.Drawing.Point(48, 214); + this.checkBoxDefaultMenuProduct.Location = new System.Drawing.Point(48, 185); this.checkBoxDefaultMenuProduct.Name = "checkBoxDefaultMenuProduct"; this.checkBoxDefaultMenuProduct.OverlapOptimize = true; this.checkBoxDefaultMenuProduct.Size = new System.Drawing.Size(23, 23); @@ -393,7 +386,7 @@ this.checkBoxDefaultMenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuIOTest.ImageCheckBox = null; this.checkBoxDefaultMenuIOTest.ImageUnCheckBox = null; - this.checkBoxDefaultMenuIOTest.Location = new System.Drawing.Point(48, 301); + this.checkBoxDefaultMenuIOTest.Location = new System.Drawing.Point(48, 272); this.checkBoxDefaultMenuIOTest.Name = "checkBoxDefaultMenuIOTest"; this.checkBoxDefaultMenuIOTest.OverlapOptimize = true; this.checkBoxDefaultMenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -415,7 +408,7 @@ this.checkBoxDefaultMainSubMenu.CheckLineWidth = 3; this.checkBoxDefaultMainSubMenu.ImageCheckBox = null; this.checkBoxDefaultMainSubMenu.ImageUnCheckBox = null; - this.checkBoxDefaultMainSubMenu.Location = new System.Drawing.Point(48, 153); + this.checkBoxDefaultMainSubMenu.Location = new System.Drawing.Point(48, 124); this.checkBoxDefaultMainSubMenu.Name = "checkBoxDefaultMainSubMenu"; this.checkBoxDefaultMainSubMenu.OverlapOptimize = true; this.checkBoxDefaultMainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -437,7 +430,7 @@ this.checkBoxDefaultMainClear.CheckLineWidth = 3; this.checkBoxDefaultMainClear.ImageCheckBox = null; this.checkBoxDefaultMainClear.ImageUnCheckBox = null; - this.checkBoxDefaultMainClear.Location = new System.Drawing.Point(48, 124); + this.checkBoxDefaultMainClear.Location = new System.Drawing.Point(48, 95); this.checkBoxDefaultMainClear.Name = "checkBoxDefaultMainClear"; this.checkBoxDefaultMainClear.OverlapOptimize = true; this.checkBoxDefaultMainClear.Size = new System.Drawing.Size(23, 23); @@ -460,7 +453,7 @@ this.checkBoxDefaultMenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuEquipmentLog.ImageCheckBox = null; this.checkBoxDefaultMenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxDefaultMenuEquipmentLog.Location = new System.Drawing.Point(48, 330); + this.checkBoxDefaultMenuEquipmentLog.Location = new System.Drawing.Point(48, 301); this.checkBoxDefaultMenuEquipmentLog.Name = "checkBoxDefaultMenuEquipmentLog"; this.checkBoxDefaultMenuEquipmentLog.OverlapOptimize = true; this.checkBoxDefaultMenuEquipmentLog.Size = new System.Drawing.Size(23, 23); @@ -470,28 +463,6 @@ this.checkBoxDefaultMenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxDefaultMenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxDefaultMainWeightSetting - // - this.checkBoxDefaultMainWeightSetting.BackGround = this.groupBoxDefault; - this.checkBoxDefaultMainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxDefaultMainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxDefaultMainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxDefaultMainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxDefaultMainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxDefaultMainWeightSetting.Checked = false; - this.checkBoxDefaultMainWeightSetting.CheckLineWidth = 3; - this.checkBoxDefaultMainWeightSetting.ImageCheckBox = null; - this.checkBoxDefaultMainWeightSetting.ImageUnCheckBox = null; - this.checkBoxDefaultMainWeightSetting.Location = new System.Drawing.Point(48, 95); - this.checkBoxDefaultMainWeightSetting.Name = "checkBoxDefaultMainWeightSetting"; - this.checkBoxDefaultMainWeightSetting.OverlapOptimize = true; - this.checkBoxDefaultMainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxDefaultMainWeightSetting.TabIndex = 1; - this.checkBoxDefaultMainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxDefaultMainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxDefaultMainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxDefaultMainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // // checkBoxDefaultMenuCheckLog // this.checkBoxDefaultMenuCheckLog.BackGround = this.groupBoxDefault; @@ -505,7 +476,7 @@ this.checkBoxDefaultMenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuCheckLog.ImageCheckBox = null; this.checkBoxDefaultMenuCheckLog.ImageUnCheckBox = null; - this.checkBoxDefaultMenuCheckLog.Location = new System.Drawing.Point(48, 359); + this.checkBoxDefaultMenuCheckLog.Location = new System.Drawing.Point(48, 330); this.checkBoxDefaultMenuCheckLog.Name = "checkBoxDefaultMenuCheckLog"; this.checkBoxDefaultMenuCheckLog.OverlapOptimize = true; this.checkBoxDefaultMenuCheckLog.Size = new System.Drawing.Size(23, 23); @@ -528,7 +499,7 @@ this.checkBoxDefaultMenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuStatus.ImageCheckBox = null; this.checkBoxDefaultMenuStatus.ImageUnCheckBox = null; - this.checkBoxDefaultMenuStatus.Location = new System.Drawing.Point(48, 446); + this.checkBoxDefaultMenuStatus.Location = new System.Drawing.Point(48, 417); this.checkBoxDefaultMenuStatus.Name = "checkBoxDefaultMenuStatus"; this.checkBoxDefaultMenuStatus.OverlapOptimize = true; this.checkBoxDefaultMenuStatus.Size = new System.Drawing.Size(23, 23); @@ -551,7 +522,7 @@ this.checkBoxDefaultMenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuAlarmList.ImageCheckBox = null; this.checkBoxDefaultMenuAlarmList.ImageUnCheckBox = null; - this.checkBoxDefaultMenuAlarmList.Location = new System.Drawing.Point(48, 388); + this.checkBoxDefaultMenuAlarmList.Location = new System.Drawing.Point(48, 359); this.checkBoxDefaultMenuAlarmList.Name = "checkBoxDefaultMenuAlarmList"; this.checkBoxDefaultMenuAlarmList.OverlapOptimize = true; this.checkBoxDefaultMenuAlarmList.Size = new System.Drawing.Size(23, 23); @@ -574,7 +545,7 @@ this.checkBoxDefaultMenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxDefaultMenuInformation.ImageCheckBox = null; this.checkBoxDefaultMenuInformation.ImageUnCheckBox = null; - this.checkBoxDefaultMenuInformation.Location = new System.Drawing.Point(48, 417); + this.checkBoxDefaultMenuInformation.Location = new System.Drawing.Point(48, 388); this.checkBoxDefaultMenuInformation.Name = "checkBoxDefaultMenuInformation"; this.checkBoxDefaultMenuInformation.OverlapOptimize = true; this.checkBoxDefaultMenuInformation.Size = new System.Drawing.Size(23, 23); @@ -597,11 +568,10 @@ this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuIOTest); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainSubMenu); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainClear); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuEquipmentLog); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainWeightSetting); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuCheckLog); + this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuHistoryLog); + this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuInspectionLog); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuStatus); - this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuAlarmList); + this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuAlarmLog); this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuInformation); this.groupBoxLevel3.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxLevel3.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -641,7 +611,7 @@ this.checkBoxL3MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuUserGroupEditor.ImageCheckBox = null; this.checkBoxL3MenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxL3MenuUserGroupEditor.Location = new System.Drawing.Point(48, 272); + this.checkBoxL3MenuUserGroupEditor.Location = new System.Drawing.Point(48, 247); this.checkBoxL3MenuUserGroupEditor.Name = "checkBoxL3MenuUserGroupEditor"; this.checkBoxL3MenuUserGroupEditor.OverlapOptimize = true; this.checkBoxL3MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -663,7 +633,7 @@ this.checkBoxL3MainProductChange.CheckLineWidth = 3; this.checkBoxL3MainProductChange.ImageCheckBox = null; this.checkBoxL3MainProductChange.ImageUnCheckBox = null; - this.checkBoxL3MainProductChange.Location = new System.Drawing.Point(48, 66); + this.checkBoxL3MainProductChange.Location = new System.Drawing.Point(48, 70); this.checkBoxL3MainProductChange.Name = "checkBoxL3MainProductChange"; this.checkBoxL3MainProductChange.OverlapOptimize = true; this.checkBoxL3MainProductChange.Size = new System.Drawing.Size(23, 23); @@ -686,7 +656,7 @@ this.checkBoxL3MenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuUserSetting.ImageCheckBox = null; this.checkBoxL3MenuUserSetting.ImageUnCheckBox = null; - this.checkBoxL3MenuUserSetting.Location = new System.Drawing.Point(48, 243); + this.checkBoxL3MenuUserSetting.Location = new System.Drawing.Point(48, 218); this.checkBoxL3MenuUserSetting.Name = "checkBoxL3MenuUserSetting"; this.checkBoxL3MenuUserSetting.OverlapOptimize = true; this.checkBoxL3MenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -709,7 +679,7 @@ this.checkBoxL3MenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuProduct.ImageCheckBox = null; this.checkBoxL3MenuProduct.ImageUnCheckBox = null; - this.checkBoxL3MenuProduct.Location = new System.Drawing.Point(48, 214); + this.checkBoxL3MenuProduct.Location = new System.Drawing.Point(48, 189); this.checkBoxL3MenuProduct.Name = "checkBoxL3MenuProduct"; this.checkBoxL3MenuProduct.OverlapOptimize = true; this.checkBoxL3MenuProduct.Size = new System.Drawing.Size(23, 23); @@ -732,7 +702,7 @@ this.checkBoxL3MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuIOTest.ImageCheckBox = null; this.checkBoxL3MenuIOTest.ImageUnCheckBox = null; - this.checkBoxL3MenuIOTest.Location = new System.Drawing.Point(48, 301); + this.checkBoxL3MenuIOTest.Location = new System.Drawing.Point(48, 276); this.checkBoxL3MenuIOTest.Name = "checkBoxL3MenuIOTest"; this.checkBoxL3MenuIOTest.OverlapOptimize = true; this.checkBoxL3MenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -754,7 +724,7 @@ this.checkBoxL3MainSubMenu.CheckLineWidth = 3; this.checkBoxL3MainSubMenu.ImageCheckBox = null; this.checkBoxL3MainSubMenu.ImageUnCheckBox = null; - this.checkBoxL3MainSubMenu.Location = new System.Drawing.Point(48, 153); + this.checkBoxL3MainSubMenu.Location = new System.Drawing.Point(48, 128); this.checkBoxL3MainSubMenu.Name = "checkBoxL3MainSubMenu"; this.checkBoxL3MainSubMenu.OverlapOptimize = true; this.checkBoxL3MainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -776,7 +746,7 @@ this.checkBoxL3MainClear.CheckLineWidth = 3; this.checkBoxL3MainClear.ImageCheckBox = null; this.checkBoxL3MainClear.ImageUnCheckBox = null; - this.checkBoxL3MainClear.Location = new System.Drawing.Point(48, 124); + this.checkBoxL3MainClear.Location = new System.Drawing.Point(48, 99); this.checkBoxL3MainClear.Name = "checkBoxL3MainClear"; this.checkBoxL3MainClear.OverlapOptimize = true; this.checkBoxL3MainClear.Size = new System.Drawing.Size(23, 23); @@ -786,73 +756,51 @@ this.checkBoxL3MainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL3MainClear.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL3MenuEquipmentLog + // checkBoxL3MenuHistoryLog // - this.checkBoxL3MenuEquipmentLog.BackGround = this.groupBoxLevel3; - this.checkBoxL3MenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MenuEquipmentLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MenuEquipmentLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MenuEquipmentLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MenuEquipmentLog.CheckBoxSymbolSize = 20; - this.checkBoxL3MenuEquipmentLog.Checked = false; - this.checkBoxL3MenuEquipmentLog.CheckLineWidth = 3; - this.checkBoxL3MenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL3MenuEquipmentLog.ImageCheckBox = null; - this.checkBoxL3MenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxL3MenuEquipmentLog.Location = new System.Drawing.Point(48, 330); - this.checkBoxL3MenuEquipmentLog.Name = "checkBoxL3MenuEquipmentLog"; - this.checkBoxL3MenuEquipmentLog.OverlapOptimize = true; - this.checkBoxL3MenuEquipmentLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MenuEquipmentLog.TabIndex = 110; - this.checkBoxL3MenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL3MenuHistoryLog.BackGround = this.groupBoxLevel3; + this.checkBoxL3MenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL3MenuHistoryLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL3MenuHistoryLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL3MenuHistoryLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL3MenuHistoryLog.CheckBoxSymbolSize = 20; + this.checkBoxL3MenuHistoryLog.Checked = false; + this.checkBoxL3MenuHistoryLog.CheckLineWidth = 3; + this.checkBoxL3MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL3MenuHistoryLog.ImageCheckBox = null; + this.checkBoxL3MenuHistoryLog.ImageUnCheckBox = null; + this.checkBoxL3MenuHistoryLog.Location = new System.Drawing.Point(48, 305); + this.checkBoxL3MenuHistoryLog.Name = "checkBoxL3MenuHistoryLog"; + this.checkBoxL3MenuHistoryLog.OverlapOptimize = true; + this.checkBoxL3MenuHistoryLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL3MenuHistoryLog.TabIndex = 110; + this.checkBoxL3MenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL3MenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL3MenuHistoryLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL3MenuHistoryLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL3MainWeightSetting + // checkBoxL3MenuInspectionLog // - this.checkBoxL3MainWeightSetting.BackGround = this.groupBoxLevel3; - this.checkBoxL3MainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxL3MainWeightSetting.Checked = false; - this.checkBoxL3MainWeightSetting.CheckLineWidth = 3; - this.checkBoxL3MainWeightSetting.ImageCheckBox = null; - this.checkBoxL3MainWeightSetting.ImageUnCheckBox = null; - this.checkBoxL3MainWeightSetting.Location = new System.Drawing.Point(48, 95); - this.checkBoxL3MainWeightSetting.Name = "checkBoxL3MainWeightSetting"; - this.checkBoxL3MainWeightSetting.OverlapOptimize = true; - this.checkBoxL3MainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MainWeightSetting.TabIndex = 1; - this.checkBoxL3MainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // - // checkBoxL3MenuCheckLog - // - this.checkBoxL3MenuCheckLog.BackGround = this.groupBoxLevel3; - this.checkBoxL3MenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MenuCheckLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MenuCheckLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MenuCheckLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MenuCheckLog.CheckBoxSymbolSize = 20; - this.checkBoxL3MenuCheckLog.Checked = false; - this.checkBoxL3MenuCheckLog.CheckLineWidth = 3; - this.checkBoxL3MenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL3MenuCheckLog.ImageCheckBox = null; - this.checkBoxL3MenuCheckLog.ImageUnCheckBox = null; - this.checkBoxL3MenuCheckLog.Location = new System.Drawing.Point(48, 359); - this.checkBoxL3MenuCheckLog.Name = "checkBoxL3MenuCheckLog"; - this.checkBoxL3MenuCheckLog.OverlapOptimize = true; - this.checkBoxL3MenuCheckLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MenuCheckLog.TabIndex = 111; - this.checkBoxL3MenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MenuCheckLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MenuCheckLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL3MenuInspectionLog.BackGround = this.groupBoxLevel3; + this.checkBoxL3MenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL3MenuInspectionLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL3MenuInspectionLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL3MenuInspectionLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL3MenuInspectionLog.CheckBoxSymbolSize = 20; + this.checkBoxL3MenuInspectionLog.Checked = false; + this.checkBoxL3MenuInspectionLog.CheckLineWidth = 3; + this.checkBoxL3MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL3MenuInspectionLog.ImageCheckBox = null; + this.checkBoxL3MenuInspectionLog.ImageUnCheckBox = null; + this.checkBoxL3MenuInspectionLog.Location = new System.Drawing.Point(48, 334); + this.checkBoxL3MenuInspectionLog.Name = "checkBoxL3MenuInspectionLog"; + this.checkBoxL3MenuInspectionLog.OverlapOptimize = true; + this.checkBoxL3MenuInspectionLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL3MenuInspectionLog.TabIndex = 111; + this.checkBoxL3MenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL3MenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL3MenuInspectionLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL3MenuInspectionLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL3MenuStatus // @@ -867,7 +815,7 @@ this.checkBoxL3MenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuStatus.ImageCheckBox = null; this.checkBoxL3MenuStatus.ImageUnCheckBox = null; - this.checkBoxL3MenuStatus.Location = new System.Drawing.Point(48, 446); + this.checkBoxL3MenuStatus.Location = new System.Drawing.Point(48, 421); this.checkBoxL3MenuStatus.Name = "checkBoxL3MenuStatus"; this.checkBoxL3MenuStatus.OverlapOptimize = true; this.checkBoxL3MenuStatus.Size = new System.Drawing.Size(23, 23); @@ -877,28 +825,28 @@ this.checkBoxL3MenuStatus.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL3MenuStatus.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL3MenuAlarmList + // checkBoxL3MenuAlarmLog // - this.checkBoxL3MenuAlarmList.BackGround = this.groupBoxLevel3; - this.checkBoxL3MenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL3MenuAlarmList.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL3MenuAlarmList.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL3MenuAlarmList.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL3MenuAlarmList.CheckBoxSymbolSize = 20; - this.checkBoxL3MenuAlarmList.Checked = false; - this.checkBoxL3MenuAlarmList.CheckLineWidth = 3; - this.checkBoxL3MenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL3MenuAlarmList.ImageCheckBox = null; - this.checkBoxL3MenuAlarmList.ImageUnCheckBox = null; - this.checkBoxL3MenuAlarmList.Location = new System.Drawing.Point(48, 388); - this.checkBoxL3MenuAlarmList.Name = "checkBoxL3MenuAlarmList"; - this.checkBoxL3MenuAlarmList.OverlapOptimize = true; - this.checkBoxL3MenuAlarmList.Size = new System.Drawing.Size(23, 23); - this.checkBoxL3MenuAlarmList.TabIndex = 114; - this.checkBoxL3MenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL3MenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL3MenuAlarmList.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL3MenuAlarmList.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL3MenuAlarmLog.BackGround = this.groupBoxLevel3; + this.checkBoxL3MenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL3MenuAlarmLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL3MenuAlarmLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL3MenuAlarmLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL3MenuAlarmLog.CheckBoxSymbolSize = 20; + this.checkBoxL3MenuAlarmLog.Checked = false; + this.checkBoxL3MenuAlarmLog.CheckLineWidth = 3; + this.checkBoxL3MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL3MenuAlarmLog.ImageCheckBox = null; + this.checkBoxL3MenuAlarmLog.ImageUnCheckBox = null; + this.checkBoxL3MenuAlarmLog.Location = new System.Drawing.Point(48, 363); + this.checkBoxL3MenuAlarmLog.Name = "checkBoxL3MenuAlarmLog"; + this.checkBoxL3MenuAlarmLog.OverlapOptimize = true; + this.checkBoxL3MenuAlarmLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL3MenuAlarmLog.TabIndex = 114; + this.checkBoxL3MenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL3MenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL3MenuAlarmLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL3MenuAlarmLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL3MenuInformation // @@ -913,7 +861,7 @@ this.checkBoxL3MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL3MenuInformation.ImageCheckBox = null; this.checkBoxL3MenuInformation.ImageUnCheckBox = null; - this.checkBoxL3MenuInformation.Location = new System.Drawing.Point(48, 417); + this.checkBoxL3MenuInformation.Location = new System.Drawing.Point(48, 392); this.checkBoxL3MenuInformation.Name = "checkBoxL3MenuInformation"; this.checkBoxL3MenuInformation.OverlapOptimize = true; this.checkBoxL3MenuInformation.Size = new System.Drawing.Size(23, 23); @@ -936,11 +884,10 @@ this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuIOTest); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainSubMenu); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainClear); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuEquipmentLog); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainWeightSetting); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuCheckLog); + this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuHistoryLog); + this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuInspectionLog); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuStatus); - this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuAlarmList); + this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuAlarmLog); this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuInformation); this.groupBoxLevel2.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxLevel2.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -980,7 +927,7 @@ this.checkBoxL2MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuUserGroupEditor.ImageCheckBox = null; this.checkBoxL2MenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxL2MenuUserGroupEditor.Location = new System.Drawing.Point(51, 272); + this.checkBoxL2MenuUserGroupEditor.Location = new System.Drawing.Point(51, 247); this.checkBoxL2MenuUserGroupEditor.Name = "checkBoxL2MenuUserGroupEditor"; this.checkBoxL2MenuUserGroupEditor.OverlapOptimize = true; this.checkBoxL2MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -1002,7 +949,7 @@ this.checkBoxL2MainProductChange.CheckLineWidth = 3; this.checkBoxL2MainProductChange.ImageCheckBox = null; this.checkBoxL2MainProductChange.ImageUnCheckBox = null; - this.checkBoxL2MainProductChange.Location = new System.Drawing.Point(51, 66); + this.checkBoxL2MainProductChange.Location = new System.Drawing.Point(51, 70); this.checkBoxL2MainProductChange.Name = "checkBoxL2MainProductChange"; this.checkBoxL2MainProductChange.OverlapOptimize = true; this.checkBoxL2MainProductChange.Size = new System.Drawing.Size(23, 23); @@ -1025,7 +972,7 @@ this.checkBoxL2MenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuUserSetting.ImageCheckBox = null; this.checkBoxL2MenuUserSetting.ImageUnCheckBox = null; - this.checkBoxL2MenuUserSetting.Location = new System.Drawing.Point(51, 243); + this.checkBoxL2MenuUserSetting.Location = new System.Drawing.Point(51, 218); this.checkBoxL2MenuUserSetting.Name = "checkBoxL2MenuUserSetting"; this.checkBoxL2MenuUserSetting.OverlapOptimize = true; this.checkBoxL2MenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -1048,7 +995,7 @@ this.checkBoxL2MenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuProduct.ImageCheckBox = null; this.checkBoxL2MenuProduct.ImageUnCheckBox = null; - this.checkBoxL2MenuProduct.Location = new System.Drawing.Point(51, 214); + this.checkBoxL2MenuProduct.Location = new System.Drawing.Point(51, 189); this.checkBoxL2MenuProduct.Name = "checkBoxL2MenuProduct"; this.checkBoxL2MenuProduct.OverlapOptimize = true; this.checkBoxL2MenuProduct.Size = new System.Drawing.Size(23, 23); @@ -1071,7 +1018,7 @@ this.checkBoxL2MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuIOTest.ImageCheckBox = null; this.checkBoxL2MenuIOTest.ImageUnCheckBox = null; - this.checkBoxL2MenuIOTest.Location = new System.Drawing.Point(51, 301); + this.checkBoxL2MenuIOTest.Location = new System.Drawing.Point(51, 276); this.checkBoxL2MenuIOTest.Name = "checkBoxL2MenuIOTest"; this.checkBoxL2MenuIOTest.OverlapOptimize = true; this.checkBoxL2MenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -1093,7 +1040,7 @@ this.checkBoxL2MainSubMenu.CheckLineWidth = 3; this.checkBoxL2MainSubMenu.ImageCheckBox = null; this.checkBoxL2MainSubMenu.ImageUnCheckBox = null; - this.checkBoxL2MainSubMenu.Location = new System.Drawing.Point(51, 153); + this.checkBoxL2MainSubMenu.Location = new System.Drawing.Point(51, 128); this.checkBoxL2MainSubMenu.Name = "checkBoxL2MainSubMenu"; this.checkBoxL2MainSubMenu.OverlapOptimize = true; this.checkBoxL2MainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -1115,7 +1062,7 @@ this.checkBoxL2MainClear.CheckLineWidth = 3; this.checkBoxL2MainClear.ImageCheckBox = null; this.checkBoxL2MainClear.ImageUnCheckBox = null; - this.checkBoxL2MainClear.Location = new System.Drawing.Point(51, 124); + this.checkBoxL2MainClear.Location = new System.Drawing.Point(51, 99); this.checkBoxL2MainClear.Name = "checkBoxL2MainClear"; this.checkBoxL2MainClear.OverlapOptimize = true; this.checkBoxL2MainClear.Size = new System.Drawing.Size(23, 23); @@ -1125,73 +1072,51 @@ this.checkBoxL2MainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL2MainClear.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL2MenuEquipmentLog + // checkBoxL2MenuHistoryLog // - this.checkBoxL2MenuEquipmentLog.BackGround = this.groupBoxLevel2; - this.checkBoxL2MenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MenuEquipmentLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MenuEquipmentLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MenuEquipmentLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MenuEquipmentLog.CheckBoxSymbolSize = 20; - this.checkBoxL2MenuEquipmentLog.Checked = false; - this.checkBoxL2MenuEquipmentLog.CheckLineWidth = 3; - this.checkBoxL2MenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL2MenuEquipmentLog.ImageCheckBox = null; - this.checkBoxL2MenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxL2MenuEquipmentLog.Location = new System.Drawing.Point(51, 330); - this.checkBoxL2MenuEquipmentLog.Name = "checkBoxL2MenuEquipmentLog"; - this.checkBoxL2MenuEquipmentLog.OverlapOptimize = true; - this.checkBoxL2MenuEquipmentLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MenuEquipmentLog.TabIndex = 110; - this.checkBoxL2MenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL2MenuHistoryLog.BackGround = this.groupBoxLevel2; + this.checkBoxL2MenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL2MenuHistoryLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL2MenuHistoryLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL2MenuHistoryLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL2MenuHistoryLog.CheckBoxSymbolSize = 20; + this.checkBoxL2MenuHistoryLog.Checked = false; + this.checkBoxL2MenuHistoryLog.CheckLineWidth = 3; + this.checkBoxL2MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL2MenuHistoryLog.ImageCheckBox = null; + this.checkBoxL2MenuHistoryLog.ImageUnCheckBox = null; + this.checkBoxL2MenuHistoryLog.Location = new System.Drawing.Point(51, 305); + this.checkBoxL2MenuHistoryLog.Name = "checkBoxL2MenuHistoryLog"; + this.checkBoxL2MenuHistoryLog.OverlapOptimize = true; + this.checkBoxL2MenuHistoryLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL2MenuHistoryLog.TabIndex = 110; + this.checkBoxL2MenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL2MenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL2MenuHistoryLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL2MenuHistoryLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL2MainWeightSetting + // checkBoxL2MenuInspectionLog // - this.checkBoxL2MainWeightSetting.BackGround = this.groupBoxLevel2; - this.checkBoxL2MainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxL2MainWeightSetting.Checked = false; - this.checkBoxL2MainWeightSetting.CheckLineWidth = 3; - this.checkBoxL2MainWeightSetting.ImageCheckBox = null; - this.checkBoxL2MainWeightSetting.ImageUnCheckBox = null; - this.checkBoxL2MainWeightSetting.Location = new System.Drawing.Point(51, 95); - this.checkBoxL2MainWeightSetting.Name = "checkBoxL2MainWeightSetting"; - this.checkBoxL2MainWeightSetting.OverlapOptimize = true; - this.checkBoxL2MainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MainWeightSetting.TabIndex = 1; - this.checkBoxL2MainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // - // checkBoxL2MenuCheckLog - // - this.checkBoxL2MenuCheckLog.BackGround = this.groupBoxLevel2; - this.checkBoxL2MenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MenuCheckLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MenuCheckLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MenuCheckLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MenuCheckLog.CheckBoxSymbolSize = 20; - this.checkBoxL2MenuCheckLog.Checked = false; - this.checkBoxL2MenuCheckLog.CheckLineWidth = 3; - this.checkBoxL2MenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL2MenuCheckLog.ImageCheckBox = null; - this.checkBoxL2MenuCheckLog.ImageUnCheckBox = null; - this.checkBoxL2MenuCheckLog.Location = new System.Drawing.Point(51, 359); - this.checkBoxL2MenuCheckLog.Name = "checkBoxL2MenuCheckLog"; - this.checkBoxL2MenuCheckLog.OverlapOptimize = true; - this.checkBoxL2MenuCheckLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MenuCheckLog.TabIndex = 111; - this.checkBoxL2MenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MenuCheckLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MenuCheckLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL2MenuInspectionLog.BackGround = this.groupBoxLevel2; + this.checkBoxL2MenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL2MenuInspectionLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL2MenuInspectionLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL2MenuInspectionLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL2MenuInspectionLog.CheckBoxSymbolSize = 20; + this.checkBoxL2MenuInspectionLog.Checked = false; + this.checkBoxL2MenuInspectionLog.CheckLineWidth = 3; + this.checkBoxL2MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL2MenuInspectionLog.ImageCheckBox = null; + this.checkBoxL2MenuInspectionLog.ImageUnCheckBox = null; + this.checkBoxL2MenuInspectionLog.Location = new System.Drawing.Point(51, 334); + this.checkBoxL2MenuInspectionLog.Name = "checkBoxL2MenuInspectionLog"; + this.checkBoxL2MenuInspectionLog.OverlapOptimize = true; + this.checkBoxL2MenuInspectionLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL2MenuInspectionLog.TabIndex = 111; + this.checkBoxL2MenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL2MenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL2MenuInspectionLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL2MenuInspectionLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL2MenuStatus // @@ -1206,7 +1131,7 @@ this.checkBoxL2MenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuStatus.ImageCheckBox = null; this.checkBoxL2MenuStatus.ImageUnCheckBox = null; - this.checkBoxL2MenuStatus.Location = new System.Drawing.Point(51, 446); + this.checkBoxL2MenuStatus.Location = new System.Drawing.Point(51, 421); this.checkBoxL2MenuStatus.Name = "checkBoxL2MenuStatus"; this.checkBoxL2MenuStatus.OverlapOptimize = true; this.checkBoxL2MenuStatus.Size = new System.Drawing.Size(23, 23); @@ -1216,28 +1141,28 @@ this.checkBoxL2MenuStatus.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL2MenuStatus.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL2MenuAlarmList + // checkBoxL2MenuAlarmLog // - this.checkBoxL2MenuAlarmList.BackGround = this.groupBoxLevel2; - this.checkBoxL2MenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL2MenuAlarmList.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL2MenuAlarmList.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL2MenuAlarmList.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL2MenuAlarmList.CheckBoxSymbolSize = 20; - this.checkBoxL2MenuAlarmList.Checked = false; - this.checkBoxL2MenuAlarmList.CheckLineWidth = 3; - this.checkBoxL2MenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL2MenuAlarmList.ImageCheckBox = null; - this.checkBoxL2MenuAlarmList.ImageUnCheckBox = null; - this.checkBoxL2MenuAlarmList.Location = new System.Drawing.Point(51, 388); - this.checkBoxL2MenuAlarmList.Name = "checkBoxL2MenuAlarmList"; - this.checkBoxL2MenuAlarmList.OverlapOptimize = true; - this.checkBoxL2MenuAlarmList.Size = new System.Drawing.Size(23, 23); - this.checkBoxL2MenuAlarmList.TabIndex = 114; - this.checkBoxL2MenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL2MenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL2MenuAlarmList.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL2MenuAlarmList.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL2MenuAlarmLog.BackGround = this.groupBoxLevel2; + this.checkBoxL2MenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL2MenuAlarmLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL2MenuAlarmLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL2MenuAlarmLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL2MenuAlarmLog.CheckBoxSymbolSize = 20; + this.checkBoxL2MenuAlarmLog.Checked = false; + this.checkBoxL2MenuAlarmLog.CheckLineWidth = 3; + this.checkBoxL2MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL2MenuAlarmLog.ImageCheckBox = null; + this.checkBoxL2MenuAlarmLog.ImageUnCheckBox = null; + this.checkBoxL2MenuAlarmLog.Location = new System.Drawing.Point(51, 363); + this.checkBoxL2MenuAlarmLog.Name = "checkBoxL2MenuAlarmLog"; + this.checkBoxL2MenuAlarmLog.OverlapOptimize = true; + this.checkBoxL2MenuAlarmLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL2MenuAlarmLog.TabIndex = 114; + this.checkBoxL2MenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL2MenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL2MenuAlarmLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL2MenuAlarmLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL2MenuInformation // @@ -1252,7 +1177,7 @@ this.checkBoxL2MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL2MenuInformation.ImageCheckBox = null; this.checkBoxL2MenuInformation.ImageUnCheckBox = null; - this.checkBoxL2MenuInformation.Location = new System.Drawing.Point(51, 417); + this.checkBoxL2MenuInformation.Location = new System.Drawing.Point(51, 392); this.checkBoxL2MenuInformation.Name = "checkBoxL2MenuInformation"; this.checkBoxL2MenuInformation.OverlapOptimize = true; this.checkBoxL2MenuInformation.Size = new System.Drawing.Size(23, 23); @@ -1275,11 +1200,10 @@ this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuIOTest); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainSubMenu); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainClear); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuEquipmentLog); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainWeightSetting); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuCheckLog); + this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuHistoryLog); + this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuInspectionLog); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuStatus); - this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuAlarmList); + this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuAlarmLog); this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuInformation); this.groupBoxLevel1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxLevel1.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -1319,7 +1243,7 @@ this.checkBoxL1MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuUserGroupEditor.ImageCheckBox = null; this.checkBoxL1MenuUserGroupEditor.ImageUnCheckBox = null; - this.checkBoxL1MenuUserGroupEditor.Location = new System.Drawing.Point(50, 272); + this.checkBoxL1MenuUserGroupEditor.Location = new System.Drawing.Point(50, 243); this.checkBoxL1MenuUserGroupEditor.Name = "checkBoxL1MenuUserGroupEditor"; this.checkBoxL1MenuUserGroupEditor.OverlapOptimize = true; this.checkBoxL1MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23); @@ -1364,7 +1288,7 @@ this.checkBoxL1MenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuUserSetting.ImageCheckBox = null; this.checkBoxL1MenuUserSetting.ImageUnCheckBox = null; - this.checkBoxL1MenuUserSetting.Location = new System.Drawing.Point(50, 243); + this.checkBoxL1MenuUserSetting.Location = new System.Drawing.Point(50, 214); this.checkBoxL1MenuUserSetting.Name = "checkBoxL1MenuUserSetting"; this.checkBoxL1MenuUserSetting.OverlapOptimize = true; this.checkBoxL1MenuUserSetting.Size = new System.Drawing.Size(23, 23); @@ -1387,7 +1311,7 @@ this.checkBoxL1MenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuProduct.ImageCheckBox = null; this.checkBoxL1MenuProduct.ImageUnCheckBox = null; - this.checkBoxL1MenuProduct.Location = new System.Drawing.Point(50, 214); + this.checkBoxL1MenuProduct.Location = new System.Drawing.Point(50, 185); this.checkBoxL1MenuProduct.Name = "checkBoxL1MenuProduct"; this.checkBoxL1MenuProduct.OverlapOptimize = true; this.checkBoxL1MenuProduct.Size = new System.Drawing.Size(23, 23); @@ -1410,7 +1334,7 @@ this.checkBoxL1MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuIOTest.ImageCheckBox = null; this.checkBoxL1MenuIOTest.ImageUnCheckBox = null; - this.checkBoxL1MenuIOTest.Location = new System.Drawing.Point(50, 301); + this.checkBoxL1MenuIOTest.Location = new System.Drawing.Point(50, 272); this.checkBoxL1MenuIOTest.Name = "checkBoxL1MenuIOTest"; this.checkBoxL1MenuIOTest.OverlapOptimize = true; this.checkBoxL1MenuIOTest.Size = new System.Drawing.Size(23, 23); @@ -1432,7 +1356,7 @@ this.checkBoxL1MainSubMenu.CheckLineWidth = 3; this.checkBoxL1MainSubMenu.ImageCheckBox = null; this.checkBoxL1MainSubMenu.ImageUnCheckBox = null; - this.checkBoxL1MainSubMenu.Location = new System.Drawing.Point(50, 157); + this.checkBoxL1MainSubMenu.Location = new System.Drawing.Point(50, 128); this.checkBoxL1MainSubMenu.Name = "checkBoxL1MainSubMenu"; this.checkBoxL1MainSubMenu.OverlapOptimize = true; this.checkBoxL1MainSubMenu.Size = new System.Drawing.Size(23, 23); @@ -1454,7 +1378,7 @@ this.checkBoxL1MainClear.CheckLineWidth = 3; this.checkBoxL1MainClear.ImageCheckBox = null; this.checkBoxL1MainClear.ImageUnCheckBox = null; - this.checkBoxL1MainClear.Location = new System.Drawing.Point(50, 128); + this.checkBoxL1MainClear.Location = new System.Drawing.Point(50, 99); this.checkBoxL1MainClear.Name = "checkBoxL1MainClear"; this.checkBoxL1MainClear.OverlapOptimize = true; this.checkBoxL1MainClear.Size = new System.Drawing.Size(23, 23); @@ -1464,73 +1388,51 @@ this.checkBoxL1MainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL1MainClear.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL1MenuEquipmentLog + // checkBoxL1MenuHistoryLog // - this.checkBoxL1MenuEquipmentLog.BackGround = this.groupBoxLevel1; - this.checkBoxL1MenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MenuEquipmentLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MenuEquipmentLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MenuEquipmentLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MenuEquipmentLog.CheckBoxSymbolSize = 20; - this.checkBoxL1MenuEquipmentLog.Checked = false; - this.checkBoxL1MenuEquipmentLog.CheckLineWidth = 3; - this.checkBoxL1MenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL1MenuEquipmentLog.ImageCheckBox = null; - this.checkBoxL1MenuEquipmentLog.ImageUnCheckBox = null; - this.checkBoxL1MenuEquipmentLog.Location = new System.Drawing.Point(50, 330); - this.checkBoxL1MenuEquipmentLog.Name = "checkBoxL1MenuEquipmentLog"; - this.checkBoxL1MenuEquipmentLog.OverlapOptimize = true; - this.checkBoxL1MenuEquipmentLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MenuEquipmentLog.TabIndex = 110; - this.checkBoxL1MenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MenuEquipmentLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MenuEquipmentLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL1MenuHistoryLog.BackGround = this.groupBoxLevel1; + this.checkBoxL1MenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL1MenuHistoryLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL1MenuHistoryLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL1MenuHistoryLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL1MenuHistoryLog.CheckBoxSymbolSize = 20; + this.checkBoxL1MenuHistoryLog.Checked = false; + this.checkBoxL1MenuHistoryLog.CheckLineWidth = 3; + this.checkBoxL1MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL1MenuHistoryLog.ImageCheckBox = null; + this.checkBoxL1MenuHistoryLog.ImageUnCheckBox = null; + this.checkBoxL1MenuHistoryLog.Location = new System.Drawing.Point(50, 301); + this.checkBoxL1MenuHistoryLog.Name = "checkBoxL1MenuHistoryLog"; + this.checkBoxL1MenuHistoryLog.OverlapOptimize = true; + this.checkBoxL1MenuHistoryLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL1MenuHistoryLog.TabIndex = 110; + this.checkBoxL1MenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL1MenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL1MenuHistoryLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL1MenuHistoryLog.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL1MainWeightSetting + // checkBoxL1MenuInspectionLog // - this.checkBoxL1MainWeightSetting.BackGround = this.groupBoxLevel1; - this.checkBoxL1MainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MainWeightSetting.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MainWeightSetting.CheckBoxSymbolSize = 20; - this.checkBoxL1MainWeightSetting.Checked = false; - this.checkBoxL1MainWeightSetting.CheckLineWidth = 3; - this.checkBoxL1MainWeightSetting.ImageCheckBox = null; - this.checkBoxL1MainWeightSetting.ImageUnCheckBox = null; - this.checkBoxL1MainWeightSetting.Location = new System.Drawing.Point(50, 99); - this.checkBoxL1MainWeightSetting.Name = "checkBoxL1MainWeightSetting"; - this.checkBoxL1MainWeightSetting.OverlapOptimize = true; - this.checkBoxL1MainWeightSetting.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MainWeightSetting.TabIndex = 1; - this.checkBoxL1MainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MainWeightSetting.Click += new System.EventHandler(this.checkBox_Click); - // - // checkBoxL1MenuCheckLog - // - this.checkBoxL1MenuCheckLog.BackGround = this.groupBoxLevel1; - this.checkBoxL1MenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MenuCheckLog.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MenuCheckLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MenuCheckLog.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MenuCheckLog.CheckBoxSymbolSize = 20; - this.checkBoxL1MenuCheckLog.Checked = false; - this.checkBoxL1MenuCheckLog.CheckLineWidth = 3; - this.checkBoxL1MenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL1MenuCheckLog.ImageCheckBox = null; - this.checkBoxL1MenuCheckLog.ImageUnCheckBox = null; - this.checkBoxL1MenuCheckLog.Location = new System.Drawing.Point(50, 359); - this.checkBoxL1MenuCheckLog.Name = "checkBoxL1MenuCheckLog"; - this.checkBoxL1MenuCheckLog.OverlapOptimize = true; - this.checkBoxL1MenuCheckLog.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MenuCheckLog.TabIndex = 111; - this.checkBoxL1MenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MenuCheckLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MenuCheckLog.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL1MenuInspectionLog.BackGround = this.groupBoxLevel1; + this.checkBoxL1MenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL1MenuInspectionLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL1MenuInspectionLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL1MenuInspectionLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL1MenuInspectionLog.CheckBoxSymbolSize = 20; + this.checkBoxL1MenuInspectionLog.Checked = false; + this.checkBoxL1MenuInspectionLog.CheckLineWidth = 3; + this.checkBoxL1MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL1MenuInspectionLog.ImageCheckBox = null; + this.checkBoxL1MenuInspectionLog.ImageUnCheckBox = null; + this.checkBoxL1MenuInspectionLog.Location = new System.Drawing.Point(50, 330); + this.checkBoxL1MenuInspectionLog.Name = "checkBoxL1MenuInspectionLog"; + this.checkBoxL1MenuInspectionLog.OverlapOptimize = true; + this.checkBoxL1MenuInspectionLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL1MenuInspectionLog.TabIndex = 111; + this.checkBoxL1MenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL1MenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL1MenuInspectionLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL1MenuInspectionLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL1MenuStatus // @@ -1545,7 +1447,7 @@ this.checkBoxL1MenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuStatus.ImageCheckBox = null; this.checkBoxL1MenuStatus.ImageUnCheckBox = null; - this.checkBoxL1MenuStatus.Location = new System.Drawing.Point(50, 446); + this.checkBoxL1MenuStatus.Location = new System.Drawing.Point(50, 417); this.checkBoxL1MenuStatus.Name = "checkBoxL1MenuStatus"; this.checkBoxL1MenuStatus.OverlapOptimize = true; this.checkBoxL1MenuStatus.Size = new System.Drawing.Size(23, 23); @@ -1555,28 +1457,28 @@ this.checkBoxL1MenuStatus.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; this.checkBoxL1MenuStatus.Click += new System.EventHandler(this.checkBox_Click); // - // checkBoxL1MenuAlarmList + // checkBoxL1MenuAlarmLog // - this.checkBoxL1MenuAlarmList.BackGround = this.groupBoxLevel1; - this.checkBoxL1MenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxL1MenuAlarmList.CheckBoxBackColor = System.Drawing.Color.White; - this.checkBoxL1MenuAlarmList.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxL1MenuAlarmList.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxL1MenuAlarmList.CheckBoxSymbolSize = 20; - this.checkBoxL1MenuAlarmList.Checked = false; - this.checkBoxL1MenuAlarmList.CheckLineWidth = 3; - this.checkBoxL1MenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxL1MenuAlarmList.ImageCheckBox = null; - this.checkBoxL1MenuAlarmList.ImageUnCheckBox = null; - this.checkBoxL1MenuAlarmList.Location = new System.Drawing.Point(50, 388); - this.checkBoxL1MenuAlarmList.Name = "checkBoxL1MenuAlarmList"; - this.checkBoxL1MenuAlarmList.OverlapOptimize = true; - this.checkBoxL1MenuAlarmList.Size = new System.Drawing.Size(23, 23); - this.checkBoxL1MenuAlarmList.TabIndex = 114; - this.checkBoxL1MenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.checkBoxL1MenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.checkBoxL1MenuAlarmList.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - this.checkBoxL1MenuAlarmList.Click += new System.EventHandler(this.checkBox_Click); + this.checkBoxL1MenuAlarmLog.BackGround = this.groupBoxLevel1; + this.checkBoxL1MenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.checkBoxL1MenuAlarmLog.CheckBoxBackColor = System.Drawing.Color.White; + this.checkBoxL1MenuAlarmLog.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; + this.checkBoxL1MenuAlarmLog.CheckBoxOutlineColor = System.Drawing.Color.Black; + this.checkBoxL1MenuAlarmLog.CheckBoxSymbolSize = 20; + this.checkBoxL1MenuAlarmLog.Checked = false; + this.checkBoxL1MenuAlarmLog.CheckLineWidth = 3; + this.checkBoxL1MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.checkBoxL1MenuAlarmLog.ImageCheckBox = null; + this.checkBoxL1MenuAlarmLog.ImageUnCheckBox = null; + this.checkBoxL1MenuAlarmLog.Location = new System.Drawing.Point(50, 359); + this.checkBoxL1MenuAlarmLog.Name = "checkBoxL1MenuAlarmLog"; + this.checkBoxL1MenuAlarmLog.OverlapOptimize = true; + this.checkBoxL1MenuAlarmLog.Size = new System.Drawing.Size(23, 23); + this.checkBoxL1MenuAlarmLog.TabIndex = 114; + this.checkBoxL1MenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.checkBoxL1MenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.checkBoxL1MenuAlarmLog.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxL1MenuAlarmLog.Click += new System.EventHandler(this.checkBox_Click); // // checkBoxL1MenuInformation // @@ -1591,7 +1493,7 @@ this.checkBoxL1MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxL1MenuInformation.ImageCheckBox = null; this.checkBoxL1MenuInformation.ImageUnCheckBox = null; - this.checkBoxL1MenuInformation.Location = new System.Drawing.Point(50, 417); + this.checkBoxL1MenuInformation.Location = new System.Drawing.Point(50, 388); this.checkBoxL1MenuInformation.Name = "checkBoxL1MenuInformation"; this.checkBoxL1MenuInformation.OverlapOptimize = true; this.checkBoxL1MenuInformation.Size = new System.Drawing.Size(23, 23); @@ -1609,7 +1511,7 @@ this.labelTitleMenuStatus.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuStatus.LineSpacing = 0F; - this.labelTitleMenuStatus.Location = new System.Drawing.Point(158, 544); + this.labelTitleMenuStatus.Location = new System.Drawing.Point(158, 515); this.labelTitleMenuStatus.Name = "labelTitleMenuStatus"; this.labelTitleMenuStatus.OverlapOptimize = true; this.labelTitleMenuStatus.PasswordChar = '\0'; @@ -1632,7 +1534,7 @@ this.labelTitleMenuInformation.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuInformation.LineSpacing = 0F; - this.labelTitleMenuInformation.Location = new System.Drawing.Point(158, 515); + this.labelTitleMenuInformation.Location = new System.Drawing.Point(158, 486); this.labelTitleMenuInformation.Name = "labelTitleMenuInformation"; this.labelTitleMenuInformation.OverlapOptimize = true; this.labelTitleMenuInformation.PasswordChar = '\0'; @@ -1647,74 +1549,74 @@ this.labelTitleMenuInformation.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleMenuInformation.Wordwrap = false; // - // labelTitleMenuAlarmList + // labelTitleMenuAlarmLog // - this.labelTitleMenuAlarmList.BackGround = null; - this.labelTitleMenuAlarmList.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMenuAlarmList.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuAlarmList.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMenuAlarmList.LineSpacing = 0F; - this.labelTitleMenuAlarmList.Location = new System.Drawing.Point(158, 486); - this.labelTitleMenuAlarmList.Name = "labelTitleMenuAlarmList"; - this.labelTitleMenuAlarmList.OverlapOptimize = true; - this.labelTitleMenuAlarmList.PasswordChar = '\0'; - this.labelTitleMenuAlarmList.Radius = 3; - this.labelTitleMenuAlarmList.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMenuAlarmList.Size = new System.Drawing.Size(132, 23); - this.labelTitleMenuAlarmList.TabIndex = 134; - this.labelTitleMenuAlarmList.Text = "Alarm list"; - this.labelTitleMenuAlarmList.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuAlarmList.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMenuAlarmList.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMenuAlarmList.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMenuAlarmList.Wordwrap = false; + this.labelTitleMenuAlarmLog.BackGround = null; + this.labelTitleMenuAlarmLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.labelTitleMenuAlarmLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuAlarmLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleMenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleMenuAlarmLog.LineSpacing = 0F; + this.labelTitleMenuAlarmLog.Location = new System.Drawing.Point(158, 457); + this.labelTitleMenuAlarmLog.Name = "labelTitleMenuAlarmLog"; + this.labelTitleMenuAlarmLog.OverlapOptimize = true; + this.labelTitleMenuAlarmLog.PasswordChar = '\0'; + this.labelTitleMenuAlarmLog.Radius = 3; + this.labelTitleMenuAlarmLog.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelTitleMenuAlarmLog.Size = new System.Drawing.Size(132, 23); + this.labelTitleMenuAlarmLog.TabIndex = 134; + this.labelTitleMenuAlarmLog.Text = "Alarm log"; + this.labelTitleMenuAlarmLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuAlarmLog.TextColorDisable = System.Drawing.Color.Gray; + this.labelTitleMenuAlarmLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleMenuAlarmLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMenuAlarmLog.Wordwrap = false; // - // labelTitleMenuCheckLog + // labelTitleMenuInspectionLog // - this.labelTitleMenuCheckLog.BackGround = null; - this.labelTitleMenuCheckLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMenuCheckLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuCheckLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMenuCheckLog.LineSpacing = 0F; - this.labelTitleMenuCheckLog.Location = new System.Drawing.Point(158, 457); - this.labelTitleMenuCheckLog.Name = "labelTitleMenuCheckLog"; - this.labelTitleMenuCheckLog.OverlapOptimize = true; - this.labelTitleMenuCheckLog.PasswordChar = '\0'; - this.labelTitleMenuCheckLog.Radius = 3; - this.labelTitleMenuCheckLog.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMenuCheckLog.Size = new System.Drawing.Size(132, 23); - this.labelTitleMenuCheckLog.TabIndex = 133; - this.labelTitleMenuCheckLog.Text = "Inspection log"; - this.labelTitleMenuCheckLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuCheckLog.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMenuCheckLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMenuCheckLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMenuCheckLog.Wordwrap = false; + this.labelTitleMenuInspectionLog.BackGround = null; + this.labelTitleMenuInspectionLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.labelTitleMenuInspectionLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuInspectionLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleMenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleMenuInspectionLog.LineSpacing = 0F; + this.labelTitleMenuInspectionLog.Location = new System.Drawing.Point(158, 428); + this.labelTitleMenuInspectionLog.Name = "labelTitleMenuInspectionLog"; + this.labelTitleMenuInspectionLog.OverlapOptimize = true; + this.labelTitleMenuInspectionLog.PasswordChar = '\0'; + this.labelTitleMenuInspectionLog.Radius = 3; + this.labelTitleMenuInspectionLog.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelTitleMenuInspectionLog.Size = new System.Drawing.Size(132, 23); + this.labelTitleMenuInspectionLog.TabIndex = 133; + this.labelTitleMenuInspectionLog.Text = "Inspection log"; + this.labelTitleMenuInspectionLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuInspectionLog.TextColorDisable = System.Drawing.Color.Gray; + this.labelTitleMenuInspectionLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleMenuInspectionLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMenuInspectionLog.Wordwrap = false; // - // labelTitleMenuEquipmentLog + // labelTitleMenuHistoryLog // - this.labelTitleMenuEquipmentLog.BackGround = null; - this.labelTitleMenuEquipmentLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMenuEquipmentLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuEquipmentLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMenuEquipmentLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMenuEquipmentLog.LineSpacing = 0F; - this.labelTitleMenuEquipmentLog.Location = new System.Drawing.Point(158, 428); - this.labelTitleMenuEquipmentLog.Name = "labelTitleMenuEquipmentLog"; - this.labelTitleMenuEquipmentLog.OverlapOptimize = true; - this.labelTitleMenuEquipmentLog.PasswordChar = '\0'; - this.labelTitleMenuEquipmentLog.Radius = 3; - this.labelTitleMenuEquipmentLog.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMenuEquipmentLog.Size = new System.Drawing.Size(132, 23); - this.labelTitleMenuEquipmentLog.TabIndex = 132; - this.labelTitleMenuEquipmentLog.Text = "Equipment log"; - this.labelTitleMenuEquipmentLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMenuEquipmentLog.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMenuEquipmentLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMenuEquipmentLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMenuEquipmentLog.Wordwrap = false; + this.labelTitleMenuHistoryLog.BackGround = null; + this.labelTitleMenuHistoryLog.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.labelTitleMenuHistoryLog.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuHistoryLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleMenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleMenuHistoryLog.LineSpacing = 0F; + this.labelTitleMenuHistoryLog.Location = new System.Drawing.Point(158, 399); + this.labelTitleMenuHistoryLog.Name = "labelTitleMenuHistoryLog"; + this.labelTitleMenuHistoryLog.OverlapOptimize = true; + this.labelTitleMenuHistoryLog.PasswordChar = '\0'; + this.labelTitleMenuHistoryLog.Radius = 3; + this.labelTitleMenuHistoryLog.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelTitleMenuHistoryLog.Size = new System.Drawing.Size(132, 23); + this.labelTitleMenuHistoryLog.TabIndex = 132; + this.labelTitleMenuHistoryLog.Text = "History log"; + this.labelTitleMenuHistoryLog.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleMenuHistoryLog.TextColorDisable = System.Drawing.Color.Gray; + this.labelTitleMenuHistoryLog.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelTitleMenuHistoryLog.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMenuHistoryLog.Wordwrap = false; // // labelTitleMenuIOTest // @@ -1724,7 +1626,7 @@ this.labelTitleMenuIOTest.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuIOTest.LineSpacing = 0F; - this.labelTitleMenuIOTest.Location = new System.Drawing.Point(158, 399); + this.labelTitleMenuIOTest.Location = new System.Drawing.Point(158, 370); this.labelTitleMenuIOTest.Name = "labelTitleMenuIOTest"; this.labelTitleMenuIOTest.OverlapOptimize = true; this.labelTitleMenuIOTest.PasswordChar = '\0'; @@ -1747,7 +1649,7 @@ this.labelTitleMenuUserSetting.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuUserSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuUserSetting.LineSpacing = 0F; - this.labelTitleMenuUserSetting.Location = new System.Drawing.Point(158, 341); + this.labelTitleMenuUserSetting.Location = new System.Drawing.Point(158, 312); this.labelTitleMenuUserSetting.Name = "labelTitleMenuUserSetting"; this.labelTitleMenuUserSetting.OverlapOptimize = true; this.labelTitleMenuUserSetting.PasswordChar = '\0'; @@ -1770,7 +1672,7 @@ this.labelTitleMenuProduct.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenuProduct.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMenuProduct.LineSpacing = 0F; - this.labelTitleMenuProduct.Location = new System.Drawing.Point(158, 312); + this.labelTitleMenuProduct.Location = new System.Drawing.Point(158, 283); this.labelTitleMenuProduct.Name = "labelTitleMenuProduct"; this.labelTitleMenuProduct.OverlapOptimize = true; this.labelTitleMenuProduct.PasswordChar = '\0'; @@ -1793,7 +1695,7 @@ this.labelTitleMainSubMenu.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMainSubMenu.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMainSubMenu.LineSpacing = 0F; - this.labelTitleMainSubMenu.Location = new System.Drawing.Point(158, 255); + this.labelTitleMainSubMenu.Location = new System.Drawing.Point(158, 226); this.labelTitleMainSubMenu.Name = "labelTitleMainSubMenu"; this.labelTitleMainSubMenu.OverlapOptimize = true; this.labelTitleMainSubMenu.PasswordChar = '\0'; @@ -1816,7 +1718,7 @@ this.labelTitleMainClear.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMainClear.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.labelTitleMainClear.LineSpacing = 0F; - this.labelTitleMainClear.Location = new System.Drawing.Point(158, 226); + this.labelTitleMainClear.Location = new System.Drawing.Point(158, 197); this.labelTitleMainClear.Name = "labelTitleMainClear"; this.labelTitleMainClear.OverlapOptimize = true; this.labelTitleMainClear.PasswordChar = '\0'; @@ -1831,29 +1733,6 @@ this.labelTitleMainClear.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleMainClear.Wordwrap = false; // - // labelTitleMainWeightSetting - // - this.labelTitleMainWeightSetting.BackGround = null; - this.labelTitleMainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.labelTitleMainWeightSetting.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMainWeightSetting.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleMainWeightSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleMainWeightSetting.LineSpacing = 0F; - this.labelTitleMainWeightSetting.Location = new System.Drawing.Point(158, 197); - this.labelTitleMainWeightSetting.Name = "labelTitleMainWeightSetting"; - this.labelTitleMainWeightSetting.OverlapOptimize = true; - this.labelTitleMainWeightSetting.PasswordChar = '\0'; - this.labelTitleMainWeightSetting.Radius = 3; - this.labelTitleMainWeightSetting.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleMainWeightSetting.Size = new System.Drawing.Size(132, 23); - this.labelTitleMainWeightSetting.TabIndex = 123; - this.labelTitleMainWeightSetting.Text = "Change weight"; - this.labelTitleMainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleMainWeightSetting.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleMainWeightSetting.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelTitleMainWeightSetting.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMainWeightSetting.Wordwrap = false; - // // labelTitleMainProductChange // this.labelTitleMainProductChange.BackGround = null; @@ -1943,7 +1822,7 @@ this.labelTitleMenu.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelTitleMenu.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); this.labelTitleMenu.LineSpacing = 0F; - this.labelTitleMenu.Location = new System.Drawing.Point(158, 283); + this.labelTitleMenu.Location = new System.Drawing.Point(158, 254); this.labelTitleMenu.Name = "labelTitleMenu"; this.labelTitleMenu.OverlapOptimize = true; this.labelTitleMenu.PasswordChar = '\0'; @@ -1979,10 +1858,10 @@ private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartButton buttonSave; private SmartX.SmartCheckBox checkBoxL1MenuInformation; - private SmartX.SmartCheckBox checkBoxL1MenuAlarmList; + private SmartX.SmartCheckBox checkBoxL1MenuAlarmLog; private SmartX.SmartCheckBox checkBoxL1MenuStatus; - private SmartX.SmartCheckBox checkBoxL1MenuCheckLog; - private SmartX.SmartCheckBox checkBoxL1MenuEquipmentLog; + private SmartX.SmartCheckBox checkBoxL1MenuInspectionLog; + private SmartX.SmartCheckBox checkBoxL1MenuHistoryLog; private SmartX.SmartCheckBox checkBoxL1MenuIOTest; private SmartX.SmartLabel labelTitleMenu; private SmartX.SmartLabel labelTitleMain; @@ -1990,20 +1869,18 @@ private SmartX.SmartCheckBox checkBoxL1MenuProduct; private SmartX.SmartCheckBox checkBoxL1MainSubMenu; private SmartX.SmartCheckBox checkBoxL1MainClear; - private SmartX.SmartCheckBox checkBoxL1MainWeightSetting; private SmartX.SmartCheckBox checkBoxL1MainProductChange; private SmartX.SmartLabel labelTitleMainProductChange; private SmartX.SmartLabel labelTitleMenuStatus; private SmartX.SmartLabel labelTitleMenuInformation; - private SmartX.SmartLabel labelTitleMenuAlarmList; - private SmartX.SmartLabel labelTitleMenuCheckLog; - private SmartX.SmartLabel labelTitleMenuEquipmentLog; + private SmartX.SmartLabel labelTitleMenuAlarmLog; + private SmartX.SmartLabel labelTitleMenuInspectionLog; + private SmartX.SmartLabel labelTitleMenuHistoryLog; private SmartX.SmartLabel labelTitleMenuIOTest; private SmartX.SmartLabel labelTitleMenuUserSetting; private SmartX.SmartLabel labelTitleMenuProduct; private SmartX.SmartLabel labelTitleMainSubMenu; private SmartX.SmartLabel labelTitleMainClear; - private SmartX.SmartLabel labelTitleMainWeightSetting; private SmartX.SmartGroupBox groupBoxDefault; private SmartX.SmartCheckBox checkBoxDefaultMainProductChange; private SmartX.SmartCheckBox checkBoxDefaultMenuUserSetting; @@ -2012,7 +1889,6 @@ private SmartX.SmartCheckBox checkBoxDefaultMainSubMenu; private SmartX.SmartCheckBox checkBoxDefaultMainClear; private SmartX.SmartCheckBox checkBoxDefaultMenuEquipmentLog; - private SmartX.SmartCheckBox checkBoxDefaultMainWeightSetting; private SmartX.SmartCheckBox checkBoxDefaultMenuCheckLog; private SmartX.SmartCheckBox checkBoxDefaultMenuStatus; private SmartX.SmartCheckBox checkBoxDefaultMenuAlarmList; @@ -2024,11 +1900,10 @@ private SmartX.SmartCheckBox checkBoxL3MenuIOTest; private SmartX.SmartCheckBox checkBoxL3MainSubMenu; private SmartX.SmartCheckBox checkBoxL3MainClear; - private SmartX.SmartCheckBox checkBoxL3MenuEquipmentLog; - private SmartX.SmartCheckBox checkBoxL3MainWeightSetting; - private SmartX.SmartCheckBox checkBoxL3MenuCheckLog; + private SmartX.SmartCheckBox checkBoxL3MenuHistoryLog; + private SmartX.SmartCheckBox checkBoxL3MenuInspectionLog; private SmartX.SmartCheckBox checkBoxL3MenuStatus; - private SmartX.SmartCheckBox checkBoxL3MenuAlarmList; + private SmartX.SmartCheckBox checkBoxL3MenuAlarmLog; private SmartX.SmartCheckBox checkBoxL3MenuInformation; private SmartX.SmartGroupBox groupBoxLevel2; private SmartX.SmartCheckBox checkBoxL2MainProductChange; @@ -2037,11 +1912,10 @@ private SmartX.SmartCheckBox checkBoxL2MenuIOTest; private SmartX.SmartCheckBox checkBoxL2MainSubMenu; private SmartX.SmartCheckBox checkBoxL2MainClear; - private SmartX.SmartCheckBox checkBoxL2MenuEquipmentLog; - private SmartX.SmartCheckBox checkBoxL2MainWeightSetting; - private SmartX.SmartCheckBox checkBoxL2MenuCheckLog; + private SmartX.SmartCheckBox checkBoxL2MenuHistoryLog; + private SmartX.SmartCheckBox checkBoxL2MenuInspectionLog; private SmartX.SmartCheckBox checkBoxL2MenuStatus; - private SmartX.SmartCheckBox checkBoxL2MenuAlarmList; + private SmartX.SmartCheckBox checkBoxL2MenuAlarmLog; private SmartX.SmartCheckBox checkBoxL2MenuInformation; private SmartX.SmartGroupBox groupBoxLevel1; private SmartX.SmartCheckBox checkBoxDefaultMenuUserGroupEditor; diff --git a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs index 3c7fb8f..52a1f14 100644 --- a/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs +++ b/INT_PT002/Controls/User/ControlMenuUserGroupEditor.cs @@ -73,7 +73,6 @@ namespace INT_PT002.Controls #region Level1 this.checkBoxL1MainProductChange.Checked = group.Level1.IsMainDisplayProductChange; - this.checkBoxL1MainWeightSetting.Checked = group.Level1.IsMainDisplayWeightSetting; this.checkBoxL1MainClear.Checked = group.Level1.IsMainDisplayClear; this.checkBoxL1MainSubMenu.Checked = group.Level1.IsMainDisplaySubMenu; @@ -81,16 +80,15 @@ namespace INT_PT002.Controls this.checkBoxL1MenuUserSetting.Checked = group.Level1.IsMenuUserSetting; this.checkBoxL1MenuUserGroupEditor.Checked = group.Level1.IsMenuUserGroupEditor; this.checkBoxL1MenuIOTest.Checked = group.Level1.IsMenuIOTest; - this.checkBoxL1MenuEquipmentLog.Checked = group.Level1.IsMenuEquipmentLog; - this.checkBoxL1MenuCheckLog.Checked = group.Level1.IsMenuCheckLog; - this.checkBoxL1MenuAlarmList.Checked = group.Level1.IsMenuAlarmList; + this.checkBoxL1MenuHistoryLog.Checked = group.Level1.IsMenuHistoryLog; + this.checkBoxL1MenuInspectionLog.Checked = group.Level1.IsMenuInspectionLog; + this.checkBoxL1MenuAlarmLog.Checked = group.Level1.IsMenuAlarmLog; this.checkBoxL1MenuInformation.Checked = group.Level1.IsMenuInformation; this.checkBoxL1MenuStatus.Checked = group.Level1.IsMenuStatus; #endregion #region Level2 this.checkBoxL2MainProductChange.Checked = group.Level2.IsMainDisplayProductChange; - this.checkBoxL2MainWeightSetting.Checked = group.Level2.IsMainDisplayWeightSetting; this.checkBoxL2MainClear.Checked = group.Level2.IsMainDisplayClear; this.checkBoxL2MainSubMenu.Checked = group.Level2.IsMainDisplaySubMenu; @@ -98,16 +96,15 @@ namespace INT_PT002.Controls this.checkBoxL2MenuUserSetting.Checked = group.Level2.IsMenuUserSetting; this.checkBoxL2MenuUserGroupEditor.Checked = group.Level2.IsMenuUserGroupEditor; this.checkBoxL2MenuIOTest.Checked = group.Level2.IsMenuIOTest; - this.checkBoxL2MenuEquipmentLog.Checked = group.Level2.IsMenuEquipmentLog; - this.checkBoxL2MenuCheckLog.Checked = group.Level2.IsMenuCheckLog; - this.checkBoxL2MenuAlarmList.Checked = group.Level2.IsMenuAlarmList; + this.checkBoxL2MenuHistoryLog.Checked = group.Level2.IsMenuHistoryLog; + this.checkBoxL2MenuInspectionLog.Checked = group.Level2.IsMenuInspectionLog; + this.checkBoxL2MenuAlarmLog.Checked = group.Level2.IsMenuAlarmLog; this.checkBoxL2MenuInformation.Checked = group.Level2.IsMenuInformation; this.checkBoxL2MenuStatus.Checked = group.Level2.IsMenuStatus; #endregion #region Level3 this.checkBoxL3MainProductChange.Checked = group.Level3.IsMainDisplayProductChange; - this.checkBoxL3MainWeightSetting.Checked = group.Level3.IsMainDisplayWeightSetting; this.checkBoxL3MainClear.Checked = group.Level3.IsMainDisplayClear; this.checkBoxL3MainSubMenu.Checked = group.Level3.IsMainDisplaySubMenu; @@ -115,16 +112,15 @@ namespace INT_PT002.Controls this.checkBoxL3MenuUserSetting.Checked = group.Level3.IsMenuUserSetting; this.checkBoxL3MenuUserGroupEditor.Checked = group.Level3.IsMenuUserGroupEditor; this.checkBoxL3MenuIOTest.Checked = group.Level3.IsMenuIOTest; - this.checkBoxL3MenuEquipmentLog.Checked = group.Level3.IsMenuEquipmentLog; - this.checkBoxL3MenuCheckLog.Checked = group.Level3.IsMenuCheckLog; - this.checkBoxL3MenuAlarmList.Checked = group.Level3.IsMenuAlarmList; + this.checkBoxL3MenuHistoryLog.Checked = group.Level3.IsMenuHistoryLog; + this.checkBoxL3MenuInspectionLog.Checked = group.Level3.IsMenuInspectionLog; + this.checkBoxL3MenuAlarmLog.Checked = group.Level3.IsMenuAlarmLog; this.checkBoxL3MenuInformation.Checked = group.Level3.IsMenuInformation; this.checkBoxL3MenuStatus.Checked = group.Level3.IsMenuStatus; #endregion #region Default this.checkBoxDefaultMainProductChange.Checked = group.Default.IsMainDisplayProductChange; - this.checkBoxDefaultMainWeightSetting.Checked = group.Default.IsMainDisplayWeightSetting; this.checkBoxDefaultMainClear.Checked = group.Default.IsMainDisplayClear; this.checkBoxDefaultMainSubMenu.Checked = group.Default.IsMainDisplaySubMenu; @@ -132,9 +128,9 @@ namespace INT_PT002.Controls this.checkBoxDefaultMenuUserSetting.Checked = group.Default.IsMenuUserSetting; this.checkBoxDefaultMenuUserGroupEditor.Checked = group.Default.IsMenuUserGroupEditor; this.checkBoxDefaultMenuIOTest.Checked = group.Default.IsMenuIOTest; - this.checkBoxDefaultMenuEquipmentLog.Checked = group.Default.IsMenuEquipmentLog; - this.checkBoxDefaultMenuCheckLog.Checked = group.Default.IsMenuCheckLog; - this.checkBoxDefaultMenuAlarmList.Checked = group.Default.IsMenuAlarmList; + this.checkBoxDefaultMenuEquipmentLog.Checked = group.Default.IsMenuHistoryLog; + this.checkBoxDefaultMenuCheckLog.Checked = group.Default.IsMenuInspectionLog; + this.checkBoxDefaultMenuAlarmList.Checked = group.Default.IsMenuAlarmLog; this.checkBoxDefaultMenuInformation.Checked = group.Default.IsMenuInformation; this.checkBoxDefaultMenuStatus.Checked = group.Default.IsMenuStatus; #endregion @@ -299,7 +295,6 @@ namespace INT_PT002.Controls { #region Level1 this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductChange = this.checkBoxL1MainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayWeightSetting = this.checkBoxL1MainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayClear = this.checkBoxL1MainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplaySubMenu = this.checkBoxL1MainSubMenu.Checked; @@ -307,16 +302,15 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserSetting = this.checkBoxL1MenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserGroupEditor = this.checkBoxL1MenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest = this.checkBoxL1MenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuEquipmentLog = this.checkBoxL1MenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuCheckLog = this.checkBoxL1MenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmList = this.checkBoxL1MenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuHistoryLog = this.checkBoxL1MenuHistoryLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInspectionLog = this.checkBoxL1MenuInspectionLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmLog = this.checkBoxL1MenuAlarmLog.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInformation = this.checkBoxL1MenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuStatus = this.checkBoxL1MenuStatus.Checked; #endregion #region Level2 this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayProductChange = this.checkBoxL2MainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayWeightSetting = this.checkBoxL2MainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayClear = this.checkBoxL2MainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplaySubMenu = this.checkBoxL2MainSubMenu.Checked; @@ -324,16 +318,15 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserSetting = this.checkBoxL2MenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserGroupEditor = this.checkBoxL2MenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest = this.checkBoxL2MenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuEquipmentLog = this.checkBoxL2MenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuCheckLog = this.checkBoxL2MenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmList = this.checkBoxL2MenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuHistoryLog = this.checkBoxL2MenuHistoryLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInspectionLog = this.checkBoxL2MenuInspectionLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmLog = this.checkBoxL2MenuAlarmLog.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInformation = this.checkBoxL2MenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuStatus = this.checkBoxL2MenuStatus.Checked; #endregion #region Level3 this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayProductChange = this.checkBoxL3MainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting = this.checkBoxL3MainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayClear = this.checkBoxL3MainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplaySubMenu = this.checkBoxL3MainSubMenu.Checked; @@ -341,16 +334,15 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserSetting = this.checkBoxL3MenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserGroupEditor = this.checkBoxL3MenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest = this.checkBoxL3MenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuEquipmentLog = this.checkBoxL3MenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuCheckLog = this.checkBoxL3MenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmList = this.checkBoxL3MenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuHistoryLog = this.checkBoxL3MenuHistoryLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInspectionLog = this.checkBoxL3MenuInspectionLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog = this.checkBoxL3MenuAlarmLog.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInformation = this.checkBoxL3MenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuStatus = this.checkBoxL3MenuStatus.Checked; #endregion #region Default this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplayProductChange = this.checkBoxDefaultMainProductChange.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplayWeightSetting = this.checkBoxDefaultMainWeightSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplayClear = this.checkBoxDefaultMainClear.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMainDisplaySubMenu = this.checkBoxDefaultMainSubMenu.Checked; @@ -358,9 +350,9 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuUserSetting = this.checkBoxDefaultMenuUserSetting.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuUserGroupEditor = this.checkBoxDefaultMenuUserGroupEditor.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuIOTest = this.checkBoxDefaultMenuIOTest.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuEquipmentLog = this.checkBoxDefaultMenuEquipmentLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuCheckLog = this.checkBoxDefaultMenuCheckLog.Checked; - this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuAlarmList = this.checkBoxDefaultMenuAlarmList.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuHistoryLog = this.checkBoxDefaultMenuEquipmentLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuInspectionLog = this.checkBoxDefaultMenuCheckLog.Checked; + this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuAlarmLog = this.checkBoxDefaultMenuAlarmList.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuInformation = this.checkBoxDefaultMenuInformation.Checked; this.ParentForm.ParentForm.CurrentUserGroup.Default.IsMenuStatus = this.checkBoxDefaultMenuStatus.Checked; #endregion diff --git a/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs b/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs index 4708948..7ca4bea 100644 --- a/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs +++ b/INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs @@ -57,7 +57,6 @@ this.checkBoxMenuProduct = new SmartX.SmartCheckBox(); this.checkBoxMainSubMenu = new SmartX.SmartCheckBox(); this.checkBoxMainClear = new SmartX.SmartCheckBox(); - this.checkBoxMainWeightSetting = new SmartX.SmartCheckBox(); this.checkBoxMainProductChange = new SmartX.SmartCheckBox(); this.labelExpiryDateOfPassword2 = new SmartX.SmartLabel(); this.labelExpiryDateOfAccount2 = new SmartX.SmartLabel(); @@ -589,7 +588,6 @@ this.groupBoxAccessRight.Controls.Add(this.checkBoxMenuProduct); this.groupBoxAccessRight.Controls.Add(this.checkBoxMainSubMenu); this.groupBoxAccessRight.Controls.Add(this.checkBoxMainClear); - this.groupBoxAccessRight.Controls.Add(this.checkBoxMainWeightSetting); this.groupBoxAccessRight.Controls.Add(this.checkBoxMainProductChange); this.groupBoxAccessRight.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.groupBoxAccessRight.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); @@ -879,7 +877,7 @@ this.checkBoxMainSubMenu.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxMainSubMenu.ImageCheckBox = null; this.checkBoxMainSubMenu.ImageUnCheckBox = null; - this.checkBoxMainSubMenu.Location = new System.Drawing.Point(64, 148); + this.checkBoxMainSubMenu.Location = new System.Drawing.Point(64, 119); this.checkBoxMainSubMenu.Name = "checkBoxMainSubMenu"; this.checkBoxMainSubMenu.OverlapOptimize = true; this.checkBoxMainSubMenu.Size = new System.Drawing.Size(150, 23); @@ -888,6 +886,7 @@ this.checkBoxMainSubMenu.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.checkBoxMainSubMenu.TextColorDisable = System.Drawing.Color.Black; this.checkBoxMainSubMenu.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; + this.checkBoxMainSubMenu.Visible = false; // // checkBoxMainClear // @@ -903,7 +902,7 @@ this.checkBoxMainClear.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.checkBoxMainClear.ImageCheckBox = null; this.checkBoxMainClear.ImageUnCheckBox = null; - this.checkBoxMainClear.Location = new System.Drawing.Point(64, 119); + this.checkBoxMainClear.Location = new System.Drawing.Point(64, 90); this.checkBoxMainClear.Name = "checkBoxMainClear"; this.checkBoxMainClear.OverlapOptimize = true; this.checkBoxMainClear.Size = new System.Drawing.Size(150, 23); @@ -913,30 +912,6 @@ this.checkBoxMainClear.TextColorDisable = System.Drawing.Color.Black; this.checkBoxMainClear.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; // - // checkBoxMainWeightSetting - // - this.checkBoxMainWeightSetting.BackGround = this.groupBoxAccessRight; - this.checkBoxMainWeightSetting.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.checkBoxMainWeightSetting.CheckBoxBackColor = System.Drawing.Color.LightGray; - this.checkBoxMainWeightSetting.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid; - this.checkBoxMainWeightSetting.CheckBoxOutlineColor = System.Drawing.Color.Black; - this.checkBoxMainWeightSetting.CheckBoxSymbolSize = 14; - this.checkBoxMainWeightSetting.Checked = false; - this.checkBoxMainWeightSetting.CheckLineWidth = 3; - this.checkBoxMainWeightSetting.Enabled = false; - this.checkBoxMainWeightSetting.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.checkBoxMainWeightSetting.ImageCheckBox = null; - this.checkBoxMainWeightSetting.ImageUnCheckBox = null; - this.checkBoxMainWeightSetting.Location = new System.Drawing.Point(64, 90); - this.checkBoxMainWeightSetting.Name = "checkBoxMainWeightSetting"; - this.checkBoxMainWeightSetting.OverlapOptimize = true; - this.checkBoxMainWeightSetting.Size = new System.Drawing.Size(150, 23); - this.checkBoxMainWeightSetting.TabIndex = 1; - this.checkBoxMainWeightSetting.Text = "Change weight"; - this.checkBoxMainWeightSetting.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.checkBoxMainWeightSetting.TextColorDisable = System.Drawing.Color.Black; - this.checkBoxMainWeightSetting.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle; - // // checkBoxMainProductChange // this.checkBoxMainProductChange.BackGround = this.groupBoxAccessRight; @@ -1418,7 +1393,6 @@ private SmartX.SmartCheckBox checkBoxMenuProduct; private SmartX.SmartCheckBox checkBoxMainSubMenu; private SmartX.SmartCheckBox checkBoxMainClear; - private SmartX.SmartCheckBox checkBoxMainWeightSetting; private SmartX.SmartCheckBox checkBoxMainProductChange; private SmartX.SmartCheckBox checkBoxMenuInformation; private SmartX.SmartCheckBox checkBoxMenuAlarmList; diff --git a/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs b/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs index faf6259..50d9f68 100644 --- a/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs +++ b/INT_PT002/Controls/User/ControlMenuUserUserEditor.cs @@ -205,21 +205,20 @@ namespace INT_PT002.Controls menuId.fMenu = new bool[UserManager.USER_MENU_ID_MAX]; menuId.fMenu[0] = this.checkBoxMainProductChange.Checked; - menuId.fMenu[1] = this.checkBoxMainWeightSetting.Checked; - menuId.fMenu[2] = this.checkBoxMainClear.Checked; - menuId.fMenu[3] = this.checkBoxMainSubMenu.Checked; + menuId.fMenu[1] = this.checkBoxMainClear.Checked; + menuId.fMenu[2] = this.checkBoxMainSubMenu.Checked; - menuId.fMenu[4] = this.checkBoxMenuProduct.Checked; - menuId.fMenu[5] = this.checkBoxMenuUserSetting.Checked; - menuId.fMenu[6] = this.checkBoxMenuUserGroupEditor.Checked; - menuId.fMenu[7] = this.checkBoxMenuIOTest.Checked; - menuId.fMenu[8] = this.checkBoxMenuEquipmentLog.Checked; - menuId.fMenu[9] = this.checkBoxMenuCheckLog.Checked; - menuId.fMenu[10] = this.checkBoxMenuAlarmList.Checked; - menuId.fMenu[11] = this.checkBoxMenuInformation.Checked; - menuId.fMenu[12] = this.checkBoxMenuStatus.Checked; + menuId.fMenu[3] = this.checkBoxMenuProduct.Checked; + menuId.fMenu[4] = this.checkBoxMenuUserSetting.Checked; + menuId.fMenu[5] = this.checkBoxMenuUserGroupEditor.Checked; + menuId.fMenu[6] = this.checkBoxMenuIOTest.Checked; + menuId.fMenu[7] = this.checkBoxMenuEquipmentLog.Checked; + menuId.fMenu[8] = this.checkBoxMenuCheckLog.Checked; + menuId.fMenu[9] = this.checkBoxMenuAlarmList.Checked; + menuId.fMenu[10] = this.checkBoxMenuInformation.Checked; + menuId.fMenu[11] = this.checkBoxMenuStatus.Checked; - for (int i = 13; i < UserManager.USER_MENU_ID_MAX - 12; i++) + for (int i = 12; i < UserManager.USER_MENU_ID_MAX - 11; i++) menuId.fMenu[i] = false; if (this.buttonLevel1.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) @@ -268,10 +267,6 @@ namespace INT_PT002.Controls } private void CheckBoxCheckedAsLevel(Define.E_UserGroup level) { - this.buttonLevel1.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click -= new EventHandler(this.buttonLevel_Click); - switch (level) { case Define.E_UserGroup.f0_Level1: @@ -282,7 +277,6 @@ namespace INT_PT002.Controls this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL1_NAME; this.checkBoxMainProductChange.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductChange; - this.checkBoxMainWeightSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayWeightSetting; this.checkBoxMainClear.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayClear; this.checkBoxMainSubMenu.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplaySubMenu; @@ -290,9 +284,9 @@ namespace INT_PT002.Controls this.checkBoxMenuUserSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserSetting; this.checkBoxMenuUserGroupEditor.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuUserGroupEditor; this.checkBoxMenuIOTest.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest; - this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuEquipmentLog; - this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuCheckLog; - this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmList; + this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuHistoryLog; + this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInspectionLog; + this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmLog; this.checkBoxMenuInformation.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInformation; this.checkBoxMenuStatus.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuStatus; break; @@ -304,7 +298,6 @@ namespace INT_PT002.Controls this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL2_NAME; this.checkBoxMainProductChange.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayProductChange; - this.checkBoxMainWeightSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayWeightSetting; this.checkBoxMainClear.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplayClear; this.checkBoxMainSubMenu.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMainDisplaySubMenu; @@ -312,9 +305,9 @@ namespace INT_PT002.Controls this.checkBoxMenuUserSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserSetting; this.checkBoxMenuUserGroupEditor.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuUserGroupEditor; this.checkBoxMenuIOTest.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest; - this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuEquipmentLog; - this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuCheckLog; - this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmList; + this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuHistoryLog; + this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInspectionLog; + this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmLog; this.checkBoxMenuInformation.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuInformation; this.checkBoxMenuStatus.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuStatus; break; @@ -326,7 +319,6 @@ namespace INT_PT002.Controls this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL3_NAME; this.checkBoxMainProductChange.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayProductChange; - this.checkBoxMainWeightSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting; this.checkBoxMainClear.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplayClear; this.checkBoxMainSubMenu.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMainDisplaySubMenu; @@ -334,19 +326,15 @@ namespace INT_PT002.Controls this.checkBoxMenuUserSetting.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserSetting; this.checkBoxMenuUserGroupEditor.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuUserGroupEditor; this.checkBoxMenuIOTest.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest; - this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuEquipmentLog; - this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuCheckLog; - this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmList; + this.checkBoxMenuEquipmentLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuHistoryLog; + this.checkBoxMenuCheckLog.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInspectionLog; + this.checkBoxMenuAlarmList.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog; this.checkBoxMenuInformation.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuInformation; this.checkBoxMenuStatus.Checked = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuStatus; break; default: break; } - - this.buttonLevel1.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click += new EventHandler(this.buttonLevel_Click); } private void UpdateInitializeUserDisplay(SystemConfiguration system) @@ -355,8 +343,8 @@ namespace INT_PT002.Controls this.textBoxID.Text = ""; this.textBoxPassword.Text = ""; - this.labelExpiryDateOfAccount.Text = "000"; - this.labelExpiryDateOfPassword.Text = "00"; + this.labelExpiryDateOfAccount.Text = "180"; + this.labelExpiryDateOfPassword.Text = "90"; this.labelExpiryDateOfAccount2.Text = "yyyy.mm.DD"; this.labelExpiryDateOfPassword2.Text = "yyyy.mm.DD"; this.labelAutomaticLogoutTime.Text = "0"; @@ -367,7 +355,6 @@ namespace INT_PT002.Controls this.buttonLevel3.ButtonText = system.LEVEL3_NAME; this.checkBoxMainProductChange.Checked = false; - this.checkBoxMainWeightSetting.Checked = false; this.checkBoxMainClear.Checked = false; this.checkBoxMainSubMenu.Checked = false; @@ -381,18 +368,10 @@ namespace INT_PT002.Controls this.checkBoxMenuInformation.Checked = false; this.checkBoxMenuStatus.Checked = false; - this.buttonLevel1.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click -= new EventHandler(this.buttonLevel_Click); - this.buttonLevel1.ButtonUp(); this.buttonLevel2.ButtonUp(); this.buttonLevel3.ButtonUp(); - this.buttonLevel1.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel2.Click += new EventHandler(this.buttonLevel_Click); - this.buttonLevel3.Click += new EventHandler(this.buttonLevel_Click); - this.buttonDelete.Enabled = false; } public void UpdateLevelNameDisplay(SystemConfiguration system) @@ -758,7 +737,7 @@ namespace INT_PT002.Controls if (index != -1) { - if (this.ParentForm.ParentForm.SystemConfig.CURRENT_USER.ID == this.listBoxUserList.Items[index]) + if (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.ID == this.listBoxUserList.Items[index] || index == 0) this.buttonDelete.Enabled = false; else this.buttonDelete.Enabled = true; diff --git a/INT_PT002/DataStore/SystemConfiguration.cs b/INT_PT002/DataStore/SystemConfiguration.cs index f48cbe9..079a28b 100644 --- a/INT_PT002/DataStore/SystemConfiguration.cs +++ b/INT_PT002/DataStore/SystemConfiguration.cs @@ -17,7 +17,6 @@ namespace INT_PT002.DataStore private int m_RECIPE_NUMBER; private Define.E_LanguageID m_LANGUAGE; - private UserItem m_CURRENT_USER; private int m_CHART1_DRAW_STEP; private int m_CHART2_DRAW_STEP; @@ -71,11 +70,6 @@ namespace INT_PT002.DataStore get { return this.m_LANGUAGE; } set { this.m_LANGUAGE = value; } } - public UserItem CURRENT_USER - { - get { return this.m_CURRENT_USER; } - set { this.m_CURRENT_USER = value; } - } public int CHART1_DRAW_STEP { @@ -168,7 +162,6 @@ namespace INT_PT002.DataStore this.RECIPE_NUMBER = 1; this.LANGUAGE = Define.E_LanguageID.Korean; - this.CURRENT_USER = new UserItem(); this.CHART1_DRAW_STEP = 4; this.CHART2_DRAW_STEP = 2; @@ -541,7 +534,6 @@ namespace INT_PT002.DataStore { #region Field private bool m_IsMainDisplayProductChange; - private bool m_IsMainDisplayWeightSetting; private bool m_IsMainDisplayClear; private bool m_IsMainDisplaySubMenu; @@ -549,9 +541,9 @@ namespace INT_PT002.DataStore private bool m_IsMenuUserSetting; private bool m_IsMenuUserGroupEditor; private bool m_IsMenuIOTest; - private bool m_IsMenuEquipmentLog; - private bool m_IsMenuCheckLog; - private bool m_IsMenuAlarmList; + private bool m_IsMenuHistoryLog; + private bool m_IsMenuInspectionLog; + private bool m_IsMenuAlarmLog; private bool m_IsMenuInformation; private bool m_IsMenuStatus; #endregion @@ -569,11 +561,6 @@ namespace INT_PT002.DataStore get { return this.m_IsMainDisplayProductChange; } set { this.m_IsMainDisplayProductChange = value; } } - public bool IsMainDisplayWeightSetting - { - get { return this.m_IsMainDisplayWeightSetting; } - set { this.m_IsMainDisplayWeightSetting = value; } - } public bool IsMainDisplayClear { get { return this.m_IsMainDisplayClear; } @@ -606,20 +593,20 @@ namespace INT_PT002.DataStore set { this.m_IsMenuIOTest = value; } } - public bool IsMenuEquipmentLog + public bool IsMenuHistoryLog { - get { return this.m_IsMenuEquipmentLog; } - set { this.m_IsMenuEquipmentLog = value; } + get { return this.m_IsMenuHistoryLog; } + set { this.m_IsMenuHistoryLog = value; } } - public bool IsMenuCheckLog + public bool IsMenuInspectionLog { - get { return this.m_IsMenuCheckLog; } - set { this.m_IsMenuCheckLog = value; } + get { return this.m_IsMenuInspectionLog; } + set { this.m_IsMenuInspectionLog = value; } } - public bool IsMenuAlarmList + public bool IsMenuAlarmLog { - get { return this.m_IsMenuAlarmList; } - set { this.m_IsMenuAlarmList = value; } + get { return this.m_IsMenuAlarmLog; } + set { this.m_IsMenuAlarmLog = value; } } public bool IsMenuInformation { @@ -638,8 +625,8 @@ namespace INT_PT002.DataStore { bool ret = false; - if (this.IsMainDisplayProductChange == true || this.IsMainDisplayWeightSetting == true - || this.IsMainDisplayClear == true || this.IsMainDisplaySubMenu == true) + if (this.IsMainDisplayProductChange == true || this.IsMainDisplayClear == true + || this.IsMainDisplaySubMenu == true) ret = true; return ret; @@ -687,7 +674,7 @@ namespace INT_PT002.DataStore { bool ret = false; - if (this.IsMenuEquipmentLog == true || this.IsMenuCheckLog == true || this.IsMenuAlarmList == true) + if (this.IsMenuHistoryLog == true || this.IsMenuInspectionLog == true || this.IsMenuAlarmLog == true) ret = true; return ret; @@ -711,7 +698,6 @@ namespace INT_PT002.DataStore private void Initialize() { this.IsMainDisplayProductChange = false; - this.IsMainDisplayWeightSetting = false; this.IsMainDisplayClear = false; this.IsMainDisplaySubMenu = false; @@ -719,9 +705,9 @@ namespace INT_PT002.DataStore this.IsMenuUserSetting = false; this.IsMenuUserGroupEditor = false; this.IsMenuIOTest = false; - this.IsMenuEquipmentLog = false; - this.IsMenuCheckLog = false; - this.IsMenuAlarmList = false; + this.IsMenuHistoryLog = false; + this.IsMenuInspectionLog = false; + this.IsMenuAlarmLog = false; this.IsMenuInformation = false; this.IsMenuStatus = false; } @@ -733,7 +719,6 @@ namespace INT_PT002.DataStore public struct StructUserGroupItem { public bool IsMainDisplayProductChange; - public bool IsMainDisplayWeightSetting; public bool IsMainDisplayClear; public bool IsMainDispalySubMenu; @@ -764,6 +749,7 @@ namespace INT_PT002.DataStore public bool Dummy15; public bool Dummy16; public bool Dummy17; + public bool Dummy18; } #endregion diff --git a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs index 5a114b2..840210c 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs @@ -30,13 +30,13 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormLogOn)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.textBoxPassword = new System.Windows.Forms.TextBox(); + this.textBoxID = new System.Windows.Forms.TextBox(); this.smartLabel3 = new SmartX.SmartLabel(); this.smartLabel2 = new SmartX.SmartLabel(); this.buttonCancel = new SmartX.SmartButton(); this.buttonLogOn = new SmartX.SmartButton(); this.smartKeyboard = new SmartX.SmartKeyboard(); - this.textBoxID = new System.Windows.Forms.TextBox(); - this.textBoxPassword = new System.Windows.Forms.TextBox(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -65,6 +65,24 @@ this.smartGroupBox1.Text = "Login"; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // + // textBoxPassword + // + this.textBoxPassword.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); + this.textBoxPassword.Location = new System.Drawing.Point(141, 94); + this.textBoxPassword.Name = "textBoxPassword"; + this.textBoxPassword.Size = new System.Drawing.Size(261, 37); + this.textBoxPassword.TabIndex = 98; + this.textBoxPassword.GotFocus += new System.EventHandler(this.textBoxPassword_GotFocus); + // + // textBoxID + // + this.textBoxID.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); + this.textBoxID.Location = new System.Drawing.Point(141, 51); + this.textBoxID.Name = "textBoxID"; + this.textBoxID.Size = new System.Drawing.Size(261, 37); + this.textBoxID.TabIndex = 97; + this.textBoxID.GotFocus += new System.EventHandler(this.textBoxID_GotFocus); + // // smartLabel3 // this.smartLabel3.BackGround = null; @@ -121,7 +139,7 @@ this.buttonCancel.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonCancel.ButtonText = "취소"; this.buttonCancel.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonCancel.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.buttonCancel.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.buttonCancel.GroupID = 0; this.buttonCancel.ImageDisable = null; this.buttonCancel.ImageDown = null; @@ -145,6 +163,7 @@ this.buttonCancel.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonCancel.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonCancel.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // // buttonLogOn // @@ -156,7 +175,7 @@ this.buttonLogOn.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonLogOn.ButtonText = "로그인"; this.buttonLogOn.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLogOn.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.buttonLogOn.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.buttonLogOn.GroupID = 0; this.buttonLogOn.ImageDisable = null; this.buttonLogOn.ImageDown = null; @@ -180,12 +199,13 @@ this.buttonLogOn.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonLogOn.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonLogOn.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLogOn.Click += new System.EventHandler(this.buttonLogOn_Click); // // smartKeyboard // this.smartKeyboard.BackGround = this.smartGroupBox1; this.smartKeyboard.BackGroundColor = System.Drawing.Color.LightCoral; - this.smartKeyboard.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.smartKeyboard.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); this.smartKeyboard.BorderStyle = SmartX.SmartKeyboard.BorderStyles.RoundRectFill; this.smartKeyboard.ControlKeyDisable = false; this.smartKeyboard.DesignMinimize = false; @@ -213,7 +233,7 @@ this.smartKeyboard.OverlapOptimize = true; this.smartKeyboard.Radius = 5; this.smartKeyboard.RoundedCorners = true; - this.smartKeyboard.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.smartKeyboard.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); this.smartKeyboard.Size = new System.Drawing.Size(585, 232); this.smartKeyboard.SizeRunTime = new System.Drawing.Size(585, 232); this.smartKeyboard.TabIndex = 90; @@ -226,22 +246,6 @@ this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick); this.smartKeyboard.Click += new System.EventHandler(this.smartKeyboard_Click); // - // textBoxID - // - this.textBoxID.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); - this.textBoxID.Location = new System.Drawing.Point(141, 51); - this.textBoxID.Name = "textBoxID"; - this.textBoxID.Size = new System.Drawing.Size(261, 37); - this.textBoxID.TabIndex = 97; - // - // textBoxPassword - // - this.textBoxPassword.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); - this.textBoxPassword.Location = new System.Drawing.Point(141, 94); - this.textBoxPassword.Name = "textBoxPassword"; - this.textBoxPassword.Size = new System.Drawing.Size(261, 37); - this.textBoxPassword.TabIndex = 98; - // // DialogFormLogOn // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT_PT002/DialogForms/DialogFormLogOn.cs b/INT_PT002/DialogForms/DialogFormLogOn.cs index c227556..0dcaf22 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.cs @@ -193,44 +193,44 @@ namespace INT_PT002.Forms #region 로그인 성공 if (userInfo.user_id == "Intech") - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.Developer; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.Developer; else if (userInfo.user_id == "Admin00") - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.Admin; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.Admin; - this.ParentForm.SystemConfig.CURRENT_USER.ID = userInfo.user_id; - this.ParentForm.SystemConfig.CURRENT_USER.Password = userInfo.user_pw; + this.ParentForm.CurrentSystemStatus.CurrentUser.ID = userInfo.user_id; + this.ParentForm.CurrentSystemStatus.CurrentUser.Password = userInfo.user_pw; - this.ParentForm.SystemConfig.CURRENT_USER.ExpireAccount = userInfo.expire_period_account; - this.ParentForm.SystemConfig.CURRENT_USER.ExpirePassword = userInfo.expire_period_pw; + this.ParentForm.CurrentSystemStatus.CurrentUser.ExpireAccount = userInfo.expire_period_account; + this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword = userInfo.expire_period_pw; DateTime time = DateTime.ParseExact(userInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateRegister = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateRegister = time; time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateLogin = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateLogin = time; time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateExpireRegister = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = time; time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null); - this.ParentForm.SystemConfig.CURRENT_USER.DateExpireLogin = time; + this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireLogin = time; - this.ParentForm.SystemConfig.CURRENT_USER.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; - this.ParentForm.SystemConfig.CURRENT_USER.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true; - this.ParentForm.SystemConfig.CURRENT_USER.IsAdmin = userInfo.fadmin == 0 ? false : true; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainProductChange = userInfo.menuID.fMenu[0]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainWeightSetting = userInfo.menuID.fMenu[1]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainClear = userInfo.menuID.fMenu[2]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMainSubMenu = userInfo.menuID.fMenu[3]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainProductChange = userInfo.menuID.fMenu[0]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainWeightSetting = userInfo.menuID.fMenu[1]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainClear = userInfo.menuID.fMenu[2]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMainSubMenu = userInfo.menuID.fMenu[3]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuProduct = userInfo.menuID.fMenu[4]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuUserSetting = userInfo.menuID.fMenu[5]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuUserGroupEditor = userInfo.menuID.fMenu[6]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuIOTest = userInfo.menuID.fMenu[7]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuEquipmentLog = userInfo.menuID.fMenu[8]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuCheckLog = userInfo.menuID.fMenu[9]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuAlarmList = userInfo.menuID.fMenu[10]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuInformation = userInfo.menuID.fMenu[11]; - this.ParentForm.SystemConfig.CURRENT_USER.IsMenuStatus = userInfo.menuID.fMenu[12]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuProduct = userInfo.menuID.fMenu[4]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuUserSetting = userInfo.menuID.fMenu[5]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuUserGroupEditor = userInfo.menuID.fMenu[6]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuIOTest = userInfo.menuID.fMenu[7]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuEquipmentLog = userInfo.menuID.fMenu[8]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuCheckLog = userInfo.menuID.fMenu[9]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuAlarmList = userInfo.menuID.fMenu[10]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuInformation = userInfo.menuID.fMenu[11]; + this.ParentForm.CurrentSystemStatus.CurrentUser.IsMenuStatus = userInfo.menuID.fMenu[12]; #endregion this.DialogResult = DialogResult.OK; diff --git a/INT_PT002/Forms/FormMain.Designer.cs b/INT_PT002/Forms/FormMain.Designer.cs index fb88e9a..be7e322 100644 --- a/INT_PT002/Forms/FormMain.Designer.cs +++ b/INT_PT002/Forms/FormMain.Designer.cs @@ -35,6 +35,7 @@ this.smartFileCommunicationLog = new SmartX.SmartFile(); this.timer = new System.Windows.Forms.Timer(); this.smartFileIO = new SmartX.SmartFile(); + this.timer1 = new System.Windows.Forms.Timer(); this.SuspendLayout(); // // smartForm1 @@ -89,6 +90,11 @@ // this.smartFileIO.FilePathName = ""; // + // timer1 + // + this.timer1.Interval = 1000; + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -110,6 +116,7 @@ private SmartX.SmartFile smartFileCommunicationLog; private System.Windows.Forms.Timer timer; private SmartX.SmartFile smartFileIO; + private System.Windows.Forms.Timer timer1; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs index 3ed36e7..eb68365 100644 --- a/INT_PT002/Forms/FormMain.cs +++ b/INT_PT002/Forms/FormMain.cs @@ -123,11 +123,6 @@ namespace INT_PT002.Forms get { return this.m_PathDataAlarmFolder; } private set { this.m_PathDataAlarmFolder = value; } } - public static string PathBinFolder - { - get { return m_PathBinFolder; } - private set { m_PathBinFolder = value; } - } public Define.E_EquipmentStatus EquipmentStatus { @@ -181,7 +176,6 @@ namespace INT_PT002.Forms this.PathDataHistoryFolder = this.PathDataFolder + "History\\"; this.PathDataInspectionFolder = this.PathDataFolder + "Inspection\\"; this.PathDataAlarmFolder = this.PathDataFolder + "Alarm\\"; - PathBinFolder = this.PathLaunchFolder + "Bin\\"; this.CurrentAlarmList = new AlarmList(); this.CurrentAlarmList.EventAlarmStateChange += new Define.EventHandlerAlarmStateChange(this.CurrentAlarmList_Change); @@ -454,7 +448,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_login_timeout_t loginTimeout = (UserManager.UserMgr_login_timeout_t)data; - if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) this.ChildFormMainDisplay.CallBackUserListLoginTimeoutDataEvent(loginTimeout); } catch (Exception e) @@ -1781,7 +1775,7 @@ namespace INT_PT002.Forms data.Type = "Operation"; data.Time = DateTime.Now; - data.LoginID = this.SystemConfig.CURRENT_USER.ID; + data.LoginID = this.CurrentSystemStatus.CurrentUser.ID; data.Event = type.ToString(); data.Detail = detail; data.BeforeData = ""; @@ -1795,7 +1789,7 @@ namespace INT_PT002.Forms data.Type = "Parameter"; data.Time = DateTime.Now; - data.LoginID = this.SystemConfig.CURRENT_USER.ID; + data.LoginID = this.CurrentSystemStatus.CurrentUser.ID; data.Event = type.ToString(); data.Detail = detail; data.BeforeData = before; @@ -1914,7 +1908,7 @@ namespace INT_PT002.Forms data.Type = "Alarm"; data.Time = DateTime.Now; - data.LoginID = this.SystemConfig.CURRENT_USER.ID; + data.LoginID = this.CurrentSystemStatus.CurrentUser.ID; data.Event = type.ToString(); data.Detail = detail; data.BeforeData = ""; @@ -2025,7 +2019,6 @@ namespace INT_PT002.Forms { #region StructItem structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2033,9 +2026,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2056,6 +2049,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; #endregion this.smartFileIO.StructType.Write(structItem, i, SmartFile.WriteMode.Overwrite); @@ -2064,7 +2058,6 @@ namespace INT_PT002.Forms { #region StructItem structItem.IsMainDisplayProductChange = true; - structItem.IsMainDisplayWeightSetting = true; structItem.IsMainDisplayClear = true; structItem.IsMainDispalySubMenu = true; @@ -2095,6 +2088,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; #endregion this.smartFileIO.StructType.Write(structItem, i, SmartFile.WriteMode.Overwrite); @@ -2120,7 +2114,6 @@ namespace INT_PT002.Forms #region Level1 structItem.IsMainDisplayProductChange = item.Level1.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Level1.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Level1.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Level1.IsMainDisplaySubMenu; @@ -2128,9 +2121,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Level1.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Level1.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Level1.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Level1.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Level1.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Level1.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Level1.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Level1.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Level1.IsMenuAlarmLog; structItem.IsMenuInformation = item.Level1.IsMenuInformation; structItem.IsMenuStatus = item.Level1.IsMenuStatus; @@ -2151,13 +2144,13 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f0_Level1, SmartFile.WriteMode.Overwrite); #endregion #region Level2 structItem.IsMainDisplayProductChange = item.Level2.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Level2.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Level2.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Level2.IsMainDisplaySubMenu; @@ -2165,9 +2158,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Level2.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Level2.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Level2.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Level2.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Level2.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Level2.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Level2.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Level2.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Level2.IsMenuAlarmLog; structItem.IsMenuInformation = item.Level2.IsMenuInformation; structItem.IsMenuStatus = item.Level2.IsMenuStatus; @@ -2188,13 +2181,13 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f1_Level2, SmartFile.WriteMode.Overwrite); #endregion #region Level3 structItem.IsMainDisplayProductChange = item.Level3.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Level3.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Level3.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Level3.IsMainDisplaySubMenu; @@ -2202,9 +2195,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Level3.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Level3.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Level3.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Level3.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Level3.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Level3.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Level3.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Level3.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Level3.IsMenuAlarmLog; structItem.IsMenuInformation = item.Level3.IsMenuInformation; structItem.IsMenuStatus = item.Level3.IsMenuStatus; @@ -2225,13 +2218,13 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f2_Level3, SmartFile.WriteMode.Overwrite); #endregion #region Default structItem.IsMainDisplayProductChange = item.Default.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.Default.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.Default.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.Default.IsMainDisplaySubMenu; @@ -2239,9 +2232,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.Default.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.Default.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.Default.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.Default.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.Default.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.Default.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.Default.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.Default.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.Default.IsMenuAlarmLog; structItem.IsMenuInformation = item.Default.IsMenuInformation; structItem.IsMenuStatus = item.Default.IsMenuStatus; @@ -2262,6 +2255,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f3_Default, SmartFile.WriteMode.Overwrite); #endregion @@ -2288,7 +2282,6 @@ namespace INT_PT002.Forms #region Level1 structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2296,9 +2289,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2319,6 +2312,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f0_Level1, SmartFile.WriteMode.Overwrite); #endregion @@ -2345,7 +2339,6 @@ namespace INT_PT002.Forms #region Level2 structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2353,9 +2346,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2376,6 +2369,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f1_Level2, SmartFile.WriteMode.Overwrite); #endregion @@ -2402,7 +2396,6 @@ namespace INT_PT002.Forms #region Level3 structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2410,9 +2403,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2433,6 +2426,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f2_Level3, SmartFile.WriteMode.Overwrite); #endregion @@ -2459,7 +2453,6 @@ namespace INT_PT002.Forms #region Default structItem.IsMainDisplayProductChange = item.IsMainDisplayProductChange; - structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting; structItem.IsMainDisplayClear = item.IsMainDisplayClear; structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu; @@ -2467,9 +2460,9 @@ namespace INT_PT002.Forms structItem.IsMenuUserSetting = item.IsMenuUserSetting; structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor; structItem.IsMenuIOTest = item.IsMenuIOTest; - structItem.IsMenuEquipmentLog = item.IsMenuEquipmentLog; - structItem.IsMenuCheckLog = item.IsMenuCheckLog; - structItem.IsMenuAlarmList = item.IsMenuAlarmList; + structItem.IsMenuEquipmentLog = item.IsMenuHistoryLog; + structItem.IsMenuCheckLog = item.IsMenuInspectionLog; + structItem.IsMenuAlarmList = item.IsMenuAlarmLog; structItem.IsMenuInformation = item.IsMenuInformation; structItem.IsMenuStatus = item.IsMenuStatus; @@ -2490,6 +2483,7 @@ namespace INT_PT002.Forms structItem.Dummy15 = false; structItem.Dummy16 = false; structItem.Dummy17 = false; + structItem.Dummy18 = false; this.smartFileIO.StructType.Write(structItem, (int)Define.E_UserGroup.f3_Default, SmartFile.WriteMode.Overwrite); #endregion @@ -2522,7 +2516,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f0_Level1); item.Level1.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Level1.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Level1.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Level1.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2530,9 +2523,9 @@ namespace INT_PT002.Forms item.Level1.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Level1.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Level1.IsMenuIOTest = structItem.IsMenuIOTest; - item.Level1.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Level1.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Level1.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Level1.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Level1.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Level1.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Level1.IsMenuInformation = structItem.IsMenuInformation; item.Level1.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2541,7 +2534,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f1_Level2); item.Level2.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Level2.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Level2.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Level2.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2549,9 +2541,9 @@ namespace INT_PT002.Forms item.Level2.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Level2.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Level2.IsMenuIOTest = structItem.IsMenuIOTest; - item.Level2.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Level2.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Level2.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Level2.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Level2.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Level2.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Level2.IsMenuInformation = structItem.IsMenuInformation; item.Level2.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2560,7 +2552,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f2_Level3); item.Level3.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Level3.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Level3.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Level3.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2568,9 +2559,9 @@ namespace INT_PT002.Forms item.Level3.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Level3.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Level3.IsMenuIOTest = structItem.IsMenuIOTest; - item.Level3.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Level3.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Level3.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Level3.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Level3.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Level3.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Level3.IsMenuInformation = structItem.IsMenuInformation; item.Level3.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2579,7 +2570,6 @@ namespace INT_PT002.Forms structItem = (StructUserGroupItem)this.smartFileIO.StructType.ReadBuffer((int)Define.E_UserGroup.f3_Default); item.Default.IsMainDisplayProductChange = structItem.IsMainDisplayProductChange; - item.Default.IsMainDisplayWeightSetting = structItem.IsMainDisplayWeightSetting; item.Default.IsMainDisplayClear = structItem.IsMainDisplayClear; item.Default.IsMainDisplaySubMenu = structItem.IsMainDispalySubMenu; @@ -2587,9 +2577,9 @@ namespace INT_PT002.Forms item.Default.IsMenuUserSetting = structItem.IsMenuUserSetting; item.Default.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor; item.Default.IsMenuIOTest = structItem.IsMenuIOTest; - item.Default.IsMenuEquipmentLog = structItem.IsMenuEquipmentLog; - item.Default.IsMenuCheckLog = structItem.IsMenuCheckLog; - item.Default.IsMenuAlarmList = structItem.IsMenuAlarmList; + item.Default.IsMenuHistoryLog = structItem.IsMenuEquipmentLog; + item.Default.IsMenuInspectionLog = structItem.IsMenuCheckLog; + item.Default.IsMenuAlarmLog = structItem.IsMenuAlarmList; item.Default.IsMenuInformation = structItem.IsMenuInformation; item.Default.IsMenuStatus = structItem.IsMenuStatus; #endregion @@ -2633,6 +2623,12 @@ namespace INT_PT002.Forms //DialogFormLogOn loginForm = new DialogFormLogOn( + // UserManager 초기화 + this.InitializeUserManager(); + this.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; + //UserManager.UserManager_GetUserListName(); + this.timer1.Enabled = true; + // 화면 시계 표시 타이머 this.timer.Enabled = true; } @@ -2679,5 +2675,11 @@ namespace INT_PT002.Forms this.ChildFormMainDisplay.UpdateDisplayTime(); } #endregion + + private void timer1_Tick(object sender, EventArgs e) + { + this.timer1.Enabled = false; + UserManager.UserManager_GetUserListName(); + } } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMain.resx b/INT_PT002/Forms/FormMain.resx index ff1e1e2..e28b802 100644 --- a/INT_PT002/Forms/FormMain.resx +++ b/INT_PT002/Forms/FormMain.resx @@ -221,6 +221,9 @@ 175, 17 + + 582, 17 + WEBPAD diff --git a/INT_PT002/Forms/FormMainDisplay.cs b/INT_PT002/Forms/FormMainDisplay.cs index 94050c4..608e39e 100644 --- a/INT_PT002/Forms/FormMainDisplay.cs +++ b/INT_PT002/Forms/FormMainDisplay.cs @@ -83,7 +83,7 @@ namespace INT_PT002.Forms } public void Logout() { - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.LogOff; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; this.buttonUser.ButtonUp(); this.DisplayRefresh(); diff --git a/INT_PT002/Forms/FormMainDisplay1.cs b/INT_PT002/Forms/FormMainDisplay1.cs index 81c934f..35bdd62 100644 --- a/INT_PT002/Forms/FormMainDisplay1.cs +++ b/INT_PT002/Forms/FormMainDisplay1.cs @@ -282,7 +282,7 @@ namespace INT_PT002.Forms } public void Logout() { - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.LogOff; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; this.buttonUser.ButtonUp(); this.DisplayRefresh(); diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs index 01a6ff8..b834ff9 100644 --- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs @@ -2196,7 +2196,7 @@ this.buttonUser.ImageDown = null; this.buttonUser.ImageUp = null; this.buttonUser.Location = new System.Drawing.Point(917, 276); - this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonUser.Name = "buttonUser"; this.buttonUser.NestedClickEventPrevent = false; this.buttonUser.OutlinePixel = 2; @@ -2214,7 +2214,6 @@ this.buttonUser.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonUser.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonUser.Visible = false; this.buttonUser.Click += new System.EventHandler(this.buttonUser_Click); // // labelCommunicationStatus diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index b9171b4..e8f121a 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -170,6 +170,55 @@ namespace INT_PT002.Forms } + private void UpdateDisplayUser(UserItem user) + { + string id = "", group = ""; + + if (user.Status == Define.E_UserStatus.NotLogin) + { + id = ""; + + this.buttonRecipeNo.Enabled = true; + this.buttonClear.Enabled = true; + } + else if (user.Status == Define.E_UserStatus.LogOff) + { + id = "LogOff"; + + //if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOff) + // this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOff; + + //this.buttonUser.ButtonUp(); + //this.buttonProductNo.Enabled = false; + //this.buttonClear.Enabled = false; + //this.buttonSubMenu.Enabled = false; + //this.buttonUnder.Enabled = false; + //this.buttonPass.Enabled = false; + //this.buttonOver.Enabled = false; + //this.buttonTare.Enabled = false; + } + else + { + id = user.ID; + + //if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOn) + // this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOn; + + //this.buttonUser.ButtonDown(); + //this.buttonProductNo.Enabled = user.IsMainProductNo; + //this.buttonClear.Enabled = user.IsMainClear; + //this.buttonSubMenu.Enabled = user.IsMainSubMenu; + //this.buttonUnder.Enabled = user.IsMainWeightSetting; + //this.buttonPass.Enabled = user.IsMainWeightSetting; + //this.buttonOver.Enabled = user.IsMainWeightSetting; + //this.buttonTare.Enabled = user.IsMainWeightSetting; + } + + //if (this.labelUserLevel.Text != group) + // this.labelUserLevel.Text = group; + //if (this.labelUserID.Text != id) + // this.labelUserID.Text = id; + } private void Login() { DialogFormLogOn logOn = new DialogFormLogOn(this.ParentForm); @@ -177,6 +226,7 @@ namespace INT_PT002.Forms { this.DisplayRefresh(); this.buttonUser.ButtonDown(); + this.buttonUser.ButtonText = "Logout"; //this.ParentForm.TimerAutomaticLogout(true, this.ParentForm.SystemConfig.AutomaticLogout); // Part 11 @@ -189,7 +239,7 @@ namespace INT_PT002.Forms } public void Logout() { - this.ParentForm.SystemConfig.CURRENT_USER.Status = Define.E_UserStatus.LogOff; + this.ParentForm.CurrentSystemStatus.CurrentUser.Status = Define.E_UserStatus.LogOff; this.buttonUser.ButtonUp(); this.DisplayRefresh(); @@ -638,6 +688,7 @@ namespace INT_PT002.Forms this.labelTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); } + public void DisplayRefresh() { this.ParentForm.CurrentSystemStatus.CurrentForm = Define.E_FormStore.FormMainDisplay; @@ -693,7 +744,18 @@ namespace INT_PT002.Forms } private void buttonUser_Click(object sender, EventArgs e) { - + if (this.ParentForm.CurrentSystemStatus.CurrentUser.Status == Define.E_UserStatus.LogOff) + { + this.Login(); + } + else + { + DialogFormYesNo msg = new DialogFormYesNo(this.ParentForm.SystemConfig.LANGUAGE, 12); + if (msg.ShowDialog() == DialogResult.Yes) + { + this.Logout(); + } + } } private void buttonMenu_Click(object sender, EventArgs e) { diff --git a/INT_PT002/INT_PT002.csproj b/INT_PT002/INT_PT002.csproj deleted file mode 100644 index 218108d..0000000 --- a/INT_PT002/INT_PT002.csproj +++ /dev/null @@ -1,365 +0,0 @@ - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {37DB9023-1C6E-4094-9777-C626E6885290} - WinExe - Properties - INT_PT002 - INT_PT002 - {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - WindowsCE - E2BECB1F-8C8C-41ba-B736-9BE7D946A398 - 5.0 - INT_PT002 - v3.5 - Windows CE - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(PlatformFamilyName) - true - true - prompt - 512 - 4 - Off - - - pdbonly - true - bin\Release\ - TRACE;$(PlatformFamilyName) - true - true - prompt - 512 - 4 - Off - - - - - - False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNCommon.dll - - - False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNFDCommon.dll - - - False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXN_IEC1000.dll - - - - - - - - - - - - - UserControl - - - ControlBottomManual.cs - - - UserControl - - - ControlBottomSetting.cs - - - UserControl - - - ControlMenuLogTemporary.cs - - - UserControl - - - ControlMenuSystemInformation.cs - - - UserControl - - - ControlMenuLogAlarm.cs - - - UserControl - - - ControlMenuLogHistory.cs - - - UserControl - - - ControlMenuLogInspection.cs - - - UserControl - - - ControlMenuManualIoTest.cs - - - UserControl - - - ControlMenuRecipeSetting.cs - - - UserControl - - - ControlMainDisplay.cs - - - UserControl - - - ControlMainDisplayDotGraph.cs - - - UserControl - - - ControlMenuSystemStatus.cs - - - UserControl - - - ControlMenuUserGroupEditor.cs - - - UserControl - - - ControlMenuUserUserEditor.cs - - - - - - - - - - - - Form - - - DialogFormNumKeyPad.cs - - - Form - - - DialogFormProgressBar.cs - - - Form - - - DialogFormYesNo.cs - - - Form - - - DialogFormMessage.cs - - - Form - - - DialogFormPasswordKeyPad.cs - - - Form - - - DialogFormLogOn.cs - - - Form - - - FormConfiguration.cs - - - Form - - - FormMainDisplay.cs - - - Form - - - FormMain.cs - - - Form - - - FormMainDisplay1.cs - - - Form - - - FormMainDisplay2.cs - - - Form - - - FormMenu.cs - - - - - - - - - ControlMainDisplay.cs - Designer - - - ControlMainDisplayDotGraph.cs - Designer - - - ControlMenuLogTemporary.cs - Designer - - - ControlMenuSystemInformation.cs - Designer - - - ControlMenuLogAlarm.cs - Designer - - - ControlMenuLogHistory.cs - Designer - - - ControlMenuLogInspection.cs - Designer - - - ControlMenuManualIoTest.cs - Designer - - - ControlMenuRecipeSetting.cs - Designer - - - ControlMenuSystemStatus.cs - Designer - - - ControlMenuUserGroupEditor.cs - Designer - - - ControlMenuUserUserEditor.cs - Designer - - - DialogFormLogOn.cs - Designer - - - DialogFormNumKeyPad.cs - Designer - - - DialogFormProgressBar.cs - Designer - - - DialogFormYesNo.cs - Designer - - - DialogFormMessage.cs - Designer - - - DialogFormPasswordKeyPad.cs - Designer - - - FormConfiguration.cs - Designer - - - FormMainDisplay.cs - Designer - - - FormMain.cs - Designer - - - FormMainDisplay1.cs - Designer - - - FormMainDisplay2.cs - Designer - - - FormMenu.cs - Designer - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - - - - - - - - \ No newline at end of file From f9e4f1f687176735e08723674f8f1ae5145dcd82 Mon Sep 17 00:00:00 2001 From: Seonjae Date: Fri, 31 Mar 2023 13:32:47 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c664d40..df8d545 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ INT_PT002/bin/ INT_PT002/obj/ INT_PT002.suo INT_PT002/INT_PT002.csproj.user +INT_PT002/INT_PT002.csproj