From 3b52c42a9c8b2a29c657c07c166c4451a5d763fb Mon Sep 17 00:00:00 2001 From: Seonjae Date: Wed, 5 Apr 2023 15:01:56 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A0=88=EC=8B=9C=ED=94=BC=20=EB=AA=85?= =?UTF-8?q?=EC=B9=AD=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ControlMenuRecipeSetting.Designer.cs | 42 +++++++++---------- INT_PT002/Forms/FormMainDisplay2.cs | 7 +++- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs index decb640..fdf979b 100644 --- a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs +++ b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs @@ -814,7 +814,7 @@ this.smartLabel2.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel2.Size = new System.Drawing.Size(150, 30); this.smartLabel2.TabIndex = 107; - this.smartLabel2.Text = "Blowoff Valve"; + this.smartLabel2.Text = "Pressure break time"; this.smartLabel2.TextColor = System.Drawing.Color.White; this.smartLabel2.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -828,9 +828,9 @@ this.smartSeparatorLine2.Line2Color = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.smartSeparatorLine2.Line2Width = 1F; this.smartSeparatorLine2.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal; - this.smartSeparatorLine2.Location = new System.Drawing.Point(205, 200); + this.smartSeparatorLine2.Location = new System.Drawing.Point(252, 200); this.smartSeparatorLine2.Name = "smartSeparatorLine2"; - this.smartSeparatorLine2.Size = new System.Drawing.Size(547, 2); + this.smartSeparatorLine2.Size = new System.Drawing.Size(500, 2); this.smartSeparatorLine2.TabIndex = 120; this.smartSeparatorLine2.Text = "smartSeparatorLine2"; // @@ -872,7 +872,7 @@ this.smartLabel4.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel4.Size = new System.Drawing.Size(150, 30); this.smartLabel4.TabIndex = 107; - this.smartLabel4.Text = "HOLD_DELAY"; + this.smartLabel4.Text = "waiting time"; this.smartLabel4.TextColor = System.Drawing.Color.White; this.smartLabel4.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -894,7 +894,7 @@ this.smartLabel26.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel26.Size = new System.Drawing.Size(150, 30); this.smartLabel26.TabIndex = 105; - this.smartLabel26.Text = "Hold Valve2"; + this.smartLabel26.Text = "2nd holding delay time"; this.smartLabel26.TextColor = System.Drawing.Color.White; this.smartLabel26.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel26.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -914,9 +914,9 @@ this.smartLabel6.PasswordChar = '\0'; this.smartLabel6.Radius = 3; this.smartLabel6.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel6.Size = new System.Drawing.Size(180, 30); + this.smartLabel6.Size = new System.Drawing.Size(230, 30); this.smartLabel6.TabIndex = 119; - this.smartLabel6.Text = "Differential pressure sensor"; + this.smartLabel6.Text = "Differential pressure measurement"; this.smartLabel6.TextColor = System.Drawing.Color.Gainsboro; this.smartLabel6.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -984,7 +984,7 @@ this.smartLabel24.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel24.Size = new System.Drawing.Size(150, 30); this.smartLabel24.TabIndex = 103; - this.smartLabel24.Text = "Hold Valve1"; + this.smartLabel24.Text = "Pressure holding time"; this.smartLabel24.TextColor = System.Drawing.Color.White; this.smartLabel24.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel24.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -998,9 +998,9 @@ this.smartSeparatorLine1.Line2Color = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.smartSeparatorLine1.Line2Width = 1F; this.smartSeparatorLine1.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal; - this.smartSeparatorLine1.Location = new System.Drawing.Point(172, 91); + this.smartSeparatorLine1.Location = new System.Drawing.Point(252, 91); this.smartSeparatorLine1.Name = "smartSeparatorLine1"; - this.smartSeparatorLine1.Size = new System.Drawing.Size(580, 2); + this.smartSeparatorLine1.Size = new System.Drawing.Size(500, 2); this.smartSeparatorLine1.TabIndex = 110; this.smartSeparatorLine1.Text = "smartSeparatorLine1"; // @@ -1042,7 +1042,7 @@ this.smartLabel22.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel22.Size = new System.Drawing.Size(150, 30); this.smartLabel22.TabIndex = 101; - this.smartLabel22.Text = "Relief Valve"; + this.smartLabel22.Text = "Pressure relief time"; this.smartLabel22.TextColor = System.Drawing.Color.White; this.smartLabel22.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel22.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1064,7 +1064,7 @@ this.smartLabel8.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel8.Size = new System.Drawing.Size(150, 30); this.smartLabel8.TabIndex = 105; - this.smartLabel8.Text = "LR_MEAN"; + this.smartLabel8.Text = "LR. Average"; this.smartLabel8.TextColor = System.Drawing.Color.White; this.smartLabel8.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1084,9 +1084,9 @@ this.smartLabel1.PasswordChar = '\0'; this.smartLabel1.Radius = 3; this.smartLabel1.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.smartLabel1.Size = new System.Drawing.Size(150, 30); + this.smartLabel1.Size = new System.Drawing.Size(230, 30); this.smartLabel1.TabIndex = 109; - this.smartLabel1.Text = "Displacement sensor"; + this.smartLabel1.Text = "Product displacement measurement"; this.smartLabel1.TextColor = System.Drawing.Color.Gainsboro; this.smartLabel1.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -1154,7 +1154,7 @@ this.smartLabel11.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel11.Size = new System.Drawing.Size(150, 30); this.smartLabel11.TabIndex = 103; - this.smartLabel11.Text = "LR_TOTAL"; + this.smartLabel11.Text = "Sum of LR."; this.smartLabel11.TextColor = System.Drawing.Color.White; this.smartLabel11.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel11.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1221,7 +1221,7 @@ this.smartLabel3.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel3.Size = new System.Drawing.Size(150, 30); this.smartLabel3.TabIndex = 107; - this.smartLabel3.Text = "HOLD_DELAY"; + this.smartLabel3.Text = "waiting time"; this.smartLabel3.TextColor = System.Drawing.Color.White; this.smartLabel3.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1243,7 +1243,7 @@ this.smartLabel13.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel13.Size = new System.Drawing.Size(150, 30); this.smartLabel13.TabIndex = 101; - this.smartLabel13.Text = "LR_SECOND"; + this.smartLabel13.Text = "LR. Per second"; this.smartLabel13.TextColor = System.Drawing.Color.White; this.smartLabel13.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel13.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1334,7 +1334,7 @@ this.smartLabel5.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel5.Size = new System.Drawing.Size(150, 30); this.smartLabel5.TabIndex = 105; - this.smartLabel5.Text = "EMPTY_LEVEL"; + this.smartLabel5.Text = "Initial Product Height"; this.smartLabel5.TextColor = System.Drawing.Color.White; this.smartLabel5.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1356,7 +1356,7 @@ this.smartLabel15.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel15.Size = new System.Drawing.Size(150, 30); this.smartLabel15.TabIndex = 103; - this.smartLabel15.Text = "Pressure Level"; + this.smartLabel15.Text = "Pressure"; this.smartLabel15.TextColor = System.Drawing.Color.White; this.smartLabel15.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel15.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1401,7 +1401,7 @@ this.smartLabel9.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel9.Size = new System.Drawing.Size(150, 30); this.smartLabel9.TabIndex = 101; - this.smartLabel9.Text = "STD_LEVEL"; + this.smartLabel9.Text = "STD"; this.smartLabel9.TextColor = System.Drawing.Color.White; this.smartLabel9.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1423,7 +1423,7 @@ this.smartLabel7.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel7.Size = new System.Drawing.Size(150, 30); this.smartLabel7.TabIndex = 103; - this.smartLabel7.Text = "MIN_LEVEL"; + this.smartLabel7.Text = "min. rate of change"; this.smartLabel7.TextColor = System.Drawing.Color.White; this.smartLabel7.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index c2c9cf5..eb58ded 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -849,7 +849,7 @@ namespace INT_PT002.Forms { this.smartTimerLogin.Stop(); - this.Login(); + //this.Login(); } #endregion @@ -968,5 +968,10 @@ namespace INT_PT002.Forms this.labelAlarm.Location = new Point(3, 27); } } + + private void smartButton5_Click(object sender, EventArgs e) + { + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Initial); + } } } \ No newline at end of file