diff --git a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs index ba3fac1..532c106 100644 --- a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs +++ b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.Designer.cs @@ -956,7 +956,7 @@ this.buttonOut10.ButtonDownColor = System.Drawing.Color.DarkGray; this.buttonOut10.ButtonImageAutoSize = true; this.buttonOut10.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.buttonOut10.ButtonText = "None"; + this.buttonOut10.ButtonText = "Sol Valve"; this.buttonOut10.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonOut10.GroupID = 0; this.buttonOut10.ImageDisable = null; diff --git a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs index bcdce75..99136ef 100644 --- a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs +++ b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs @@ -154,7 +154,7 @@ namespace INT_PT002.Controls // 압력센서 데이터 public void UpdateDisplayPresData(Collection datas) { - for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++) + for (int i = 0; i < this.CollLabelVacu.Count; i++) this.CollLabelVacu[i].Text = datas[i].WorkingChamber; } public void UpdateDisplayPresData1(LeakData1 data) diff --git a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs index 9962de6..3783f29 100644 --- a/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs +++ b/INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs @@ -147,9 +147,15 @@ namespace INT_PT002.Controls this.labelDispHoldDelay.Text = value; // OPT1 if (item.DISP_OPT1 == true) + { + this.buttonDispOPT1.ButtonText = "ON"; this.buttonDispOPT1.ButtonDown(); + } else + { + this.buttonDispOPT1.ButtonText = "OFF"; this.buttonDispOPT1.ButtonUp(); + } // Differential Pressure Sensor // LR_Second @@ -578,9 +584,9 @@ namespace INT_PT002.Controls { string value = "", before = "", after = ""; - if (this.buttonDispOPT1.ButtonStatus == SmartButton.BUTSTATUS.DOWN) { + this.buttonDispOPT1.ButtonText = "ON"; before = "false"; this.ParentForm.ParentForm.CurrentRecipe.DISP_OPT1 = true; value = Helper.StringBlankFillDigits4("1"); @@ -588,6 +594,7 @@ namespace INT_PT002.Controls } else { + this.buttonDispOPT1.ButtonText = "OFF"; before = "true"; this.ParentForm.ParentForm.CurrentRecipe.DISP_OPT1 = false; value = Helper.StringBlankFillDigits4("0"); diff --git a/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs b/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs index 4520324..0b023e6 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemInformation.Designer.cs @@ -71,7 +71,6 @@ this.labelDisplayVersion = new SmartX.SmartLabel(); this.buttonUpdateDisplay = new SmartX.SmartButton(); this.smartKeyboard1 = new SmartX.SmartKeyboard(); - this.timer = new SmartX.SmartTimer(); this.smartGroupBox1.SuspendLayout(); this.smartGroupBox4.SuspendLayout(); this.smartGroupBox3.SuspendLayout(); @@ -135,7 +134,7 @@ this.labelCurrentTime.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.labelCurrentTime.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelCurrentTime.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelCurrentTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelCurrentTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelCurrentTime.LineSpacing = 0F; this.labelCurrentTime.Location = new System.Drawing.Point(84, 5); this.labelCurrentTime.Name = "labelCurrentTime"; @@ -909,7 +908,7 @@ this.smartLabel20.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel20.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel20.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel20.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel20.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel20.LineSpacing = 0F; this.smartLabel20.Location = new System.Drawing.Point(53, 50); this.smartLabel20.Name = "smartLabel20"; @@ -932,7 +931,7 @@ this.labelContact1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelContact1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelContact1.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelContact1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelContact1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelContact1.LineSpacing = 0F; this.labelContact1.Location = new System.Drawing.Point(189, 50); this.labelContact1.Name = "labelContact1"; @@ -955,7 +954,7 @@ this.labelContact2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelContact2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelContact2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelContact2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelContact2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelContact2.LineSpacing = 0F; this.labelContact2.Location = new System.Drawing.Point(189, 80); this.labelContact2.Name = "labelContact2"; @@ -978,7 +977,7 @@ this.smartLabel25.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel25.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel25.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel25.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel25.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel25.LineSpacing = 0F; this.smartLabel25.Location = new System.Drawing.Point(53, 110); this.smartLabel25.Name = "smartLabel25"; @@ -1001,7 +1000,7 @@ this.labelContact4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelContact4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelContact4.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelContact4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelContact4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelContact4.LineSpacing = 0F; this.labelContact4.Location = new System.Drawing.Point(189, 140); this.labelContact4.Name = "labelContact4"; @@ -1024,7 +1023,7 @@ this.labelContact3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelContact3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelContact3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelContact3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelContact3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelContact3.LineSpacing = 0F; this.labelContact3.Location = new System.Drawing.Point(189, 110); this.labelContact3.Name = "labelContact3"; @@ -1047,7 +1046,7 @@ this.labelContact5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelContact5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelContact5.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelContact5.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelContact5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelContact5.LineSpacing = 0F; this.labelContact5.Location = new System.Drawing.Point(189, 170); this.labelContact5.Name = "labelContact5"; @@ -1070,7 +1069,7 @@ this.smartLabel24.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel24.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel24.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel24.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel24.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel24.LineSpacing = 0F; this.smartLabel24.Location = new System.Drawing.Point(53, 200); this.smartLabel24.Name = "smartLabel24"; @@ -1093,7 +1092,7 @@ this.labelContact6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelContact6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelContact6.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelContact6.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelContact6.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelContact6.LineSpacing = 0F; this.labelContact6.Location = new System.Drawing.Point(189, 200); this.labelContact6.Name = "labelContact6"; @@ -1116,7 +1115,7 @@ this.smartLabel23.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel23.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel23.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel23.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel23.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel23.LineSpacing = 0F; this.smartLabel23.Location = new System.Drawing.Point(53, 170); this.smartLabel23.Name = "smartLabel23"; @@ -1139,7 +1138,7 @@ this.smartLabel21.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel21.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel21.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel21.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel21.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel21.LineSpacing = 0F; this.smartLabel21.Location = new System.Drawing.Point(53, 80); this.smartLabel21.Name = "smartLabel21"; @@ -1162,7 +1161,7 @@ this.smartLabel22.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel22.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel22.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel22.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel22.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel22.LineSpacing = 0F; this.smartLabel22.Location = new System.Drawing.Point(53, 140); this.smartLabel22.Name = "smartLabel22"; @@ -1255,7 +1254,7 @@ this.smartLabel3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel3.LineSpacing = 0F; this.smartLabel3.Location = new System.Drawing.Point(53, 49); this.smartLabel3.Name = "smartLabel3"; @@ -1278,7 +1277,7 @@ this.smartLabel4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel4.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel4.LineSpacing = 0F; this.smartLabel4.Location = new System.Drawing.Point(53, 79); this.smartLabel4.Name = "smartLabel4"; @@ -1336,7 +1335,7 @@ this.smartLabel5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel5.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel5.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel5.LineSpacing = 0F; this.smartLabel5.Location = new System.Drawing.Point(53, 109); this.smartLabel5.Name = "smartLabel5"; @@ -1359,7 +1358,7 @@ this.smartLabel6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel6.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel6.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel6.LineSpacing = 0F; this.smartLabel6.Location = new System.Drawing.Point(189, 49); this.smartLabel6.Name = "smartLabel6"; @@ -1382,7 +1381,7 @@ this.smartLabel7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel7.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel7.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel7.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel7.LineSpacing = 0F; this.smartLabel7.Location = new System.Drawing.Point(53, 139); this.smartLabel7.Name = "smartLabel7"; @@ -1405,7 +1404,7 @@ this.labelSerialNo.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelSerialNo.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelSerialNo.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelSerialNo.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelSerialNo.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelSerialNo.LineSpacing = 0F; this.labelSerialNo.Location = new System.Drawing.Point(189, 79); this.labelSerialNo.Name = "labelSerialNo"; @@ -1429,7 +1428,7 @@ this.smartLabel9.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel9.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel9.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel9.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel9.LineSpacing = 0F; this.smartLabel9.Location = new System.Drawing.Point(189, 109); this.smartLabel9.Name = "smartLabel9"; @@ -1452,7 +1451,7 @@ this.smartLabel10.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel10.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel10.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel10.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel10.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel10.LineSpacing = 0F; this.smartLabel10.Location = new System.Drawing.Point(189, 139); this.smartLabel10.Name = "smartLabel10"; @@ -1475,7 +1474,7 @@ this.smartLabel11.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel11.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel11.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel11.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel11.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel11.LineSpacing = 0F; this.smartLabel11.Location = new System.Drawing.Point(403, 109); this.smartLabel11.Name = "smartLabel11"; @@ -1498,7 +1497,7 @@ this.smartLabel12.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.smartLabel12.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel12.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel12.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel12.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel12.LineSpacing = 0F; this.smartLabel12.Location = new System.Drawing.Point(403, 139); this.smartLabel12.Name = "smartLabel12"; @@ -1521,7 +1520,7 @@ this.labelControlVersion.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelControlVersion.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelControlVersion.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelControlVersion.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelControlVersion.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelControlVersion.LineSpacing = 0F; this.labelControlVersion.Location = new System.Drawing.Point(539, 109); this.labelControlVersion.Name = "labelControlVersion"; @@ -1544,7 +1543,7 @@ this.labelDisplayVersion.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelDisplayVersion.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelDisplayVersion.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelDisplayVersion.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelDisplayVersion.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelDisplayVersion.LineSpacing = 0F; this.labelDisplayVersion.Location = new System.Drawing.Point(539, 139); this.labelDisplayVersion.Name = "labelDisplayVersion"; @@ -1641,15 +1640,6 @@ this.smartKeyboard1.OnXKeyClick += new System.EventHandler(this.smartKeyboard1_OnXKeyClick); this.smartKeyboard1.OnLabelKeyPress += new System.Windows.Forms.KeyPressEventHandler(this.smartKeyboard1_OnLabelKeyPress); // - // timer - // - this.timer.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; - this.timer.Interval = 1000; - this.timer.IntervalSeries = null; - this.timer.TimeCount = ((long)(1000000)); - this.timer.TimeFormStringSeparator = ":"; - this.timer.Tick += new System.EventHandler(this.timer_Tick); - // // ControlMenuSystemInformation // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1708,7 +1698,6 @@ private SmartX.SmartUpDown upDownHour; private SmartX.SmartButton buttonSave; private SmartX.SmartLabel labelCurrentTime; - private SmartX.SmartTimer timer; private SmartX.SmartButton smartButton1; } } diff --git a/INT_PT002/Controls/System/ControlMenuSystemInformation.cs b/INT_PT002/Controls/System/ControlMenuSystemInformation.cs index 6100724..bedc648 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemInformation.cs +++ b/INT_PT002/Controls/System/ControlMenuSystemInformation.cs @@ -33,8 +33,6 @@ namespace INT_PT002.Controls this.ParentForm = parent; this.Initialize(); - - this.timer.Start(); } #endregion @@ -77,6 +75,13 @@ namespace INT_PT002.Controls this.labelControlVersion.Text = version; } + public void UpdateDisplayTime(DateTime time) + { + this.labelCurrentTime.Text = time.ToString("yyyy-MM-dd HH:mm:ss"); + + this.upDownHour.Value = time.Hour; + this.upDownMinute.Value = time.Minute; + } private Define.E_UpdateCheck CheckDisplayError() { @@ -279,8 +284,6 @@ namespace INT_PT002.Controls this.upDownDate.Value = currentTime.Day; this.upDownHour.Value = currentTime.Hour; this.upDownMinute.Value = currentTime.Minute; - if(this.timer.IsStart == true) - this.timer.Start(); this.buttonSave.Visible = false; } @@ -351,8 +354,8 @@ namespace INT_PT002.Controls private void buttonTimeSetting_Click(object sender, EventArgs e) { - if (this.timer.IsStart == true) - this.timer.Stop(); + if (this.ParentForm.ParentForm.smartTimerSystem.IsStart == true) + this.ParentForm.ParentForm.smartTimerSystem.Stop(); this.buttonSave.Visible = true; } private void buttonSave_Click(object sender, EventArgs e) @@ -370,21 +373,9 @@ namespace INT_PT002.Controls } this.ParentForm.ParentForm.SetCurrentTime(time); - this.timer.Start(); + this.ParentForm.ParentForm.smartTimerSystem.Start(); this.buttonSave.Visible = false; } - private void timer_Tick(object sender, EventArgs e) - { - DateTime currentTime = DateTime.Now; - - this.labelCurrentTime.Text = currentTime.ToString("yyyy-MM-dd HH:mm:ss"); - - this.upDownHour.Value = currentTime.Hour; - this.upDownMinute.Value = currentTime.Minute; - - this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateDisplayTime(); - this.ParentForm.UpdateDisplayTime(); - } #endregion private void smartButton1_Click(object sender, EventArgs e) diff --git a/INT_PT002/Controls/System/ControlMenuSystemInformation.resx b/INT_PT002/Controls/System/ControlMenuSystemInformation.resx index 9c07f84..371b013 100644 --- a/INT_PT002/Controls/System/ControlMenuSystemInformation.resx +++ b/INT_PT002/Controls/System/ControlMenuSystemInformation.resx @@ -532,9 +532,6 @@ rkJggg== - - 17, 17 - 49 diff --git a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs index f3e0e5e..f491c52 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs @@ -72,19 +72,19 @@ // buttonAdmin // this.buttonAdmin.BackGround = this.smartGroupBox1; - this.buttonAdmin.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.buttonAdmin.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.buttonAdmin.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.buttonAdmin.ButtonDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(76)))), ((int)(((byte)(129))))); this.buttonAdmin.ButtonImageAutoSize = true; this.buttonAdmin.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.buttonAdmin.ButtonText = "admin"; + this.buttonAdmin.ButtonText = ""; this.buttonAdmin.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAdmin.Font = new System.Drawing.Font("New Gulim", 13F, System.Drawing.FontStyle.Bold); this.buttonAdmin.GroupID = 0; this.buttonAdmin.ImageDisable = null; this.buttonAdmin.ImageDown = null; this.buttonAdmin.ImageUp = null; - this.buttonAdmin.Location = new System.Drawing.Point(23, 54); + this.buttonAdmin.Location = new System.Drawing.Point(567, 1); this.buttonAdmin.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonAdmin.Name = "buttonAdmin"; this.buttonAdmin.NestedClickEventPrevent = false; @@ -94,7 +94,7 @@ this.buttonAdmin.RepeatIntervalAccelerate = null; this.buttonAdmin.RoundSize = 10; this.buttonAdmin.SafeInterval = 200; - this.buttonAdmin.Size = new System.Drawing.Size(80, 80); + this.buttonAdmin.Size = new System.Drawing.Size(80, 32); this.buttonAdmin.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonAdmin.TabIndex = 99; this.buttonAdmin.Text = null; diff --git a/INT_PT002/Forms/FormMain.Designer.cs b/INT_PT002/Forms/FormMain.Designer.cs index 1b02d73..0a48124 100644 --- a/INT_PT002/Forms/FormMain.Designer.cs +++ b/INT_PT002/Forms/FormMain.Designer.cs @@ -39,6 +39,7 @@ this.smartModbus = new SmartX.SmartModbus(); this.smartTCPMultiServer = new SmartX.SmartTCPMultiServer(this.components); this.timerClientTryConnect = new System.Windows.Forms.Timer(); + this.smartTimerSystem = new SmartX.SmartTimer(); this.SuspendLayout(); // // smartForm1 @@ -117,6 +118,15 @@ this.timerClientTryConnect.Interval = 2000; this.timerClientTryConnect.Tick += new System.EventHandler(this.timerClientTryConnect_Tick); // + // smartTimerSystem + // + this.smartTimerSystem.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; + this.smartTimerSystem.Interval = 1000; + this.smartTimerSystem.IntervalSeries = null; + this.smartTimerSystem.TimeCount = ((long)(1000000)); + this.smartTimerSystem.TimeFormStringSeparator = ":"; + this.smartTimerSystem.Tick += new System.EventHandler(this.smartTimerSystem_Tick); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -142,6 +152,7 @@ private System.Windows.Forms.Timer timerClientTryConnect; public SmartX.SmartConfigs smartConfigs; public SmartX.SmartTCPMultiServer smartTCPMultiServer; + public SmartX.SmartTimer smartTimerSystem; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs index 6369a8b..2e8e375 100644 --- a/INT_PT002/Forms/FormMain.cs +++ b/INT_PT002/Forms/FormMain.cs @@ -108,6 +108,9 @@ namespace INT_PT002.Forms #region Constructor public FormMain() { + // Splash start + SmartSplash.Start(SmartX.SmartSplash.BuiltInLoadingImages.LOADING1_SMALL, 300); + InitializeComponent(); } #endregion @@ -4114,6 +4117,9 @@ namespace INT_PT002.Forms // 통신 OPEN this.OpenSmartUartLink(); + // Splash finish + SmartSplash.Finish(); + this.smartForm1.Show(1); // 초기 파라미터 전송 @@ -4126,6 +4132,9 @@ namespace INT_PT002.Forms //UserManager.UserManager_GetUserListName(); this.timerUserList.Enabled = true; + // System Timer + this.smartTimerSystem.Start(); + this.ModbusOpen(); } #endregion @@ -4300,6 +4309,13 @@ namespace INT_PT002.Forms this.DelegateTimerTryConnect(false); this.EthernetClientConnect(); } + private void smartTimerSystem_Tick(object sender, EventArgs e) + { + DateTime time = DateTime.Now; + + this.ChildFormMainDisplay.UpdateDisplayTime(time); + this.ChildFormMenu.UpdateDisplayTime(time); + } #region UserManagerEvent private void UserManager_UserListLogoutDataEvent(int status) diff --git a/INT_PT002/Forms/FormMain.resx b/INT_PT002/Forms/FormMain.resx index 0b8c38c..16789d4 100644 --- a/INT_PT002/Forms/FormMain.resx +++ b/INT_PT002/Forms/FormMain.resx @@ -233,6 +233,9 @@ 1047, 17 + + 17, 56 + WEBPAD @@ -240,6 +243,6 @@ False - 44 + 71 \ No newline at end of file diff --git a/INT_PT002/Forms/FormMainDisplay3.Designer.cs b/INT_PT002/Forms/FormMainDisplay3.Designer.cs index 25e0809..f6fa31c 100644 --- a/INT_PT002/Forms/FormMainDisplay3.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay3.Designer.cs @@ -136,12 +136,13 @@ this.buttonInspection = new SmartX.SmartButton(); this.buttonClear = new SmartX.SmartButton(); this.buttonMenu = new SmartX.SmartButton(); - this.buttonDisplay = new SmartX.SmartButton(); + this.buttonTest = new SmartX.SmartButton(); this.smartTimerAlarm = new SmartX.SmartTimer(); this.smartTimerMessageShow = new SmartX.SmartTimer(); this.smartTimerLogin = new SmartX.SmartTimer(); this.smartTimerProgressBar = new SmartX.SmartTimer(); this.timerServer = new SmartX.SmartTimer(); + this.smartTimerTest = new SmartX.SmartTimer(); this.smartForm1.SuspendLayout(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -257,7 +258,7 @@ this.smartForm1.Controls.Add(this.buttonInspection); this.smartForm1.Controls.Add(this.buttonClear); this.smartForm1.Controls.Add(this.buttonMenu); - this.smartForm1.Controls.Add(this.buttonDisplay); + this.smartForm1.Controls.Add(this.buttonTest); this.smartForm1.GradationColorBottom = System.Drawing.Color.Gray; this.smartForm1.GradationColorTop = System.Drawing.Color.White; this.smartForm1.LCDDirection = SmartXUIBase.SmartUIControlFormBase.LCDDIRECTIONS.HORIZONTAL; @@ -838,7 +839,7 @@ this.buttonModbus.ImageDisable = null; this.buttonModbus.ImageDown = null; this.buttonModbus.ImageUp = null; - this.buttonModbus.Location = new System.Drawing.Point(917, 286); + this.buttonModbus.Location = new System.Drawing.Point(917, 352); this.buttonModbus.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonModbus.Name = "buttonModbus"; this.buttonModbus.NestedClickEventPrevent = false; @@ -1199,7 +1200,7 @@ this.smartLabel27.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.smartLabel27.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); this.smartLabel27.LineSpacing = 0F; - this.smartLabel27.Location = new System.Drawing.Point(410, 445); + this.smartLabel27.Location = new System.Drawing.Point(406, 445); this.smartLabel27.Name = "smartLabel27"; this.smartLabel27.OverlapOptimize = true; this.smartLabel27.PasswordChar = '\0'; @@ -2596,42 +2597,41 @@ this.buttonMenu.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonMenu.Click += new System.EventHandler(this.buttonMenu_Click); // - // buttonDisplay + // buttonTest // - this.buttonDisplay.BackGround = this.smartForm1; - this.buttonDisplay.BackGroundColor = System.Drawing.Color.Gray; - this.buttonDisplay.ButtonColor = System.Drawing.Color.Teal; - this.buttonDisplay.ButtonDownColor = System.Drawing.Color.DarkSlateGray; - this.buttonDisplay.ButtonImageAutoSize = true; - this.buttonDisplay.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; - this.buttonDisplay.ButtonText = "Display"; - this.buttonDisplay.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonDisplay.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.buttonDisplay.GroupID = 0; - this.buttonDisplay.ImageDisable = null; - this.buttonDisplay.ImageDown = null; - this.buttonDisplay.ImageUp = null; - this.buttonDisplay.Location = new System.Drawing.Point(917, 352); - this.buttonDisplay.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonDisplay.Name = "buttonDisplay"; - this.buttonDisplay.NestedClickEventPrevent = false; - this.buttonDisplay.OutlinePixel = 2; - this.buttonDisplay.OverlapOptimize = true; - this.buttonDisplay.RepeatInterval = 200; - this.buttonDisplay.RepeatIntervalAccelerate = null; - this.buttonDisplay.RoundSize = 10; - this.buttonDisplay.SafeInterval = 200; - this.buttonDisplay.Size = new System.Drawing.Size(100, 60); - this.buttonDisplay.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonDisplay.TabIndex = 55; - this.buttonDisplay.Text = null; - this.buttonDisplay.TextColor = System.Drawing.Color.White; - this.buttonDisplay.TextColorDisable = System.Drawing.Color.Gainsboro; - this.buttonDisplay.TextDownColor = System.Drawing.Color.Chartreuse; - this.buttonDisplay.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonDisplay.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonDisplay.Visible = false; - this.buttonDisplay.Click += new System.EventHandler(this.buttonDisplayGraph_Click); + this.buttonTest.BackGround = this.smartForm1; + this.buttonTest.BackGroundColor = System.Drawing.Color.Gray; + this.buttonTest.ButtonColor = System.Drawing.Color.Teal; + this.buttonTest.ButtonDownColor = System.Drawing.Color.DarkSlateGray; + this.buttonTest.ButtonImageAutoSize = true; + this.buttonTest.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.buttonTest.ButtonText = "Test"; + this.buttonTest.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonTest.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.buttonTest.GroupID = 0; + this.buttonTest.ImageDisable = null; + this.buttonTest.ImageDown = null; + this.buttonTest.ImageUp = null; + this.buttonTest.Location = new System.Drawing.Point(917, 286); + this.buttonTest.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; + this.buttonTest.Name = "buttonTest"; + this.buttonTest.NestedClickEventPrevent = false; + this.buttonTest.OutlinePixel = 2; + this.buttonTest.OverlapOptimize = true; + this.buttonTest.RepeatInterval = 200; + this.buttonTest.RepeatIntervalAccelerate = null; + this.buttonTest.RoundSize = 10; + this.buttonTest.SafeInterval = 200; + this.buttonTest.Size = new System.Drawing.Size(100, 60); + this.buttonTest.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonTest.TabIndex = 55; + this.buttonTest.Text = null; + this.buttonTest.TextColor = System.Drawing.Color.White; + this.buttonTest.TextColorDisable = System.Drawing.Color.Gainsboro; + this.buttonTest.TextDownColor = System.Drawing.Color.Chartreuse; + this.buttonTest.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonTest.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click); // // smartTimerAlarm // @@ -2678,6 +2678,15 @@ this.timerServer.TimeFormStringSeparator = ":"; this.timerServer.Tick += new System.EventHandler(this.timerServer_Tick); // + // smartTimerTest + // + this.smartTimerTest.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; + this.smartTimerTest.Interval = 300000; + this.smartTimerTest.IntervalSeries = null; + this.smartTimerTest.TimeCount = ((long)(1000000)); + this.smartTimerTest.TimeFormStringSeparator = ":"; + this.smartTimerTest.Tick += new System.EventHandler(this.smartTimerTest_Tick); + // // FormMainDisplay3 // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -2711,7 +2720,7 @@ private SmartX.SmartButton buttonInspection; private SmartX.SmartButton buttonClear; private SmartX.SmartButton buttonMenu; - private SmartX.SmartButton buttonDisplay; + private SmartX.SmartButton buttonTest; private SmartX.SmartLabel labelPressureWorking10; private SmartX.SmartLabel labelPressureWorking9; private SmartX.SmartLabel labelPressureWorking8; @@ -2810,5 +2819,6 @@ private System.Windows.Forms.PictureBox pictureBoxProgress2_8; private System.Windows.Forms.PictureBox pictureBoxProgress2_910; private System.Windows.Forms.PictureBox pictureBoxProgress0_2; + private SmartX.SmartTimer smartTimerTest; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMainDisplay3.cs b/INT_PT002/Forms/FormMainDisplay3.cs index 29037b7..5ca6494 100644 --- a/INT_PT002/Forms/FormMainDisplay3.cs +++ b/INT_PT002/Forms/FormMainDisplay3.cs @@ -26,6 +26,7 @@ namespace INT_PT002.Forms private string MessageBoxRange; private int testIndex; private Define.E_ProcessStatus CurrentProcessStatus; + private bool IsTestMode; private Color ColorProgressOn; private Color ColorProgressOff; @@ -79,6 +80,7 @@ namespace INT_PT002.Forms { int testIndex = 0; this.BeforeEthernetStatus = false; + this.IsTestMode = false; this.FlagIgnoreCNT = 0; this.MessageBoxRange = ""; @@ -1361,84 +1363,164 @@ namespace INT_PT002.Forms } public void UpdateDisplayJudgmentData1(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[0]); - this.CollectionLabelResult[0].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[0]); + this.CollectionLabelResult[0].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay1(data); + this.ChildControl.UpdateStartLeakDataDisplay1(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Ng, this.CollectionLabelResult[0]); + this.CollectionLabelResult[0].Visible = true; + } } public void UpdateDisplayJudgmentData2(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[1]); - this.CollectionLabelResult[1].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[1]); + this.CollectionLabelResult[1].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay2(data); + this.ChildControl.UpdateStartLeakDataDisplay2(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Pass, this.CollectionLabelResult[1]); + this.CollectionLabelResult[1].Visible = true; + } } public void UpdateDisplayJudgmentData3(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[2]); - this.CollectionLabelResult[2].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[2]); + this.CollectionLabelResult[2].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay3(data); + this.ChildControl.UpdateStartLeakDataDisplay3(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Pass, this.CollectionLabelResult[2]); + this.CollectionLabelResult[2].Visible = true; + } } public void UpdateDisplayJudgmentData4(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[3]); - this.CollectionLabelResult[3].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[3]); + this.CollectionLabelResult[3].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay4(data); + this.ChildControl.UpdateStartLeakDataDisplay4(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Ng, this.CollectionLabelResult[3]); + this.CollectionLabelResult[3].Visible = true; + } } public void UpdateDisplayJudgmentData5(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[4]); - this.CollectionLabelResult[4].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[4]); + this.CollectionLabelResult[4].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay5(data); + this.ChildControl.UpdateStartLeakDataDisplay5(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Pass, this.CollectionLabelResult[4]); + this.CollectionLabelResult[4].Visible = true; + } } public void UpdateDisplayJudgmentData6(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[5]); - this.CollectionLabelResult[5].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[5]); + this.CollectionLabelResult[5].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay6(data); + this.ChildControl.UpdateStartLeakDataDisplay6(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Pass, this.CollectionLabelResult[5]); + this.CollectionLabelResult[5].Visible = true; + } } public void UpdateDisplayJudgmentData7(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[6]); - this.CollectionLabelResult[6].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[6]); + this.CollectionLabelResult[6].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay7(data); + this.ChildControl.UpdateStartLeakDataDisplay7(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Pass, this.CollectionLabelResult[6]); + this.CollectionLabelResult[6].Visible = true; + } } public void UpdateDisplayJudgmentData8(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[7]); - this.CollectionLabelResult[7].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[7]); + this.CollectionLabelResult[7].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay8(data); + this.ChildControl.UpdateStartLeakDataDisplay8(data); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Ng, this.CollectionLabelResult[7]); + this.CollectionLabelResult[7].Visible = true; + } } public void UpdateDisplayJudgmentData9(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[8]); - this.CollectionLabelResult[8].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[8]); + this.CollectionLabelResult[8].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay9(data); - this.SetLabelNumberColor(8, this.ColorNumberUnSelected); + this.ChildControl.UpdateStartLeakDataDisplay9(data); + this.SetLabelNumberColor(8, this.ColorNumberUnSelected); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Pass, this.CollectionLabelResult[8]); + this.CollectionLabelResult[8].Visible = true; + } } public void UpdateDisplayJudgmentData10(LeakData1 data) { - this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[9]); - this.CollectionLabelResult[9].Visible = true; + if (this.IsTestMode == false) + { + this.GetJudgmentResult(data.Judgment, this.CollectionLabelResult[9]); + this.CollectionLabelResult[9].Visible = true; - this.ChildControl.UpdateStartLeakDataDisplay10(data); - this.SetLabelNumberColor(9, this.ColorNumberUnSelected); + this.ChildControl.UpdateStartLeakDataDisplay10(data); + this.SetLabelNumberColor(9, this.ColorNumberUnSelected); + } + else + { + this.GetJudgmentResult(Define.E_JudgmentStatus.Pass, this.CollectionLabelResult[9]); + this.CollectionLabelResult[9].Visible = true; + } } public void UpdateDisplayRecipeData(Recipe data) { this.buttonRecipeNo.ButtonText = data.NUMBER.ToString(); } - public void UpdateDisplayTime() + public void UpdateDisplayTime(DateTime time) { - this.labelTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + this.labelTime.Text = time.ToString("yyyy-MM-dd HH:mm:ss"); } public void DisplayRefresh() @@ -1505,20 +1587,13 @@ namespace INT_PT002.Forms this.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.RecipeNumber, "", before, after); } } - private void buttonDisplayGraph_Click(object sender, EventArgs e) - { - this.Part11AutomaticLogoutReset(); - - this.ChildControl.DisplayRefresh(1); - this.ChildControl.Visible = true; - } private void buttonInspection_Click(object sender, EventArgs e) { this.Part11AutomaticLogoutReset(); this.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard); - this.InitializeData(); + //this.InitializeData(); this.ChildControl.ClearAllData(); } private void buttonUser_Click(object sender, EventArgs e) @@ -1679,92 +1754,29 @@ namespace INT_PT002.Forms this.UpdateEthernetStatusDisplay(true); } } + + private void buttonTest_Click(object sender, EventArgs e) + { + if (this.buttonTest.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + //this.InitializeData(); + this.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard); + this.smartTimerTest.Start(); + this.IsTestMode = true; + } + else + { + this.smartTimerTest.Stop(); + this.IsTestMode = false; + } + } + private void smartTimerTest_Tick(object sender, EventArgs e) + { + //this.InitializeData(); + this.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard); + } #endregion - private void smartButton1_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.labelAlarm.Size = new Size(value.Length * 8, 20); - this.labelAlarm.Text = value; - - if (this.labelAlarm.Width > 400) - { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); - } - else - { - this.smartTimerAlarm.Stop(); - this.labelAlarm.Location = new Point(3, 26); - } - } - 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.labelAlarm.Size = new Size(value.Length * 8, 20); - this.labelAlarm.Text = value; - - if (this.labelAlarm.Width > 400) - { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); - } - else - { - this.smartTimerAlarm.Stop(); - this.labelAlarm.Location = new Point(3, 26); - } - } - 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.labelAlarm.Size = new Size(value.Length * 8, 20); - this.labelAlarm.Text = value; - - if (this.labelAlarm.Width > 400) - { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); - } - else - { - this.smartTimerAlarm.Stop(); - this.labelAlarm.Location = new Point(3, 26); - } - } private void smartButton4_Click(object sender, EventArgs e) { string value = ""; @@ -1839,55 +1851,5 @@ namespace INT_PT002.Forms else this.testIndex++; } - - private void buttonProgress1_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._1_Ready); - } - private void buttonProgress2_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._2_ProductEntry); - } - private void buttonProgress3_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._3_MoveToLeak); - } - private void buttonProgress4_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._4_MoveToCheck); - } - private void buttonProgress5_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._5_ChamberMerge); - } - private void buttonProgress6_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._6_VacuumStart); - } - private void buttonProgress7_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._7_VacuumHold); - } - private void buttonProgress8_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._8_Judgment); - } - private void buttonProgress9_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._9_VacuumBreak); - } - private void buttonProgress10_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._10_ChamberRelease); - } - private void buttonProgress11_Click(object sender, EventArgs e) - { - this.UpdateDisplayProcessStatus(Define.E_ProcessStatus._11_MoveToReady); - } - - private void buttonInitialize_Click(object sender, EventArgs e) - { - this.InitializeProcessStatus(); - } } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMainDisplay3.resx b/INT_PT002/Forms/FormMainDisplay3.resx index a347e2d..9b44c99 100644 --- a/INT_PT002/Forms/FormMainDisplay3.resx +++ b/INT_PT002/Forms/FormMainDisplay3.resx @@ -6376,6 +6376,9 @@ 683, 11 + + 798, 11 + WEBPAD diff --git a/INT_PT002/Forms/FormMenu.cs b/INT_PT002/Forms/FormMenu.cs index aeb952e..f372510 100644 --- a/INT_PT002/Forms/FormMenu.cs +++ b/INT_PT002/Forms/FormMenu.cs @@ -235,9 +235,11 @@ namespace INT_PT002.Forms this.labelAlarm.Location = new Point(0, 0); } } - public void UpdateDisplayTime() + public void UpdateDisplayTime(DateTime time) { - this.labelTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + this.labelTime.Text = time.ToString("yyyy-MM-dd HH:mm:ss"); + + this.Child_System_Information.UpdateDisplayTime(time); } #region Log