Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002 into main
						commit
						6f347ea714
					
				
											
												
													File diff suppressed because it is too large
													Load Diff
												
											
										
									
								|  | @ -25,7 +25,8 @@ namespace INT_PT002.Controls | ||||||
|         private Color ColorResultNG; |         private Color ColorResultNG; | ||||||
|         private Color ColorResultNone; |         private Color ColorResultNone; | ||||||
| 
 | 
 | ||||||
|         private Collection<SmartLabel> CollectionResult; |         private Collection<SmartLabel> CollectionLabelResult; | ||||||
|  |         private Collection<SmartLabel> CollectionLabelProgress; | ||||||
| 
 | 
 | ||||||
|         private Collection<SmartLabel> CollectionDispRData; |         private Collection<SmartLabel> CollectionDispRData; | ||||||
|         private Collection<SmartLabel> CollectionDispMData; |         private Collection<SmartLabel> CollectionDispMData; | ||||||
|  | @ -71,17 +72,28 @@ namespace INT_PT002.Controls | ||||||
|             this.ColorResultNG = Color.Red; |             this.ColorResultNG = Color.Red; | ||||||
|             this.ColorResultNone = Color.Black; |             this.ColorResultNone = Color.Black; | ||||||
| 
 | 
 | ||||||
|             this.CollectionResult = new Collection<SmartLabel>(); |             this.CollectionLabelProgress = new Collection<SmartLabel>(); | ||||||
|             this.CollectionResult.Add(this.labelResult1); |             this.CollectionLabelProgress.Clear(); | ||||||
|             this.CollectionResult.Add(this.labelResult2); |             this.CollectionLabelProgress.Add(this.labelProgress0); | ||||||
|             this.CollectionResult.Add(this.labelResult3); |             this.CollectionLabelProgress.Add(this.labelProgress1); | ||||||
|             this.CollectionResult.Add(this.labelResult4); |             this.CollectionLabelProgress.Add(this.labelProgress2); | ||||||
|             this.CollectionResult.Add(this.labelResult5); |             this.CollectionLabelProgress.Add(this.labelProgress3); | ||||||
|             this.CollectionResult.Add(this.labelResult6); |             this.CollectionLabelProgress.Add(this.labelProgress4); | ||||||
|             this.CollectionResult.Add(this.labelResult7); |             this.CollectionLabelProgress.Add(this.labelProgress6); | ||||||
|             this.CollectionResult.Add(this.labelResult8); |             this.CollectionLabelProgress.Add(this.labelProgress7); | ||||||
|             this.CollectionResult.Add(this.labelResult9); |             this.CollectionLabelProgress.Add(this.labelProgress8); | ||||||
|             this.CollectionResult.Add(this.labelResult10); | 
 | ||||||
|  |             this.CollectionLabelResult = new Collection<SmartLabel>(); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult1); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult2); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult3); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult4); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult5); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult6); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult7); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult8); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult9); | ||||||
|  |             this.CollectionLabelResult.Add(this.labelResult10); | ||||||
| 
 | 
 | ||||||
|             this.CollectionDispRData = new Collection<SmartLabel>(); |             this.CollectionDispRData = new Collection<SmartLabel>(); | ||||||
|             this.CollectionDispRData.Add(this.labelDispRData1); |             this.CollectionDispRData.Add(this.labelDispRData1); | ||||||
|  | @ -207,9 +219,8 @@ namespace INT_PT002.Controls | ||||||
|         { |         { | ||||||
|             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) |             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) | ||||||
|             { |             { | ||||||
|                 this.CollectionResult[i].Text = "-"; |                 this.CollectionLabelResult[i].Text = "-"; | ||||||
|                 this.CollectionResult[i].TextColor = this.ColorResultNone; |                 this.CollectionLabelResult[i].TextColor = this.ColorResultNone; | ||||||
|                 this.CollectionResult[i].Font = new Font("New Gulim", 20, FontStyle.Bold); |  | ||||||
|                 this.CollectionDispRData[i].Text = "0.00"; |                 this.CollectionDispRData[i].Text = "0.00"; | ||||||
|                 this.CollectionDispMData[i].Text = "0.00"; |                 this.CollectionDispMData[i].Text = "0.00"; | ||||||
|                 this.CollectionDispMDataDiff[i].Text = "0.00"; |                 this.CollectionDispMDataDiff[i].Text = "0.00"; | ||||||
|  | @ -257,122 +268,72 @@ namespace INT_PT002.Controls | ||||||
|                 label2.Text = value; |                 label2.Text = value; | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  |         private void SelectProcessLabelRefresh(int index) | ||||||
|  |         { | ||||||
|  |             this.CollectionLabelProgress[index].BackGroundColor = this.ColorProgressOn; | ||||||
|  |         } | ||||||
|  |         private void UnselectProcessLabelRefresh(int index) | ||||||
|  |         { | ||||||
|  |             this.CollectionLabelProgress[index].BackGroundColor = this.ColorProgressOff; | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         public void UpdateProcessStatusDisplay(Define.E_ProcessStatus status) |         public void UpdateProcessStatusDisplay(Define.E_ProcessStatus status) | ||||||
|         { |         { | ||||||
|             switch (status) |             switch (status) | ||||||
|             { |             { | ||||||
|                 case Define.E_ProcessStatus._0_None: |                 case Define.E_ProcessStatus._0_None: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._1_Initial: |                 case Define.E_ProcessStatus._1_Initial: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOn; |                     this.UnselectProcessLabelRefresh(this.CollectionLabelProgress.Count - 1); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |                     this.SelectProcessLabelRefresh(0); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
| 
 | 
 | ||||||
|                     this.timerOn.Stop(); |                     this.timerOn.Stop(); | ||||||
|                     this.timerOff.Stop(); |                     this.timerOff.Stop(); | ||||||
| 
 | 
 | ||||||
|                     this.ParentForm.Set_Equipment_ButtonEnable(true); |                     this.ParentForm.Set_Equipment_ButtonEnable(true); | ||||||
| 
 | 
 | ||||||
|                     if (this.CollectionResult[0].Text == "검사 중..") |                     //if (this.CollectionLabelResult[0].Text == "Measuring..") | ||||||
|                     { |                     //{ | ||||||
|                         for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) |                     //    for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) | ||||||
|                         { |                     //    { | ||||||
|                             this.CollectionResult[i].Visible = true; |                     //        this.CollectionLabelResult[i].Visible = true; | ||||||
|                             this.CollectionResult[i].Text = "-"; |                     //        this.CollectionLabelResult[i].Text = "-"; | ||||||
|                             this.CollectionResult[i].TextColor = this.ColorResultNone; |                     //        this.CollectionLabelResult[i].TextColor = this.ColorResultNone; | ||||||
|                             this.CollectionResult[i].Font = new Font("New Gulim", 48, FontStyle.Bold); |                     //        this.CollectionLabelResult[i].Font = new Font("New Gulim", 48, FontStyle.Bold); | ||||||
|                         } |                     //    } | ||||||
|                     } |                     //} | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._2_ProductEntry: |                 case Define.E_ProcessStatus._2_ProductEntry: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |                     this.UnselectProcessLabelRefresh(0); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOn; |                     this.SelectProcessLabelRefresh(1); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
| 
 | 
 | ||||||
|                     this.ParentForm.Set_Equipment_ButtonEnable(false); |                     this.ParentForm.Set_Equipment_ButtonEnable(false); | ||||||
| 
 |  | ||||||
|                     // Label Initialize |  | ||||||
|                     //this.InitializeLabel(); |  | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._3_ChamberConbined: |                 case Define.E_ProcessStatus._3_ChamberConbined: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |                     this.UnselectProcessLabelRefresh(1); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |                     this.SelectProcessLabelRefresh(2); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOn; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._4_VacuumStart: |                 case Define.E_ProcessStatus._4_VacuumStart: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |                     this.UnselectProcessLabelRefresh(2); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |                     this.SelectProcessLabelRefresh(3); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOn; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._5_VacuumHold: |                 case Define.E_ProcessStatus._5_VacuumHold: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |                     this.UnselectProcessLabelRefresh(3); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |                     this.SelectProcessLabelRefresh(4); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOn; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._6_Judgment: |                 case Define.E_ProcessStatus._6_Judgment: | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._7_VacuumBreak: |                 case Define.E_ProcessStatus._7_VacuumBreak: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |                     this.UnselectProcessLabelRefresh(4); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |                     this.SelectProcessLabelRefresh(5); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOn; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._8_ChamberSeparation: |                 case Define.E_ProcessStatus._8_ChamberSeparation: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |                     this.UnselectProcessLabelRefresh(5); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |                     this.SelectProcessLabelRefresh(6); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOn; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     break; |                     break; | ||||||
|                 case Define.E_ProcessStatus._9_ProductRelease: |                 case Define.E_ProcessStatus._9_ProductRelease: | ||||||
|                     this.labelProgress0.BackGroundColor = this.ColorProgressOff; |                     this.UnselectProcessLabelRefresh(6); | ||||||
|                     this.labelProgress1.BackGroundColor = this.ColorProgressOff; |                     this.SelectProcessLabelRefresh(7); | ||||||
|                     this.labelProgress2.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress3.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress4.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress6.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress7.BackGroundColor = this.ColorProgressOff; |  | ||||||
|                     this.labelProgress8.BackGroundColor = this.ColorProgressOn; |  | ||||||
|                     break; |                     break; | ||||||
|                 default: |                 default: | ||||||
|                     break; |                     break; | ||||||
|  | @ -509,58 +470,10 @@ namespace INT_PT002.Controls | ||||||
|             this.timerOff.Stop(); |             this.timerOff.Stop(); | ||||||
| 
 | 
 | ||||||
|             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) |             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) | ||||||
|                 this.CollectionResult[i].Visible = true; |  | ||||||
| 
 |  | ||||||
|             this.UpdateDisplayJudgmentData1(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData2(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData3(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData4(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData5(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData6(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData7(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData8(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData9(datas); |  | ||||||
|             this.UpdateDisplayJudgmentData10(datas); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData1(LeakData data) |  | ||||||
|             { |             { | ||||||
|             this.GetJudgmentResult(data.CollJudgment[0], this.labelResult1); |                 this.GetJudgmentResult(datas.CollJudgment[i], this.CollectionLabelResult[i]); | ||||||
|  |                 this.CollectionLabelResult[i].Visible = true; | ||||||
|             } |             } | ||||||
|         private void UpdateDisplayJudgmentData2(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[1], this.labelResult2); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData3(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[2], this.labelResult3); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData4(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[3], this.labelResult4); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData5(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[4], this.labelResult5); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData6(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[5], this.labelResult6); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData7(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[6], this.labelResult7); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData8(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[7], this.labelResult8); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData9(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[8], this.labelResult9); |  | ||||||
|         } |  | ||||||
|         private void UpdateDisplayJudgmentData10(LeakData data) |  | ||||||
|         { |  | ||||||
|             this.GetJudgmentResult(data.CollJudgment[9], this.labelResult10); |  | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         public void DisplayRefresh() |         public void DisplayRefresh() | ||||||
|  | @ -582,7 +495,7 @@ namespace INT_PT002.Controls | ||||||
|             this.timerOn.Stop(); |             this.timerOn.Stop(); | ||||||
| 
 | 
 | ||||||
|             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) |             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) | ||||||
|                 this.CollectionResult[i].Visible = false; |                 this.CollectionLabelResult[i].Visible = false; | ||||||
| 
 | 
 | ||||||
|             this.timerOff.Start(); |             this.timerOff.Start(); | ||||||
|         } |         } | ||||||
|  | @ -591,7 +504,7 @@ namespace INT_PT002.Controls | ||||||
|             this.timerOff.Stop(); |             this.timerOff.Stop(); | ||||||
| 
 | 
 | ||||||
|             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) |             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++) | ||||||
|                 this.CollectionResult[i].Visible = true; |                 this.CollectionLabelResult[i].Visible = true; | ||||||
| 
 | 
 | ||||||
|             this.timerOn.Start(); |             this.timerOn.Start(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  | @ -742,6 +742,7 @@ namespace INT_PT002.DialogForms | ||||||
|             base.OnLoad(e); |             base.OnLoad(e); | ||||||
| 
 | 
 | ||||||
|             this.InitializeControl(); |             this.InitializeControl(); | ||||||
|  |             this.Size = new Size(450, 155); | ||||||
|         } |         } | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -339,6 +339,7 @@ namespace INT_PT002.DialogForms | ||||||
|             base.OnLoad(e); |             base.OnLoad(e); | ||||||
| 
 | 
 | ||||||
|             this.InitializeControl(); |             this.InitializeControl(); | ||||||
|  |             this.Size = new Size(450, 155); | ||||||
|         } |         } | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue