diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs index ac044a5..7c0cc1d 100644 --- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMainDisplay2)); this.smartForm1 = new SmartX.SmartForm(); + this.smartButton5 = new SmartX.SmartButton(); this.pictureBoxProgress8Selected = new System.Windows.Forms.PictureBox(); this.pictureBoxProgress7Selected = new System.Windows.Forms.PictureBox(); this.pictureBoxProgress6Selected = new System.Windows.Forms.PictureBox(); @@ -148,6 +149,7 @@ this.smartForm1.BackGroundFillStyle = SmartXUIBase.SmartUIControlFormBase.BackGroundFillStyles.UseBackImage; this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage"))); this.smartForm1.CenterLocation = false; + this.smartForm1.Controls.Add(this.smartButton5); this.smartForm1.Controls.Add(this.pictureBoxProgress8Selected); this.smartForm1.Controls.Add(this.pictureBoxProgress7Selected); this.smartForm1.Controls.Add(this.pictureBoxProgress6Selected); @@ -209,13 +211,6 @@ this.smartForm1.Controls.Add(this.pictureBoxProgress2); this.smartForm1.Controls.Add(this.pictureBoxProgress1); this.smartForm1.Controls.Add(this.pictureBoxProgress8); - this.smartForm1.Controls.Add(this.smartLabel31); - this.smartForm1.Controls.Add(this.smartLabel30); - this.smartForm1.Controls.Add(this.smartLabel29); - this.smartForm1.Controls.Add(this.smartLabel27); - this.smartForm1.Controls.Add(this.smartLabel26); - this.smartForm1.Controls.Add(this.smartLabel25); - this.smartForm1.Controls.Add(this.smartLabel24); this.smartForm1.Controls.Add(this.labelProgress8); this.smartForm1.Controls.Add(this.labelProgress7); this.smartForm1.Controls.Add(this.labelProgress6); @@ -252,6 +247,13 @@ this.smartForm1.Controls.Add(this.buttonClear); this.smartForm1.Controls.Add(this.buttonMenu); this.smartForm1.Controls.Add(this.buttonDisplay); + this.smartForm1.Controls.Add(this.smartLabel24); + this.smartForm1.Controls.Add(this.smartLabel25); + this.smartForm1.Controls.Add(this.smartLabel26); + this.smartForm1.Controls.Add(this.smartLabel27); + this.smartForm1.Controls.Add(this.smartLabel29); + this.smartForm1.Controls.Add(this.smartLabel30); + this.smartForm1.Controls.Add(this.smartLabel31); this.smartForm1.GradationColorBottom = System.Drawing.Color.Gray; this.smartForm1.GradationColorTop = System.Drawing.Color.White; this.smartForm1.LCDDirection = SmartXUIBase.SmartUIControlFormBase.LCDDIRECTIONS.HORIZONTAL; @@ -265,6 +267,41 @@ this.smartForm1.SpecialFunctionClickPointSize = 100; this.smartForm1.UseMainMenu = false; // + // smartButton5 + // + this.smartButton5.BackGround = this.smartForm1; + this.smartButton5.BackGroundColor = System.Drawing.Color.LightBlue; + this.smartButton5.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartButton5.ButtonDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(76)))), ((int)(((byte)(129))))); + this.smartButton5.ButtonImageAutoSize = true; + this.smartButton5.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton5.ButtonText = "smartButton1"; + this.smartButton5.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton5.GroupID = 0; + this.smartButton5.ImageDisable = null; + this.smartButton5.ImageDown = null; + this.smartButton5.ImageUp = null; + this.smartButton5.Location = new System.Drawing.Point(917, 466); + this.smartButton5.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton5.Name = "smartButton5"; + this.smartButton5.NestedClickEventPrevent = false; + this.smartButton5.OutlinePixel = 2; + this.smartButton5.OverlapOptimize = true; + this.smartButton5.RepeatInterval = 200; + this.smartButton5.RepeatIntervalAccelerate = null; + this.smartButton5.RoundSize = 10; + this.smartButton5.SafeInterval = 200; + this.smartButton5.Size = new System.Drawing.Size(100, 43); + this.smartButton5.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton5.TabIndex = 310; + this.smartButton5.Text = null; + this.smartButton5.TextColor = System.Drawing.Color.White; + this.smartButton5.TextColorDisable = System.Drawing.Color.Gray; + this.smartButton5.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.smartButton5.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton5.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton5.Click += new System.EventHandler(this.smartButton5_Click); + // // pictureBoxProgress8Selected // this.pictureBoxProgress8Selected.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(38)))), ((int)(((byte)(38))))); @@ -2661,5 +2698,6 @@ private System.Windows.Forms.PictureBox pictureBoxProgress3Selected; private System.Windows.Forms.PictureBox pictureBoxProgress2Selected; private System.Windows.Forms.PictureBox pictureBoxProgress1Selected; + private SmartX.SmartButton smartButton5; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index 520e9d3..d272fc7 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -24,10 +24,7 @@ namespace INT_PT002.Forms private string MessageBoxRange; - private int LabelProcess0LocationX; - private int LabelProcess0LocationY; - private int LabelProcess0_1LocationX; - private int LabelProcess0_1LocationY; + int testIndex; private Color ColorProgressOn; private Size SizeProgressOn; @@ -39,6 +36,7 @@ namespace INT_PT002.Forms private Color ColorSensorNormal; private Color ColorSensorError; + private Collection CollectionLabelPoint; private Collection CollectionLabelResult; private Collection CollectionLabelProgress; private Collection CollectionLabelProgress2; @@ -77,6 +75,8 @@ namespace INT_PT002.Forms #region Method private void DefaultSetting() { + int testIndex = 0; + this.FlagIgnoreCNT = 0; this.MessageBoxRange = ""; @@ -115,6 +115,12 @@ namespace INT_PT002.Forms this.CollectionLabelProgress.Add(this.labelProgress7); this.CollectionLabelProgress.Add(this.labelProgress8); + // 기존 배경 라벨 사이즈 저장 + this.CollectionLabelPoint = new Collection(); + this.CollectionLabelPoint.Clear(); + for (int i = 0; i < this.CollectionLabelProgress.Count; i++) + this.CollectionLabelPoint.Add(new Point(this.CollectionLabelProgress[i].Location.X, this.CollectionLabelProgress[i].Location.Y)); + // 문구가 적힌 라벨 this.CollectionLabelProgress2 = new Collection(); this.CollectionLabelProgress2.Clear(); @@ -196,11 +202,6 @@ namespace INT_PT002.Forms this.ChildControl.BringToFront(); this.ChildControl.Visible = false; - this.LabelProcess0LocationX = this.CollectionLabelProgress[0].Location.X; - this.LabelProcess0LocationY = this.CollectionLabelProgress[0].Location.Y; - this.LabelProcess0_1LocationX = this.CollectionLabelProgress2[0].Location.X; - this.LabelProcess0_1LocationY = this.CollectionLabelProgress2[0].Location.Y; - this.buttonRecipeNo.ButtonText = this.ParentForm.SystemConfig.RECIPE_NUMBER.ToString(); this.UpdateDisplayUser(this.ParentForm.CurrentSystemStatus.CurrentUser); } @@ -250,13 +251,13 @@ namespace INT_PT002.Forms this.CollectionLabelProgress[index].RoundRectFillColor = this.ColorProgressOn; // 문구가 적히는 label this.CollectionLabelProgress2[index].BackGroundColor = this.ColorProgressOn; - + this.CollectionPictureBoxSelected[index].Visible = true; this.CollectionPictureBoxSelected[index].BringToFront(); } private void UnselectLabelRefresh(int index) { - this.CollectionLabelProgress[index].Location = new Point(this.CollectionLabelProgress[index].Location.X + 17, this.CollectionLabelProgress[index].Location.Y + 15); + this.CollectionLabelProgress[index].Location = this.CollectionLabelPoint[index]; this.CollectionLabelProgress[index].Size = this.SizeProgressOff; this.CollectionLabelProgress[index].RoundRectFillColor = this.ColorProgressOff; // 문구가 적히는 label @@ -475,6 +476,9 @@ namespace INT_PT002.Forms case Define.E_ProcessStatus._0_None: break; case Define.E_ProcessStatus._1_Initial: + for (int i = 0; i < this.CollectionLabelProgress.Count; i++) + this.CollectionLabelProgress[i].Location = this.CollectionLabelPoint[i]; + this.UnselectLabelRefresh(this.CollectionLabelProgress.Count - 1); this.SelectLabelRefresh(0); break; case Define.E_ProcessStatus._2_ProductEntry: @@ -942,7 +946,40 @@ namespace INT_PT002.Forms private void smartButton5_Click(object sender, EventArgs e) { - this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Initial); + switch (this.testIndex) + { + case 0: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Initial); + break; + case 1: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._2_ProductEntry); + break; + case 2: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._3_ChamberConbined); + break; + case 3: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._4_VacuumStart); + break; + case 4: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._5_VacuumHold); + break; + case 5: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._7_VacuumBreak); + break; + case 6: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._8_ChamberSeparation); + break; + case 7: + this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._9_ProductRelease); + break; + default: + break; + } + + if (this.testIndex >= 7) + this.testIndex = 0; + else + this.testIndex++; } } } \ No newline at end of file