From 80208944e2b23502a64e5c0c60da60ad8ce5eb25 Mon Sep 17 00:00:00 2001 From: Seonjae Date: Wed, 17 Apr 2024 14:54:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Manual/ControlMenuManualIoTest.cs | 4 +- .../ControlMenuRecipeSetting.Designer.cs | 343 +++++++++++------- .../Recipe/ControlMenuRecipeSetting.cs | 29 ++ .../ControlMenuSystemStatus1.Designer.cs | 82 ++--- .../System/ControlMenuSystemStatus1.cs | 5 + .../System/ControlMenuSystemStatus1.resx | 3 - INT_PT002/DataStore/Communication.cs | 2 + INT_PT002/DataStore/Define.cs | 1 + INT_PT002/DataStore/Recipe.cs | 8 + INT_PT002/DataStore/ServoMotor.cs | 2 + INT_PT002/Forms/FormMain.cs | 10 + INT_PT002/Forms/FormMainDisplay3.Designer.cs | 32 +- INT_PT002/Forms/FormMainDisplay3.cs | 96 ++++- 13 files changed, 405 insertions(+), 212 deletions(-) diff --git a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs index 59819ac..bcdce75 100644 --- a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs +++ b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs @@ -503,8 +503,8 @@ namespace INT_PT002.Controls } else { - this.ParentForm.ParentForm.ServoMotorWrite2(1, ServoMotorAddress.CMD21, myKeyPad.IntValue, this.labelMotor1Origin); - this.ParentForm.ParentForm.ServoMotorWrite2(1, ServoMotorAddress.CMD2, myKeyPad.IntValue); + this.ParentForm.ParentForm.ServoMotorWrite2(1, ServoMotorAddress.CMD23, myKeyPad.IntValue, this.labelMotor1Origin); + this.ParentForm.ParentForm.ServoMotorWrite2(1, ServoMotorAddress.CMD12, myKeyPad.IntValue); before = myKeyPad.StringValue; this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.M_Origin, "", before, after); diff --git a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs index 0372be0..df649ac 100644 --- a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs +++ b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs @@ -49,6 +49,14 @@ this.labelLcdDataPeriod = new SmartX.SmartLabel(); this.smartLabel14 = new SmartX.SmartLabel(); this.smartGroupBox5 = new SmartX.SmartGroupBox(); + this.buttonDispOPT1 = new SmartX.SmartButton(); + this.smartLabel40 = new SmartX.SmartLabel(); + this.smartLabel36 = new SmartX.SmartLabel(); + this.smartLabel38 = new SmartX.SmartLabel(); + this.labelDispEmptyLevel2 = new SmartX.SmartLabel(); + this.smartLabel44 = new SmartX.SmartLabel(); + this.labelDispMinLevel2 = new SmartX.SmartLabel(); + this.smartLabel46 = new SmartX.SmartLabel(); this.smartLabel35 = new SmartX.SmartLabel(); this.smartLabel34 = new SmartX.SmartLabel(); this.smartLabel33 = new SmartX.SmartLabel(); @@ -93,12 +101,6 @@ this.smartLabel7 = new SmartX.SmartLabel(); this.labelDispStdLevel = new SmartX.SmartLabel(); this.smartTimerMessageShow = new SmartX.SmartTimer(); - this.smartLabel36 = new SmartX.SmartLabel(); - this.smartLabel38 = new SmartX.SmartLabel(); - this.labelDispEmptyLevel2 = new SmartX.SmartLabel(); - this.smartLabel44 = new SmartX.SmartLabel(); - this.labelDispMinLevel2 = new SmartX.SmartLabel(); - this.smartLabel46 = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.smartGroupBox2.SuspendLayout(); this.smartGroupBox5.SuspendLayout(); @@ -568,6 +570,8 @@ this.smartGroupBox5.BackGround = null; this.smartGroupBox5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartGroupBox5.BackImage = null; + this.smartGroupBox5.Controls.Add(this.buttonDispOPT1); + this.smartGroupBox5.Controls.Add(this.smartLabel40); this.smartGroupBox5.Controls.Add(this.smartLabel36); this.smartGroupBox5.Controls.Add(this.smartLabel38); this.smartGroupBox5.Controls.Add(this.labelDispEmptyLevel2); @@ -630,6 +634,197 @@ this.smartGroupBox5.Text = "Recipe"; this.smartGroupBox5.TextColor = System.Drawing.Color.White; // + // buttonDispOPT1 + // + this.buttonDispOPT1.BackGround = this.smartGroupBox5; + this.buttonDispOPT1.BackGroundColor = System.Drawing.Color.Black; + this.buttonDispOPT1.ButtonColor = System.Drawing.Color.Gray; + this.buttonDispOPT1.ButtonDownColor = System.Drawing.Color.Teal; + this.buttonDispOPT1.ButtonImageAutoSize = true; + this.buttonDispOPT1.ButtonStyle = SmartX.SmartButton.ButtonStyles.Round3D; + this.buttonDispOPT1.ButtonText = "OFF"; + this.buttonDispOPT1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonDispOPT1.GroupID = 0; + this.buttonDispOPT1.ImageDisable = null; + this.buttonDispOPT1.ImageDown = null; + this.buttonDispOPT1.ImageUp = null; + this.buttonDispOPT1.Location = new System.Drawing.Point(687, 184); + this.buttonDispOPT1.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; + this.buttonDispOPT1.Name = "buttonDispOPT1"; + this.buttonDispOPT1.NestedClickEventPrevent = false; + this.buttonDispOPT1.OutlinePixel = 2; + this.buttonDispOPT1.OverlapOptimize = true; + this.buttonDispOPT1.RepeatInterval = 200; + this.buttonDispOPT1.RepeatIntervalAccelerate = null; + this.buttonDispOPT1.RoundSize = 10; + this.buttonDispOPT1.SafeInterval = 200; + this.buttonDispOPT1.Size = new System.Drawing.Size(100, 30); + this.buttonDispOPT1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonDispOPT1.TabIndex = 446; + this.buttonDispOPT1.Text = null; + this.buttonDispOPT1.TextColor = System.Drawing.Color.White; + this.buttonDispOPT1.TextColorDisable = System.Drawing.Color.Gray; + this.buttonDispOPT1.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonDispOPT1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonDispOPT1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonDispOPT1.Click += new System.EventHandler(this.buttonDispOPT1_Click); + // + // smartLabel40 + // + this.smartLabel40.BackGround = null; + this.smartLabel40.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); + this.smartLabel40.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.smartLabel40.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel40.LineSpacing = 0F; + this.smartLabel40.Location = new System.Drawing.Point(531, 184); + this.smartLabel40.Name = "smartLabel40"; + this.smartLabel40.OverlapOptimize = true; + this.smartLabel40.PasswordChar = '\0'; + this.smartLabel40.Radius = 3; + this.smartLabel40.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel40.Size = new System.Drawing.Size(150, 30); + this.smartLabel40.TabIndex = 445; + this.smartLabel40.Text = "OPT1"; + this.smartLabel40.TextColor = System.Drawing.Color.White; + this.smartLabel40.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel40.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel40.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel40.Wordwrap = false; + // + // smartLabel36 + // + this.smartLabel36.BackGround = null; + this.smartLabel36.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); + this.smartLabel36.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.smartLabel36.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel36.LineSpacing = 0F; + this.smartLabel36.Location = new System.Drawing.Point(793, 148); + this.smartLabel36.Name = "smartLabel36"; + this.smartLabel36.OverlapOptimize = true; + this.smartLabel36.PasswordChar = '\0'; + this.smartLabel36.Radius = 3; + this.smartLabel36.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel36.Size = new System.Drawing.Size(40, 30); + this.smartLabel36.TabIndex = 140; + this.smartLabel36.Text = "mm"; + this.smartLabel36.TextColor = System.Drawing.Color.White; + this.smartLabel36.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel36.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel36.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel36.Wordwrap = false; + // + // smartLabel38 + // + this.smartLabel38.BackGround = null; + this.smartLabel38.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); + this.smartLabel38.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.smartLabel38.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel38.LineSpacing = 0F; + this.smartLabel38.Location = new System.Drawing.Point(793, 112); + this.smartLabel38.Name = "smartLabel38"; + this.smartLabel38.OverlapOptimize = true; + this.smartLabel38.PasswordChar = '\0'; + this.smartLabel38.Radius = 3; + this.smartLabel38.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel38.Size = new System.Drawing.Size(40, 30); + this.smartLabel38.TabIndex = 139; + this.smartLabel38.Text = "mm"; + this.smartLabel38.TextColor = System.Drawing.Color.White; + this.smartLabel38.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel38.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel38.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel38.Wordwrap = false; + // + // labelDispEmptyLevel2 + // + this.labelDispEmptyLevel2.BackGround = null; + this.labelDispEmptyLevel2.BackGroundColor = System.Drawing.Color.White; + this.labelDispEmptyLevel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelDispEmptyLevel2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; + this.labelDispEmptyLevel2.LineSpacing = 0F; + this.labelDispEmptyLevel2.Location = new System.Drawing.Point(687, 112); + this.labelDispEmptyLevel2.Name = "labelDispEmptyLevel2"; + this.labelDispEmptyLevel2.OverlapOptimize = true; + this.labelDispEmptyLevel2.PasswordChar = '\0'; + this.labelDispEmptyLevel2.Radius = 3; + this.labelDispEmptyLevel2.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelDispEmptyLevel2.Size = new System.Drawing.Size(100, 30); + this.labelDispEmptyLevel2.TabIndex = 135; + this.labelDispEmptyLevel2.Text = "12345.45"; + this.labelDispEmptyLevel2.TextColor = System.Drawing.Color.Black; + this.labelDispEmptyLevel2.TextColorDisable = System.Drawing.Color.Gray; + this.labelDispEmptyLevel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelDispEmptyLevel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelDispEmptyLevel2.Wordwrap = false; + this.labelDispEmptyLevel2.Click += new System.EventHandler(this.labelDispEmptyLevel2_Click); + // + // smartLabel44 + // + this.smartLabel44.BackGround = null; + this.smartLabel44.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); + this.smartLabel44.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.smartLabel44.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel44.LineSpacing = 0F; + this.smartLabel44.Location = new System.Drawing.Point(531, 112); + this.smartLabel44.Name = "smartLabel44"; + this.smartLabel44.OverlapOptimize = true; + this.smartLabel44.PasswordChar = '\0'; + this.smartLabel44.Radius = 3; + this.smartLabel44.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel44.Size = new System.Drawing.Size(150, 30); + this.smartLabel44.TabIndex = 134; + this.smartLabel44.Text = "2# Initial Product Height"; + this.smartLabel44.TextColor = System.Drawing.Color.White; + this.smartLabel44.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel44.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel44.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel44.Wordwrap = false; + // + // labelDispMinLevel2 + // + this.labelDispMinLevel2.BackGround = null; + this.labelDispMinLevel2.BackGroundColor = System.Drawing.Color.White; + this.labelDispMinLevel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelDispMinLevel2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; + this.labelDispMinLevel2.LineSpacing = 0F; + this.labelDispMinLevel2.Location = new System.Drawing.Point(687, 148); + this.labelDispMinLevel2.Name = "labelDispMinLevel2"; + this.labelDispMinLevel2.OverlapOptimize = true; + this.labelDispMinLevel2.PasswordChar = '\0'; + this.labelDispMinLevel2.Radius = 3; + this.labelDispMinLevel2.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelDispMinLevel2.Size = new System.Drawing.Size(100, 30); + this.labelDispMinLevel2.TabIndex = 133; + this.labelDispMinLevel2.Text = "12345.45"; + this.labelDispMinLevel2.TextColor = System.Drawing.Color.Black; + this.labelDispMinLevel2.TextColorDisable = System.Drawing.Color.Gray; + this.labelDispMinLevel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelDispMinLevel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelDispMinLevel2.Wordwrap = false; + this.labelDispMinLevel2.Click += new System.EventHandler(this.labelDispMinLevel2_Click); + // + // smartLabel46 + // + this.smartLabel46.BackGround = null; + this.smartLabel46.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); + this.smartLabel46.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.smartLabel46.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.smartLabel46.LineSpacing = 0F; + this.smartLabel46.Location = new System.Drawing.Point(531, 148); + this.smartLabel46.Name = "smartLabel46"; + this.smartLabel46.OverlapOptimize = true; + this.smartLabel46.PasswordChar = '\0'; + this.smartLabel46.Radius = 3; + this.smartLabel46.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.smartLabel46.Size = new System.Drawing.Size(150, 30); + this.smartLabel46.TabIndex = 132; + this.smartLabel46.Text = "2# min. rate of change"; + this.smartLabel46.TextColor = System.Drawing.Color.White; + this.smartLabel46.TextColorDisable = System.Drawing.Color.Gray; + this.smartLabel46.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel46.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel46.Wordwrap = false; + // // smartLabel35 // this.smartLabel35.BackGround = null; @@ -1574,140 +1769,6 @@ this.smartTimerMessageShow.TimeFormStringSeparator = ":"; this.smartTimerMessageShow.Tick += new System.EventHandler(this.smartTimerMessageShow_Tick); // - // smartLabel36 - // - this.smartLabel36.BackGround = null; - this.smartLabel36.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); - this.smartLabel36.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel36.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel36.LineSpacing = 0F; - this.smartLabel36.Location = new System.Drawing.Point(793, 148); - this.smartLabel36.Name = "smartLabel36"; - this.smartLabel36.OverlapOptimize = true; - this.smartLabel36.PasswordChar = '\0'; - this.smartLabel36.Radius = 3; - this.smartLabel36.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel36.Size = new System.Drawing.Size(40, 30); - this.smartLabel36.TabIndex = 140; - this.smartLabel36.Text = "mm"; - this.smartLabel36.TextColor = System.Drawing.Color.White; - this.smartLabel36.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel36.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel36.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel36.Wordwrap = false; - // - // smartLabel38 - // - this.smartLabel38.BackGround = null; - this.smartLabel38.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); - this.smartLabel38.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel38.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel38.LineSpacing = 0F; - this.smartLabel38.Location = new System.Drawing.Point(793, 112); - this.smartLabel38.Name = "smartLabel38"; - this.smartLabel38.OverlapOptimize = true; - this.smartLabel38.PasswordChar = '\0'; - this.smartLabel38.Radius = 3; - this.smartLabel38.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel38.Size = new System.Drawing.Size(40, 30); - this.smartLabel38.TabIndex = 139; - this.smartLabel38.Text = "mm"; - this.smartLabel38.TextColor = System.Drawing.Color.White; - this.smartLabel38.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel38.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel38.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel38.Wordwrap = false; - // - // labelDispEmptyLevel2 - // - this.labelDispEmptyLevel2.BackGround = null; - this.labelDispEmptyLevel2.BackGroundColor = System.Drawing.Color.White; - this.labelDispEmptyLevel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelDispEmptyLevel2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelDispEmptyLevel2.LineSpacing = 0F; - this.labelDispEmptyLevel2.Location = new System.Drawing.Point(687, 112); - this.labelDispEmptyLevel2.Name = "labelDispEmptyLevel2"; - this.labelDispEmptyLevel2.OverlapOptimize = true; - this.labelDispEmptyLevel2.PasswordChar = '\0'; - this.labelDispEmptyLevel2.Radius = 3; - this.labelDispEmptyLevel2.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelDispEmptyLevel2.Size = new System.Drawing.Size(100, 30); - this.labelDispEmptyLevel2.TabIndex = 135; - this.labelDispEmptyLevel2.Text = "12345.45"; - this.labelDispEmptyLevel2.TextColor = System.Drawing.Color.Black; - this.labelDispEmptyLevel2.TextColorDisable = System.Drawing.Color.Gray; - this.labelDispEmptyLevel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelDispEmptyLevel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelDispEmptyLevel2.Wordwrap = false; - this.labelDispEmptyLevel2.Click += new System.EventHandler(this.labelDispEmptyLevel2_Click); - // - // smartLabel44 - // - this.smartLabel44.BackGround = null; - this.smartLabel44.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); - this.smartLabel44.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel44.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel44.LineSpacing = 0F; - this.smartLabel44.Location = new System.Drawing.Point(531, 112); - this.smartLabel44.Name = "smartLabel44"; - this.smartLabel44.OverlapOptimize = true; - this.smartLabel44.PasswordChar = '\0'; - this.smartLabel44.Radius = 3; - this.smartLabel44.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel44.Size = new System.Drawing.Size(150, 30); - this.smartLabel44.TabIndex = 134; - this.smartLabel44.Text = "2# Initial Product Height"; - this.smartLabel44.TextColor = System.Drawing.Color.White; - this.smartLabel44.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel44.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel44.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel44.Wordwrap = false; - // - // labelDispMinLevel2 - // - this.labelDispMinLevel2.BackGround = null; - this.labelDispMinLevel2.BackGroundColor = System.Drawing.Color.White; - this.labelDispMinLevel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelDispMinLevel2.BorderStyle = SmartX.SmartLabel.BorderStyles.FixedSingle; - this.labelDispMinLevel2.LineSpacing = 0F; - this.labelDispMinLevel2.Location = new System.Drawing.Point(687, 148); - this.labelDispMinLevel2.Name = "labelDispMinLevel2"; - this.labelDispMinLevel2.OverlapOptimize = true; - this.labelDispMinLevel2.PasswordChar = '\0'; - this.labelDispMinLevel2.Radius = 3; - this.labelDispMinLevel2.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelDispMinLevel2.Size = new System.Drawing.Size(100, 30); - this.labelDispMinLevel2.TabIndex = 133; - this.labelDispMinLevel2.Text = "12345.45"; - this.labelDispMinLevel2.TextColor = System.Drawing.Color.Black; - this.labelDispMinLevel2.TextColorDisable = System.Drawing.Color.Gray; - this.labelDispMinLevel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelDispMinLevel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelDispMinLevel2.Wordwrap = false; - this.labelDispMinLevel2.Click += new System.EventHandler(this.labelDispMinLevel2_Click); - // - // smartLabel46 - // - this.smartLabel46.BackGround = null; - this.smartLabel46.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); - this.smartLabel46.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.smartLabel46.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel46.LineSpacing = 0F; - this.smartLabel46.Location = new System.Drawing.Point(531, 148); - this.smartLabel46.Name = "smartLabel46"; - this.smartLabel46.OverlapOptimize = true; - this.smartLabel46.PasswordChar = '\0'; - this.smartLabel46.Radius = 3; - this.smartLabel46.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel46.Size = new System.Drawing.Size(150, 30); - this.smartLabel46.TabIndex = 132; - this.smartLabel46.Text = "2# min. rate of change"; - this.smartLabel46.TextColor = System.Drawing.Color.White; - this.smartLabel46.TextColorDisable = System.Drawing.Color.Gray; - this.smartLabel46.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel46.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel46.Wordwrap = false; - // // ControlMenuRecipeSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1795,5 +1856,7 @@ private SmartX.SmartLabel smartLabel44; private SmartX.SmartLabel labelDispMinLevel2; private SmartX.SmartLabel smartLabel46; + private SmartX.SmartButton buttonDispOPT1; + private SmartX.SmartLabel smartLabel40; } } diff --git a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs index 5bf5964..9962de6 100644 --- a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs +++ b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs @@ -145,6 +145,11 @@ namespace INT_PT002.Controls value = item.DISP_HOLD_DELAY_MSEC.ToString(); if (this.labelDispHoldDelay.Text != value) this.labelDispHoldDelay.Text = value; + // OPT1 + if (item.DISP_OPT1 == true) + this.buttonDispOPT1.ButtonDown(); + else + this.buttonDispOPT1.ButtonUp(); // Differential Pressure Sensor // LR_Second @@ -569,6 +574,30 @@ namespace INT_PT002.Controls this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.Disp_WaitingTime, "", before, after); } } + private void buttonDispOPT1_Click(object sender, EventArgs e) + { + string value = "", before = "", after = ""; + + + if (this.buttonDispOPT1.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + before = "false"; + this.ParentForm.ParentForm.CurrentRecipe.DISP_OPT1 = true; + value = Helper.StringBlankFillDigits4("1"); + after = "true"; + } + else + { + before = "true"; + this.ParentForm.ParentForm.CurrentRecipe.DISP_OPT1 = false; + value = Helper.StringBlankFillDigits4("0"); + after = "false"; + } + + this.ParentForm.ParentForm.SaveRecipeFile(this.ParentForm.ParentForm.CurrentRecipe); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._5518_DispOPT1, value); + this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.Disp_OPT1, "", before, after); + } // 차압센서 private void labelDiffLrSecond_Click(object sender, EventArgs e) diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus1.Designer.cs b/INT_PT002/Controls/System/ControlMenuSystemStatus1.Designer.cs index ea77778..e3c1450 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemStatus1.Designer.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemStatus1.Designer.cs @@ -28,8 +28,9 @@ /// private void InitializeComponent() { - SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle2 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle(); + SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle1 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.buttonContinuousTest = new SmartX.SmartButton(); this.buttonDisplay = new SmartX.SmartButton(); this.buttonStart = new SmartX.SmartButton(); this.labelProgress3 = new SmartX.SmartLabel(); @@ -189,7 +190,6 @@ this.labelMesResult2 = new SmartX.SmartLabel(); this.smartGroupBox11 = new SmartX.SmartGroupBox(); this.smartDraw2 = new SmartX.SmartDraw(); - this.buttonContinuousTest = new SmartX.SmartButton(); this.smartTimer = new SmartX.SmartTimer(); this.smartGroupBox1.SuspendLayout(); this.smartGroupBox14.SuspendLayout(); @@ -256,6 +256,41 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.White; // + // buttonContinuousTest + // + this.buttonContinuousTest.BackGround = this.smartGroupBox1; + this.buttonContinuousTest.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65))))); + this.buttonContinuousTest.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.buttonContinuousTest.ButtonDownColor = System.Drawing.Color.SlateGray; + this.buttonContinuousTest.ButtonImageAutoSize = true; + this.buttonContinuousTest.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.buttonContinuousTest.ButtonText = "continuous testing"; + this.buttonContinuousTest.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonContinuousTest.GroupID = 0; + this.buttonContinuousTest.ImageDisable = null; + this.buttonContinuousTest.ImageDown = null; + this.buttonContinuousTest.ImageUp = null; + this.buttonContinuousTest.Location = new System.Drawing.Point(458, 3); + this.buttonContinuousTest.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; + this.buttonContinuousTest.Name = "buttonContinuousTest"; + this.buttonContinuousTest.NestedClickEventPrevent = false; + this.buttonContinuousTest.OutlinePixel = 2; + this.buttonContinuousTest.OverlapOptimize = true; + this.buttonContinuousTest.RepeatInterval = 200; + this.buttonContinuousTest.RepeatIntervalAccelerate = null; + this.buttonContinuousTest.RoundSize = 10; + this.buttonContinuousTest.SafeInterval = 200; + this.buttonContinuousTest.Size = new System.Drawing.Size(120, 31); + this.buttonContinuousTest.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonContinuousTest.TabIndex = 442; + this.buttonContinuousTest.Text = null; + this.buttonContinuousTest.TextColor = System.Drawing.Color.White; + this.buttonContinuousTest.TextColorDisable = System.Drawing.Color.Gray; + this.buttonContinuousTest.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.buttonContinuousTest.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonContinuousTest.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonContinuousTest.Click += new System.EventHandler(this.buttonContinuousTest_Click); + // // buttonDisplay // this.buttonDisplay.BackGround = this.smartGroupBox1; @@ -570,10 +605,10 @@ // // smartDraw_ChartChannelPenStyle1 // - chartPenStyle2.ChannelColor = System.Drawing.Color.White; - chartPenStyle2.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID; - chartPenStyle2.PenWidth = 3; - this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle2); + chartPenStyle1.ChannelColor = System.Drawing.Color.White; + chartPenStyle1.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID; + chartPenStyle1.PenWidth = 3; + this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle1); // // smartLabel61 // @@ -3820,41 +3855,6 @@ this.smartDraw2.TabIndex = 14; this.smartDraw2.Text = "smartDraw2"; // - // buttonContinuousTest - // - this.buttonContinuousTest.BackGround = this.smartGroupBox1; - this.buttonContinuousTest.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65))))); - this.buttonContinuousTest.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); - this.buttonContinuousTest.ButtonDownColor = System.Drawing.Color.SlateGray; - this.buttonContinuousTest.ButtonImageAutoSize = true; - this.buttonContinuousTest.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.buttonContinuousTest.ButtonText = "continuous testing"; - this.buttonContinuousTest.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonContinuousTest.GroupID = 0; - this.buttonContinuousTest.ImageDisable = null; - this.buttonContinuousTest.ImageDown = null; - this.buttonContinuousTest.ImageUp = null; - this.buttonContinuousTest.Location = new System.Drawing.Point(458, 3); - this.buttonContinuousTest.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; - this.buttonContinuousTest.Name = "buttonContinuousTest"; - this.buttonContinuousTest.NestedClickEventPrevent = false; - this.buttonContinuousTest.OutlinePixel = 2; - this.buttonContinuousTest.OverlapOptimize = true; - this.buttonContinuousTest.RepeatInterval = 200; - this.buttonContinuousTest.RepeatIntervalAccelerate = null; - this.buttonContinuousTest.RoundSize = 10; - this.buttonContinuousTest.SafeInterval = 200; - this.buttonContinuousTest.Size = new System.Drawing.Size(120, 31); - this.buttonContinuousTest.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonContinuousTest.TabIndex = 442; - this.buttonContinuousTest.Text = null; - this.buttonContinuousTest.TextColor = System.Drawing.Color.White; - this.buttonContinuousTest.TextColorDisable = System.Drawing.Color.Gray; - this.buttonContinuousTest.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); - this.buttonContinuousTest.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonContinuousTest.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonContinuousTest.Click += new System.EventHandler(this.buttonContinuousTest_Click); - // // smartTimer // this.smartTimer.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus1.cs b/INT_PT002/Controls/System/ControlMenuSystemStatus1.cs index 1115c2d..b92e98d 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemStatus1.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemStatus1.cs @@ -1108,5 +1108,10 @@ namespace INT_PT002.Controls this.InitializeData(); this.ParentForm.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard); } + + private void buttonDiffOPT1_Click(object sender, EventArgs e) + { + + } } } diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus1.resx b/INT_PT002/Controls/System/ControlMenuSystemStatus1.resx index 7e04456..273745a 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemStatus1.resx +++ b/INT_PT002/Controls/System/ControlMenuSystemStatus1.resx @@ -120,9 +120,6 @@ 17, 17 - - 17, 17 - 264, 17 diff --git a/INT_PT002/DataStore/Communication.cs b/INT_PT002/DataStore/Communication.cs index ba7e531..f74da74 100644 --- a/INT_PT002/DataStore/Communication.cs +++ b/INT_PT002/DataStore/Communication.cs @@ -120,6 +120,8 @@ namespace INT_PT002.DataStore public static readonly string _5516_DiffHoldDelay = "5516"; // 압력게이지 기준압력 public static readonly string _5517_VacuumGaugeStdLevel = "5517"; + // 변위센서 - OPT1 + public static readonly string _5518_DispOPT1 = "5518"; // 옵션 - 부저 동작 시간 public static readonly string _6001_BuzzerOP = "6001"; diff --git a/INT_PT002/DataStore/Define.cs b/INT_PT002/DataStore/Define.cs index 124c797..a9c18a8 100644 --- a/INT_PT002/DataStore/Define.cs +++ b/INT_PT002/DataStore/Define.cs @@ -191,6 +191,7 @@ namespace INT_PT002.DataStore Disp_Min1, Disp_Min2, Disp_WaitingTime, + Disp_OPT1, Diff_SEC, Diff_AVG, diff --git a/INT_PT002/DataStore/Recipe.cs b/INT_PT002/DataStore/Recipe.cs index a9450f9..5ea0d5f 100644 --- a/INT_PT002/DataStore/Recipe.cs +++ b/INT_PT002/DataStore/Recipe.cs @@ -19,6 +19,7 @@ namespace INT_PT002.DataStore private string m_DISP_JUDG_EMPTY_LEVEL1; private string m_DISP_JUDG_EMPTY_LEVEL2; private int m_DISP_HOLD_DELAY_MSEC; + private bool m_DISP_OPT1; private string m_DIFF_LR_SECOND; private string m_DIFF_LR_TOTAL; @@ -86,6 +87,11 @@ namespace INT_PT002.DataStore get { return this.m_DISP_HOLD_DELAY_MSEC; } set { this.m_DISP_HOLD_DELAY_MSEC = value; } } + public bool DISP_OPT1 + { + get { return this.m_DISP_OPT1; } + set { this.m_DISP_OPT1 = value; } + } public string DIFF_LR_SECOND { @@ -148,6 +154,7 @@ namespace INT_PT002.DataStore this.DISP_JUDG_EMPTY_LEVEL1 = "80.00"; this.DISP_JUDG_EMPTY_LEVEL2 = "80.00"; this.DISP_HOLD_DELAY_MSEC = 100; + this.DISP_OPT1 = false; this.DIFF_LR_SECOND = "500.00"; this.DIFF_LR_TOTAL = "5000.00"; @@ -184,6 +191,7 @@ namespace INT_PT002.DataStore [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 12)] public string DISP_JUDG_EMPTY_LEVEL2; public int DISP_HOLD_DELAY_MSEC; + public bool DISP_OPT1; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 12)] public string DIFF_LR_SECOND; diff --git a/INT_PT002/DataStore/ServoMotor.cs b/INT_PT002/DataStore/ServoMotor.cs index 26bd6ce..a5e1440 100644 --- a/INT_PT002/DataStore/ServoMotor.cs +++ b/INT_PT002/DataStore/ServoMotor.cs @@ -43,6 +43,8 @@ namespace INT_PT002.DataStore public static readonly int CMD10 = 18474; // CMD 11 - 0x482E public static readonly int CMD11 = 18478; + // CMD 11 - 0x4832 + public static readonly int CMD12 = 18482; // CMD 16 - 0x4842 public static readonly int CMD16 = 18498; // CMD 17 - 0x4846 diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs index 4b6762d..6369a8b 100644 --- a/INT_PT002/Forms/FormMain.cs +++ b/INT_PT002/Forms/FormMain.cs @@ -363,6 +363,7 @@ namespace INT_PT002.Forms } public void TransferRecipeParameter9043(int number) { + string value = ""; StringBuilder sb = new StringBuilder(); this.LoadingRecipe = new Recipe(); @@ -384,6 +385,12 @@ namespace INT_PT002.Forms sb.Append(Helper.StringBlankFillDigits6(this.LoadingRecipe.VACUUM_GUAGE_LEVEL)); + if (this.LoadingRecipe.DISP_OPT1 == false) + value = "0"; + else + value = "1"; + sb.Append(Helper.StringBlankFillDigits4(value)); + this.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._9043_RecipeParameter, sb.ToString()); } public void TransferRecipeParameter5510_A() @@ -782,6 +789,7 @@ namespace INT_PT002.Forms structItem.DISP_JUDG_EMPTY_LEVEL1 = this.CurrentRecipe.DISP_JUDG_EMPTY_LEVEL1; structItem.DISP_JUDG_EMPTY_LEVEL2 = this.CurrentRecipe.DISP_JUDG_EMPTY_LEVEL2; structItem.DISP_HOLD_DELAY_MSEC = this.CurrentRecipe.DISP_HOLD_DELAY_MSEC; + structItem.DISP_OPT1 = this.CurrentRecipe.DISP_OPT1; structItem.DIFF_LR_SECOND = this.CurrentRecipe.DIFF_LR_SECOND; structItem.DIFF_LR_TOTAL = this.CurrentRecipe.DIFF_LR_TOTAL; @@ -826,6 +834,7 @@ namespace INT_PT002.Forms structItem.DISP_JUDG_EMPTY_LEVEL1 = item.DISP_JUDG_EMPTY_LEVEL1; structItem.DISP_JUDG_EMPTY_LEVEL2 = item.DISP_JUDG_EMPTY_LEVEL2; structItem.DISP_HOLD_DELAY_MSEC = item.DISP_HOLD_DELAY_MSEC; + structItem.DISP_OPT1 = item.DISP_OPT1; structItem.DIFF_LR_SECOND = item.DIFF_LR_SECOND; structItem.DIFF_LR_TOTAL = item.DIFF_LR_TOTAL; @@ -871,6 +880,7 @@ namespace INT_PT002.Forms item.DISP_JUDG_EMPTY_LEVEL1 = structItem.DISP_JUDG_EMPTY_LEVEL1; item.DISP_JUDG_EMPTY_LEVEL2 = structItem.DISP_JUDG_EMPTY_LEVEL2; item.DISP_HOLD_DELAY_MSEC = structItem.DISP_HOLD_DELAY_MSEC; + item.DISP_OPT1 = structItem.DISP_OPT1; item.DIFF_LR_SECOND = structItem.DIFF_LR_SECOND; item.DIFF_LR_TOTAL = structItem.DIFF_LR_TOTAL; diff --git a/INT_PT002/Forms/FormMainDisplay3.Designer.cs b/INT_PT002/Forms/FormMainDisplay3.Designer.cs index 047112f..25e0809 100644 --- a/INT_PT002/Forms/FormMainDisplay3.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay3.Designer.cs @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMainDisplay3)); this.smartForm1 = new SmartX.SmartForm(); + this.pictureBoxProgress0_2 = new System.Windows.Forms.PictureBox(); this.pictureBoxProgress2_910 = new System.Windows.Forms.PictureBox(); this.pictureBoxProgress2_67 = new System.Windows.Forms.PictureBox(); this.pictureBoxProgress2_8 = new System.Windows.Forms.PictureBox(); @@ -141,7 +142,6 @@ this.smartTimerLogin = new SmartX.SmartTimer(); this.smartTimerProgressBar = new SmartX.SmartTimer(); this.timerServer = new SmartX.SmartTimer(); - this.pictureBoxProgress0_2 = new System.Windows.Forms.PictureBox(); this.smartForm1.SuspendLayout(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -271,6 +271,14 @@ this.smartForm1.SpecialFunctionClickPointSize = 100; this.smartForm1.UseMainMenu = false; // + // pictureBoxProgress0_2 + // + this.pictureBoxProgress0_2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38))))); + this.pictureBoxProgress0_2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress0_2.Image"))); + this.pictureBoxProgress0_2.Location = new System.Drawing.Point(82, 282); + this.pictureBoxProgress0_2.Name = "pictureBoxProgress0_2"; + this.pictureBoxProgress0_2.Size = new System.Drawing.Size(190, 140); + // // pictureBoxProgress2_910 // this.pictureBoxProgress2_910.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38))))); @@ -798,7 +806,7 @@ this.labelExpireOfPassword.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelExpireOfPassword.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelExpireOfPassword.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelExpireOfPassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelExpireOfPassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelExpireOfPassword.LineSpacing = 0F; this.labelExpireOfPassword.Location = new System.Drawing.Point(787, 126); this.labelExpireOfPassword.Name = "labelExpireOfPassword"; @@ -909,7 +917,7 @@ this.progressBar1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(201)))), ((int)(((byte)(210)))), ((int)(((byte)(224))))); this.progressBar1.BarBackColor1 = System.Drawing.Color.White; this.progressBar1.BarBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.progressBar1.BarColor1 = System.Drawing.Color.LightSeaGreen; + this.progressBar1.BarColor1 = System.Drawing.Color.Teal; this.progressBar1.BarColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.progressBar1.BarStyle = SmartX.SmartProgressBar.BARTYPE.Flat; this.progressBar1.Direction = SmartX.SmartProgressBar.DIR.Horizontal; @@ -1197,9 +1205,9 @@ this.smartLabel27.PasswordChar = '\0'; this.smartLabel27.Radius = 3; this.smartLabel27.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel27.Size = new System.Drawing.Size(34, 41); + this.smartLabel27.Size = new System.Drawing.Size(64, 41); this.smartLabel27.TabIndex = 422; - this.smartLabel27.Text = "▼"; + this.smartLabel27.Text = "▼▲"; this.smartLabel27.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(222)))), ((int)(((byte)(226))))); this.smartLabel27.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel27.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1841,7 +1849,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(787, 90); this.labelUserID.Name = "labelUserID"; @@ -1933,7 +1941,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(787, 107); this.labelUserLevel.Name = "labelUserLevel"; @@ -2233,7 +2241,7 @@ this.labelTime.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelTime.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTime.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelTime.LineSpacing = 0F; this.labelTime.Location = new System.Drawing.Point(141, 119); this.labelTime.Name = "labelTime"; @@ -2670,14 +2678,6 @@ this.timerServer.TimeFormStringSeparator = ":"; this.timerServer.Tick += new System.EventHandler(this.timerServer_Tick); // - // pictureBoxProgress0_2 - // - this.pictureBoxProgress0_2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38))))); - this.pictureBoxProgress0_2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxProgress0_2.Image"))); - this.pictureBoxProgress0_2.Location = new System.Drawing.Point(82, 282); - this.pictureBoxProgress0_2.Name = "pictureBoxProgress0_2"; - this.pictureBoxProgress0_2.Size = new System.Drawing.Size(190, 140); - // // FormMainDisplay3 // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT_PT002/Forms/FormMainDisplay3.cs b/INT_PT002/Forms/FormMainDisplay3.cs index efd5f9d..29037b7 100644 --- a/INT_PT002/Forms/FormMainDisplay3.cs +++ b/INT_PT002/Forms/FormMainDisplay3.cs @@ -207,13 +207,13 @@ namespace INT_PT002.Forms { case Define.E_LanguageID.Korean: this.labelProgress0_1.Text = "초기상태"; - this.labelProgress1_1.Text = "이동 및 제품진입"; + this.labelProgress1_1.Text = "제품이동"; this.labelProgress2_1.Text = "측정 중"; - this.labelProgress3_1.Text = "배출 및 원점복귀"; + this.labelProgress3_1.Text = "배출"; break; case Define.E_LanguageID.English: this.labelProgress0_1.Text = "Ready"; - this.labelProgress1_1.Text = "Product entry"; + this.labelProgress1_1.Text = "Chamber shift"; this.labelProgress2_1.Text = "Measuring"; this.labelProgress3_1.Text = "Discharge"; break; @@ -1025,39 +1025,115 @@ namespace INT_PT002.Forms break; case Define.E_ProcessStatus._1_Ready: this.ProcessStatusStep1(status); + + this.pictureBoxProgress0_1.Visible = true; + this.pictureBoxProgress0_1.BringToFront(); + this.pictureBoxProgress0_2.Visible = false; + this.pictureBoxProgress1_34.Visible = false; + this.pictureBoxProgress2_5.Visible = false; + this.pictureBoxProgress2_67.Visible = false; + this.pictureBoxProgress2_8.Visible = false; + this.pictureBoxProgress2_910.Visible = false; + this.pictureBoxProgress3_11.Visible = false; break; case Define.E_ProcessStatus._2_ProductEntry: this.InitializeData(); this.ProcessStatusStep1(status); + + this.pictureBoxProgress0_1.Visible = false; + this.pictureBoxProgress0_2.Visible = true; + this.pictureBoxProgress0_2.BringToFront(); + this.pictureBoxProgress1_34.Visible = false; + this.pictureBoxProgress2_5.Visible = false; + this.pictureBoxProgress2_67.Visible = false; + this.pictureBoxProgress2_8.Visible = false; + this.pictureBoxProgress2_910.Visible = false; + this.pictureBoxProgress3_11.Visible = false; break; case Define.E_ProcessStatus._3_MoveToLeak: case Define.E_ProcessStatus._4_MoveToCheck: - case Define.E_ProcessStatus._5_ChamberMerge: this.ProcessStatusStep2(status); + + this.pictureBoxProgress0_1.Visible = false; + this.pictureBoxProgress0_2.Visible = false; + this.pictureBoxProgress1_34.Visible = true; + this.pictureBoxProgress1_34.BringToFront(); + this.pictureBoxProgress2_5.Visible = false; + this.pictureBoxProgress2_67.Visible = false; + this.pictureBoxProgress2_8.Visible = false; + this.pictureBoxProgress2_910.Visible = false; + this.pictureBoxProgress3_11.Visible = false; + break; + case Define.E_ProcessStatus._5_ChamberMerge: + this.ProcessStatusStep3(status); + + this.pictureBoxProgress0_1.Visible = false; + this.pictureBoxProgress0_2.Visible = false; + this.pictureBoxProgress1_34.Visible = false; + this.pictureBoxProgress2_5.Visible = true; + this.pictureBoxProgress2_5.BringToFront(); + this.pictureBoxProgress2_67.Visible = false; + this.pictureBoxProgress2_8.Visible = false; + this.pictureBoxProgress2_910.Visible = false; + this.pictureBoxProgress3_11.Visible = false; break; case Define.E_ProcessStatus._6_VacuumStart: - this.ProcessStatusStep3(status); - break; case Define.E_ProcessStatus._7_VacuumHold: this.ProcessStatusStep3(status); + + this.pictureBoxProgress0_1.Visible = false; + this.pictureBoxProgress0_2.Visible = false; + this.pictureBoxProgress1_34.Visible = false; + this.pictureBoxProgress2_5.Visible = false; + this.pictureBoxProgress2_67.Visible = true; + this.pictureBoxProgress2_67.BringToFront(); + this.pictureBoxProgress2_8.Visible = false; + this.pictureBoxProgress2_910.Visible = false; + this.pictureBoxProgress3_11.Visible = false; break; case Define.E_ProcessStatus._8_Judgment: this.ProcessStatusStep3(status); + + this.pictureBoxProgress0_1.Visible = false; + this.pictureBoxProgress0_2.Visible = false; + this.pictureBoxProgress1_34.Visible = false; + this.pictureBoxProgress2_5.Visible = false; + this.pictureBoxProgress2_67.Visible = false; + this.pictureBoxProgress2_8.Visible = true; + this.pictureBoxProgress2_8.BringToFront(); + this.pictureBoxProgress2_910.Visible = false; + this.pictureBoxProgress3_11.Visible = false; break; case Define.E_ProcessStatus._9_VacuumBreak: - this.ProcessStatusStep3(status); - break; case Define.E_ProcessStatus._10_ChamberRelease: this.ProcessStatusStep3(status); + + this.pictureBoxProgress0_1.Visible = false; + this.pictureBoxProgress0_2.Visible = false; + this.pictureBoxProgress1_34.Visible = false; + this.pictureBoxProgress2_5.Visible = false; + this.pictureBoxProgress2_67.Visible = false; + this.pictureBoxProgress2_8.Visible = false; + this.pictureBoxProgress2_910.Visible = true; + this.pictureBoxProgress2_910.BringToFront(); + this.pictureBoxProgress3_11.Visible = false; break; case Define.E_ProcessStatus._11_MoveToReady: this.ProcessStatusStep4(status); + + this.pictureBoxProgress0_1.Visible = false; + this.pictureBoxProgress0_2.Visible = false; + this.pictureBoxProgress1_34.Visible = false; + this.pictureBoxProgress2_5.Visible = false; + this.pictureBoxProgress2_67.Visible = false; + this.pictureBoxProgress2_8.Visible = false; + this.pictureBoxProgress2_910.Visible = false; + this.pictureBoxProgress3_11.Visible = true; + this.pictureBoxProgress3_11.BringToFront(); break; default: break; } - - this.ProcessStatusPicturBox(status); } public void UpdateDisplayProcessStatus1(Define.E_ProcessStatus status) {