Compare commits

...

2 Commits

Author SHA1 Message Date
Seonjae 46d909ad5f Merge branch 'main' of http://192.168.11.65:3000/SJ84/INT_PT002 into main
# Conflicts:
#	INT_PT002/Forms/FormMainDisplay3.Designer.cs
#	INT_PT002/Forms/FormMainDisplay4.cs
2024-04-05 09:57:05 +09:00
Seonjae 27279ea8d9 수정 2024-04-05 09:19:24 +09:00
13 changed files with 2822 additions and 10370 deletions

View File

@ -284,30 +284,30 @@ namespace INT_PT002.Controls
{ {
case Define.E_ProcessStatus._0_None: case Define.E_ProcessStatus._0_None:
break; break;
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
this.UnselectProcessLabelRefresh(0); this.UnselectProcessLabelRefresh(0);
break; break;
case Define.E_ProcessStatus._2_ProductEntry: case Define.E_ProcessStatus._2_ProductEntry:
this.UnselectProcessLabelRefresh(1); this.UnselectProcessLabelRefresh(1);
break; break;
case Define.E_ProcessStatus._3_ChamberConbined: case Define.E_ProcessStatus._3_MoveToLeak:
this.UnselectProcessLabelRefresh(2); this.UnselectProcessLabelRefresh(2);
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
this.UnselectProcessLabelRefresh(3); this.UnselectProcessLabelRefresh(3);
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
this.UnselectProcessLabelRefresh(4); this.UnselectProcessLabelRefresh(4);
break; break;
case Define.E_ProcessStatus._6_Judgment: case Define.E_ProcessStatus._6_VacuumStart:
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
this.UnselectProcessLabelRefresh(5); this.UnselectProcessLabelRefresh(5);
break; break;
case Define.E_ProcessStatus._8_ChamberSeparation: case Define.E_ProcessStatus._8_Judgment:
this.UnselectProcessLabelRefresh(6); this.UnselectProcessLabelRefresh(6);
break; break;
case Define.E_ProcessStatus._9_ProductRelease: case Define.E_ProcessStatus._9_VacuumBreak:
this.UnselectProcessLabelRefresh(7); this.UnselectProcessLabelRefresh(7);
break; break;
default: default:
@ -318,7 +318,7 @@ namespace INT_PT002.Controls
{ {
case Define.E_ProcessStatus._0_None: case Define.E_ProcessStatus._0_None:
break; break;
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
this.UnselectProcessLabelRefresh(this.CollectionLabelProgress.Count - 1); this.UnselectProcessLabelRefresh(this.CollectionLabelProgress.Count - 1);
this.SelectProcessLabelRefresh(0); this.SelectProcessLabelRefresh(0);
@ -339,24 +339,24 @@ namespace INT_PT002.Controls
case Define.E_ProcessStatus._2_ProductEntry: case Define.E_ProcessStatus._2_ProductEntry:
this.SelectProcessLabelRefresh(1); this.SelectProcessLabelRefresh(1);
break; break;
case Define.E_ProcessStatus._3_ChamberConbined: case Define.E_ProcessStatus._3_MoveToLeak:
this.SelectProcessLabelRefresh(2); this.SelectProcessLabelRefresh(2);
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
this.SelectProcessLabelRefresh(3); this.SelectProcessLabelRefresh(3);
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
this.SelectProcessLabelRefresh(4); this.SelectProcessLabelRefresh(4);
break; break;
case Define.E_ProcessStatus._6_Judgment: case Define.E_ProcessStatus._6_VacuumStart:
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
this.SelectProcessLabelRefresh(5); this.SelectProcessLabelRefresh(5);
break; break;
case Define.E_ProcessStatus._8_ChamberSeparation: case Define.E_ProcessStatus._8_Judgment:
this.SelectProcessLabelRefresh(6); this.SelectProcessLabelRefresh(6);
break; break;
case Define.E_ProcessStatus._9_ProductRelease: case Define.E_ProcessStatus._9_VacuumBreak:
this.SelectProcessLabelRefresh(7); this.SelectProcessLabelRefresh(7);
break; break;
default: default:

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,6 @@ namespace INT_PT002.Controls
{ {
#region Field #region Field
private FormMenu m_ParentForm; private FormMenu m_ParentForm;
private Define.E_ProcessStatus PreviousStageNum;
private Color ColorProgressOn; private Color ColorProgressOn;
private Color ColorProgressOff; private Color ColorProgressOff;
@ -66,14 +65,17 @@ namespace INT_PT002.Controls
this.CollectionLabelProgress = new Collection<SmartLabel>(); this.CollectionLabelProgress = new Collection<SmartLabel>();
this.CollectionLabelProgress.Clear(); this.CollectionLabelProgress.Clear();
this.CollectionLabelProgress.Add(this.labelProgress0);
this.CollectionLabelProgress.Add(this.labelProgress1); this.CollectionLabelProgress.Add(this.labelProgress1);
this.CollectionLabelProgress.Add(this.labelProgress2); this.CollectionLabelProgress.Add(this.labelProgress2);
this.CollectionLabelProgress.Add(this.labelProgress3); this.CollectionLabelProgress.Add(this.labelProgress3);
this.CollectionLabelProgress.Add(this.labelProgress4); this.CollectionLabelProgress.Add(this.labelProgress4);
this.CollectionLabelProgress.Add(this.labelProgress5);
this.CollectionLabelProgress.Add(this.labelProgress6); this.CollectionLabelProgress.Add(this.labelProgress6);
this.CollectionLabelProgress.Add(this.labelProgress7); this.CollectionLabelProgress.Add(this.labelProgress7);
this.CollectionLabelProgress.Add(this.labelProgress8); this.CollectionLabelProgress.Add(this.labelProgress8);
this.CollectionLabelProgress.Add(this.labelProgress9);
this.CollectionLabelProgress.Add(this.labelProgress10);
this.CollectionLabelProgress.Add(this.labelProgress11);
this.CollectionLabelResult = new Collection<SmartLabel>(); this.CollectionLabelResult = new Collection<SmartLabel>();
this.CollectionLabelResult.Add(this.labelResult1); this.CollectionLabelResult.Add(this.labelResult1);
@ -105,6 +107,7 @@ namespace INT_PT002.Controls
{ {
this.CollectionLabelResult[i].Text = "-"; this.CollectionLabelResult[i].Text = "-";
this.CollectionLabelResult[i].TextColor = this.ColorResultNone; this.CollectionLabelResult[i].TextColor = this.ColorResultNone;
this.CollectionLabelResult[i].Visible = false;
this.CollectionDiffSecDiff[i].Text = "0.00"; this.CollectionDiffSecDiff[i].Text = "0.00";
this.CollectionPressureWork[i].Text = "0.0"; this.CollectionPressureWork[i].Text = "0.0";
this.CollectionPressureMaster[i].Text = "0.0"; this.CollectionPressureMaster[i].Text = "0.0";
@ -133,6 +136,9 @@ namespace INT_PT002.Controls
this.labelMesDiffMean2.Text = "0.00"; this.labelMesDiffMean2.Text = "0.00";
this.labelMesPressureMaster2.Text = "0.0"; this.labelMesPressureMaster2.Text = "0.0";
this.labelMesPressureWork2.Text = "0.0"; this.labelMesPressureWork2.Text = "0.0";
this.smartDraw1.Chart.PutDataAllClear();
this.smartDraw2.Chart.PutDataAllClear();
} }
private void GetJudgmentResult(Define.E_JudgmentStatus judg, SmartLabel label2) private void GetJudgmentResult(Define.E_JudgmentStatus judg, SmartLabel label2)
@ -169,107 +175,60 @@ 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;
}
private void UpdateDisplayInitialize()
{
this.smartDraw1.Chart.PutDataAllClear();
this.smartDraw2.Chart.PutDataAllClear();
}
public void UpdateProcessStatusDisplay(Define.E_ProcessStatus status) public void UpdateProcessStatusDisplay(Define.E_ProcessStatus status)
{ {
switch (this.PreviousStageNum)
{
case Define.E_ProcessStatus._0_None:
break;
case Define.E_ProcessStatus._1_Initial:
this.UnselectProcessLabelRefresh(0);
break;
case Define.E_ProcessStatus._2_ProductEntry:
this.UnselectProcessLabelRefresh(1);
break;
case Define.E_ProcessStatus._3_ChamberConbined:
this.UnselectProcessLabelRefresh(2);
break;
case Define.E_ProcessStatus._4_VacuumStart:
this.UnselectProcessLabelRefresh(3);
break;
case Define.E_ProcessStatus._5_VacuumHold:
this.UnselectProcessLabelRefresh(4);
break;
case Define.E_ProcessStatus._6_Judgment:
break;
case Define.E_ProcessStatus._7_VacuumBreak:
this.UnselectProcessLabelRefresh(5);
break;
case Define.E_ProcessStatus._8_ChamberSeparation:
this.UnselectProcessLabelRefresh(6);
break;
case Define.E_ProcessStatus._9_ProductRelease:
this.UnselectProcessLabelRefresh(7);
break;
default:
break;
}
switch (status) switch (status)
{ {
case Define.E_ProcessStatus._0_None: case Define.E_ProcessStatus._0_None:
break; break;
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
this.UnselectProcessLabelRefresh(this.CollectionLabelProgress.Count - 1); this.labelProgress11.BackColor = this.ColorProgressOff;
this.SelectProcessLabelRefresh(0); this.labelProgress1.BackColor = this.ColorProgressOn;
this.timerOn.Stop();
this.timerOff.Stop();
//if (this.CollectionLabelResult[0].Text == "Measuring..")
//{
// for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++)
// {
// this.CollectionLabelResult[i].Visible = true;
// this.CollectionLabelResult[i].Text = "-";
// this.CollectionLabelResult[i].TextColor = this.ColorResultNone;
// 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.SelectProcessLabelRefresh(1); this.labelProgress1.BackColor = this.ColorProgressOff;
this.labelProgress2.BackColor = this.ColorProgressOn;
break; break;
case Define.E_ProcessStatus._3_ChamberConbined: case Define.E_ProcessStatus._3_MoveToLeak:
this.SelectProcessLabelRefresh(2); this.labelProgress2.BackColor = this.ColorProgressOff;
this.labelProgress3.BackColor = this.ColorProgressOn;
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
this.SelectProcessLabelRefresh(3); this.labelProgress3.BackColor = this.ColorProgressOff;
this.labelProgress4.BackColor = this.ColorProgressOn;
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
this.SelectProcessLabelRefresh(4); this.labelProgress4.BackColor = this.ColorProgressOff;
this.labelProgress5.BackColor = this.ColorProgressOn;
break; break;
case Define.E_ProcessStatus._6_Judgment: case Define.E_ProcessStatus._6_VacuumStart:
this.labelProgress5.BackColor = this.ColorProgressOff;
this.labelProgress6.BackColor = this.ColorProgressOn;
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
this.SelectProcessLabelRefresh(5); this.labelProgress6.BackColor = this.ColorProgressOff;
this.labelProgress7.BackColor = this.ColorProgressOn;
break; break;
case Define.E_ProcessStatus._8_ChamberSeparation: case Define.E_ProcessStatus._8_Judgment:
this.SelectProcessLabelRefresh(6); this.labelProgress7.BackColor = this.ColorProgressOff;
this.labelProgress8.BackColor = this.ColorProgressOn;
break; break;
case Define.E_ProcessStatus._9_ProductRelease: case Define.E_ProcessStatus._9_VacuumBreak:
this.SelectProcessLabelRefresh(7); this.labelProgress8.BackColor = this.ColorProgressOff;
this.labelProgress9.BackColor = this.ColorProgressOn;
break;
case Define.E_ProcessStatus._10_ChamberRelease:
this.labelProgress9.BackColor = this.ColorProgressOff;
this.labelProgress10.BackColor = this.ColorProgressOn;
break;
case Define.E_ProcessStatus._11_MoveToReady:
this.labelProgress10.BackColor = this.ColorProgressOff;
this.labelProgress11.BackColor = this.ColorProgressOn;
break; break;
default: default:
break; break;
} }
this.PreviousStageNum = status;
} }
private void UpdateDisplayDotGraphDiff(SmartDraw draw, DiffData diff) private void UpdateDisplayDotGraphDiff(SmartDraw draw, DiffData diff)
{ {
@ -352,6 +311,8 @@ namespace INT_PT002.Controls
value = data.DiffData.SecBufDiff; value = data.DiffData.SecBufDiff;
if (this.CollectionDiffSecDiff[0].Text != value) if (this.CollectionDiffSecDiff[0].Text != value)
this.CollectionDiffSecDiff[0].Text = value; this.CollectionDiffSecDiff[0].Text = value;
//Measuring : 2 Lane
} }
public void UpdateDisplayDiffData2(LeakData1 data) public void UpdateDisplayDiffData2(LeakData1 data)
{ {
@ -695,6 +656,8 @@ namespace INT_PT002.Controls
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.Equipment; this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.Equipment;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Normal); this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Normal);
this.InitializeData();
} }
#endregion #endregion

View File

@ -91,27 +91,20 @@ namespace INT_PT002.DataStore
f1_Modbus, f1_Modbus,
} }
public enum E_ProcessStatus2
{
_0_None = 0,
_1_Initial,
_2_MovementAndProductEntry,
_3_Measuring,
_4_DischargeAndReturnToOrigin,
}
public enum E_ProcessStatus public enum E_ProcessStatus
{ {
_0_None = 0, _0_None = 0,
_1_Initial, _1_Read,
_2_ProductEntry, _2_ProductEntry,
_3_ChamberConbined, _3_MoveToLeak,
_4_VacuumStart, _4_MoveToCheck,
_5_VacuumHold, _5_ChamberMerge,
_6_Judgment, _6_VacuumStart,
_7_VacuumBreak, _7_VacuumHold,
_8_ChamberSeparation, _8_Judgment,
_9_ProductRelease, _9_VacuumBreak,
_10_ChamberRelease,
_11_MoveToReady,
} }
public enum E_JudgmentStatus public enum E_JudgmentStatus

View File

@ -1482,25 +1482,74 @@ namespace INT_PT002.Forms
switch (lane) switch (lane)
{ {
case "A": case "A":
case "B":
#region Value Assign #region Value Assign
this.CurrentLeakDatas[0].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 1)); this.CurrentLeakDatas[0].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
this.CurrentLeakDatas[1].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
#endregion #endregion
//if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay)
// this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakDatas[0]); this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakDatas[0].ProcessStatus);
//else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment)
// this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakData.ProcessStatus); this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakDatas[0].ProcessStatus);
break;
case "C":
case "D":
#region Value Assign
this.CurrentLeakDatas[2].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
this.CurrentLeakDatas[3].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
#endregion
if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay)
this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakDatas[2].ProcessStatus);
else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment)
this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakDatas[2].ProcessStatus);
break;
case "E":
case "F":
#region Value Assign
this.CurrentLeakDatas[4].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
this.CurrentLeakDatas[5].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
#endregion
if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay)
this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakDatas[4].ProcessStatus);
else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment)
this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakDatas[4].ProcessStatus);
break;
case "G":
case "H":
#region Value Assign
this.CurrentLeakDatas[6].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
this.CurrentLeakDatas[7].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
#endregion
if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay)
this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakDatas[6].ProcessStatus);
else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment)
this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakDatas[6].ProcessStatus);
break;
case "I":
case "J":
#region Value Assign
this.CurrentLeakDatas[8].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
this.CurrentLeakDatas[9].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
#endregion
if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay)
this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakDatas[8].ProcessStatus);
else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment)
this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakDatas[8].ProcessStatus);
break; break;
case "Z": case "Z":
#region Value Assign #region Value Assign
//this.CurrentLeakData.ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 1)); Define.E_ProcessStatus process = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
for (int i = 0; i < this.SystemConfig.EQUIPMENT_LANE; i++)
this.CurrentLeakDatas[i].ProcessStatus = process;
#endregion #endregion
//if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay) if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay)
// this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakData.ProcessStatus); this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakDatas[0].ProcessStatus);
//else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment) else if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.Equipment)
// this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakData.ProcessStatus); this.ChildFormMenu.UpdateDisplayEquipmentProcessStatusDisplay(this.CurrentLeakDatas[0].ProcessStatus);
break; break;
default: default:
break; break;
} }
} }
catch catch

View File

@ -407,7 +407,7 @@ namespace INT_PT002.Forms
this.labelProgress7.BackGroundColor = this.ColorProgressOff; this.labelProgress7.BackGroundColor = this.ColorProgressOff;
this.labelProgress8.BackGroundColor = this.ColorProgressOff; this.labelProgress8.BackGroundColor = this.ColorProgressOff;
break; break;
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
this.labelProgress0.BackGroundColor = this.ColorProgressOn; this.labelProgress0.BackGroundColor = this.ColorProgressOn;
this.labelProgress1.BackGroundColor = this.ColorProgressOff; this.labelProgress1.BackGroundColor = this.ColorProgressOff;
this.labelProgress2.BackGroundColor = this.ColorProgressOff; this.labelProgress2.BackGroundColor = this.ColorProgressOff;
@ -444,7 +444,7 @@ namespace INT_PT002.Forms
// Label Initialize // Label Initialize
//this.InitializeLabel(); //this.InitializeLabel();
break; break;
case Define.E_ProcessStatus._3_ChamberConbined: case Define.E_ProcessStatus._3_MoveToLeak:
this.labelProgress0.BackGroundColor = this.ColorProgressOff; this.labelProgress0.BackGroundColor = this.ColorProgressOff;
this.labelProgress1.BackGroundColor = this.ColorProgressOff; this.labelProgress1.BackGroundColor = this.ColorProgressOff;
this.labelProgress2.BackGroundColor = this.ColorProgressOn; this.labelProgress2.BackGroundColor = this.ColorProgressOn;
@ -454,7 +454,7 @@ namespace INT_PT002.Forms
this.labelProgress7.BackGroundColor = this.ColorProgressOff; this.labelProgress7.BackGroundColor = this.ColorProgressOff;
this.labelProgress8.BackGroundColor = this.ColorProgressOff; this.labelProgress8.BackGroundColor = this.ColorProgressOff;
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
this.labelProgress0.BackGroundColor = this.ColorProgressOff; this.labelProgress0.BackGroundColor = this.ColorProgressOff;
this.labelProgress1.BackGroundColor = this.ColorProgressOff; this.labelProgress1.BackGroundColor = this.ColorProgressOff;
this.labelProgress2.BackGroundColor = this.ColorProgressOff; this.labelProgress2.BackGroundColor = this.ColorProgressOff;
@ -464,7 +464,7 @@ namespace INT_PT002.Forms
this.labelProgress7.BackGroundColor = this.ColorProgressOff; this.labelProgress7.BackGroundColor = this.ColorProgressOff;
this.labelProgress8.BackGroundColor = this.ColorProgressOff; this.labelProgress8.BackGroundColor = this.ColorProgressOff;
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
this.labelProgress0.BackGroundColor = this.ColorProgressOff; this.labelProgress0.BackGroundColor = this.ColorProgressOff;
this.labelProgress1.BackGroundColor = this.ColorProgressOff; this.labelProgress1.BackGroundColor = this.ColorProgressOff;
this.labelProgress2.BackGroundColor = this.ColorProgressOff; this.labelProgress2.BackGroundColor = this.ColorProgressOff;
@ -474,9 +474,9 @@ namespace INT_PT002.Forms
this.labelProgress7.BackGroundColor = this.ColorProgressOff; this.labelProgress7.BackGroundColor = this.ColorProgressOff;
this.labelProgress8.BackGroundColor = this.ColorProgressOff; this.labelProgress8.BackGroundColor = this.ColorProgressOff;
break; break;
case Define.E_ProcessStatus._6_Judgment: case Define.E_ProcessStatus._6_VacuumStart:
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
this.labelProgress0.BackGroundColor = this.ColorProgressOff; this.labelProgress0.BackGroundColor = this.ColorProgressOff;
this.labelProgress1.BackGroundColor = this.ColorProgressOff; this.labelProgress1.BackGroundColor = this.ColorProgressOff;
this.labelProgress2.BackGroundColor = this.ColorProgressOff; this.labelProgress2.BackGroundColor = this.ColorProgressOff;
@ -486,7 +486,7 @@ namespace INT_PT002.Forms
this.labelProgress7.BackGroundColor = this.ColorProgressOff; this.labelProgress7.BackGroundColor = this.ColorProgressOff;
this.labelProgress8.BackGroundColor = this.ColorProgressOff; this.labelProgress8.BackGroundColor = this.ColorProgressOff;
break; break;
case Define.E_ProcessStatus._8_ChamberSeparation: case Define.E_ProcessStatus._8_Judgment:
this.labelProgress0.BackGroundColor = this.ColorProgressOff; this.labelProgress0.BackGroundColor = this.ColorProgressOff;
this.labelProgress1.BackGroundColor = this.ColorProgressOff; this.labelProgress1.BackGroundColor = this.ColorProgressOff;
this.labelProgress2.BackGroundColor = this.ColorProgressOff; this.labelProgress2.BackGroundColor = this.ColorProgressOff;
@ -496,7 +496,7 @@ namespace INT_PT002.Forms
this.labelProgress7.BackGroundColor = this.ColorProgressOn; this.labelProgress7.BackGroundColor = this.ColorProgressOn;
this.labelProgress8.BackGroundColor = this.ColorProgressOff; this.labelProgress8.BackGroundColor = this.ColorProgressOff;
break; break;
case Define.E_ProcessStatus._9_ProductRelease: case Define.E_ProcessStatus._9_VacuumBreak:
this.labelProgress0.BackGroundColor = this.ColorProgressOff; this.labelProgress0.BackGroundColor = this.ColorProgressOff;
this.labelProgress1.BackGroundColor = this.ColorProgressOff; this.labelProgress1.BackGroundColor = this.ColorProgressOff;
this.labelProgress2.BackGroundColor = this.ColorProgressOff; this.labelProgress2.BackGroundColor = this.ColorProgressOff;

View File

@ -543,21 +543,21 @@ namespace INT_PT002.Forms
{ {
switch (status) switch (status)
{ {
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
this.progressBar3.Visible = false; this.progressBar3.Visible = false;
this.progressBar4.Visible = false; this.progressBar4.Visible = false;
this.progressBar6.Visible = false; this.progressBar6.Visible = false;
if (this.smartTimerProgressBar.IsStart == true) if (this.smartTimerProgressBar.IsStart == true)
this.smartTimerProgressBar.Stop(); this.smartTimerProgressBar.Stop();
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
this.progressBar3.Maximum = this.ParentForm.CurrentRecipe.VACUUM_RELIEF * 10; this.progressBar3.Maximum = this.ParentForm.CurrentRecipe.VACUUM_RELIEF * 10;
this.progressBar3.Value = this.progressBar3.Maximum; this.progressBar3.Value = this.progressBar3.Maximum;
this.progressBar3.Visible = true; this.progressBar3.Visible = true;
this.smartTimerProgressBar.Start(); this.smartTimerProgressBar.Start();
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
this.progressBar4.Maximum = this.ParentForm.CurrentRecipe.VACUUM_HOLD1 * 10; this.progressBar4.Maximum = this.ParentForm.CurrentRecipe.VACUUM_HOLD1 * 10;
this.progressBar4.Value = this.progressBar4.Maximum; this.progressBar4.Value = this.progressBar4.Maximum;
@ -567,7 +567,7 @@ namespace INT_PT002.Forms
this.progressBar4.Visible = true; this.progressBar4.Visible = true;
this.smartTimerProgressBar.Start(); this.smartTimerProgressBar.Start();
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
this.progressBar6.Maximum = this.ParentForm.CurrentRecipe.VACUUM_BLOWOFF * 10; this.progressBar6.Maximum = this.ParentForm.CurrentRecipe.VACUUM_BLOWOFF * 10;
this.progressBar6.Value = this.progressBar6.Maximum; this.progressBar6.Value = this.progressBar6.Maximum;
@ -577,7 +577,7 @@ namespace INT_PT002.Forms
this.progressBar6.Visible = true; this.progressBar6.Visible = true;
this.smartTimerProgressBar.Start(); this.smartTimerProgressBar.Start();
break; break;
case Define.E_ProcessStatus._8_ChamberSeparation: case Define.E_ProcessStatus._8_Judgment:
if (this.smartTimerProgressBar.IsStart == true) if (this.smartTimerProgressBar.IsStart == true)
this.smartTimerProgressBar.Stop(); this.smartTimerProgressBar.Stop();
this.progressBar6.Visible = false; this.progressBar6.Visible = false;
@ -595,7 +595,7 @@ namespace INT_PT002.Forms
{ {
case Define.E_ProcessStatus._0_None: case Define.E_ProcessStatus._0_None:
break; break;
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
for (int i = 0; i < this.CollectionLabelProgress.Count; i++) for (int i = 0; i < this.CollectionLabelProgress.Count; i++)
this.CollectionLabelProgress[i].Location = this.CollectionLabelPoint[i]; this.CollectionLabelProgress[i].Location = this.CollectionLabelPoint[i];
@ -604,24 +604,24 @@ namespace INT_PT002.Forms
case Define.E_ProcessStatus._2_ProductEntry: case Define.E_ProcessStatus._2_ProductEntry:
this.UnselectProcessLabelRefresh(1); this.UnselectProcessLabelRefresh(1);
break; break;
case Define.E_ProcessStatus._3_ChamberConbined: case Define.E_ProcessStatus._3_MoveToLeak:
this.UnselectProcessLabelRefresh(2); this.UnselectProcessLabelRefresh(2);
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
this.UnselectProcessLabelRefresh(3); this.UnselectProcessLabelRefresh(3);
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
this.UnselectProcessLabelRefresh(4); this.UnselectProcessLabelRefresh(4);
break; break;
case Define.E_ProcessStatus._6_Judgment: case Define.E_ProcessStatus._6_VacuumStart:
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
this.UnselectProcessLabelRefresh(5); this.UnselectProcessLabelRefresh(5);
break; break;
case Define.E_ProcessStatus._8_ChamberSeparation: case Define.E_ProcessStatus._8_Judgment:
this.UnselectProcessLabelRefresh(6); this.UnselectProcessLabelRefresh(6);
break; break;
case Define.E_ProcessStatus._9_ProductRelease: case Define.E_ProcessStatus._9_VacuumBreak:
this.UnselectProcessLabelRefresh(7); this.UnselectProcessLabelRefresh(7);
break; break;
default: default:
@ -632,7 +632,7 @@ namespace INT_PT002.Forms
{ {
case Define.E_ProcessStatus._0_None: case Define.E_ProcessStatus._0_None:
break; break;
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
for (int i = 0; i < this.CollectionLabelProgress.Count; i++) for (int i = 0; i < this.CollectionLabelProgress.Count; i++)
this.CollectionLabelProgress[i].Location = this.CollectionLabelPoint[i]; this.CollectionLabelProgress[i].Location = this.CollectionLabelPoint[i];
@ -641,24 +641,24 @@ namespace INT_PT002.Forms
case Define.E_ProcessStatus._2_ProductEntry: case Define.E_ProcessStatus._2_ProductEntry:
this.SelectProcessLabelRefresh(1); this.SelectProcessLabelRefresh(1);
break; break;
case Define.E_ProcessStatus._3_ChamberConbined: case Define.E_ProcessStatus._3_MoveToLeak:
this.SelectProcessLabelRefresh(2); this.SelectProcessLabelRefresh(2);
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
this.SelectProcessLabelRefresh(3); this.SelectProcessLabelRefresh(3);
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
this.SelectProcessLabelRefresh(4); this.SelectProcessLabelRefresh(4);
break; break;
case Define.E_ProcessStatus._6_Judgment: case Define.E_ProcessStatus._6_VacuumStart:
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
this.SelectProcessLabelRefresh(5); this.SelectProcessLabelRefresh(5);
break; break;
case Define.E_ProcessStatus._8_ChamberSeparation: case Define.E_ProcessStatus._8_Judgment:
this.SelectProcessLabelRefresh(6); this.SelectProcessLabelRefresh(6);
break; break;
case Define.E_ProcessStatus._9_ProductRelease: case Define.E_ProcessStatus._9_VacuumBreak:
this.SelectProcessLabelRefresh(7); this.SelectProcessLabelRefresh(7);
break; break;
default: default:
@ -994,19 +994,19 @@ namespace INT_PT002.Forms
{ {
switch (this.ProcessStatus) switch (this.ProcessStatus)
{ {
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._4_MoveToCheck:
if (this.progressBar3.Value > 0) if (this.progressBar3.Value > 0)
this.progressBar3.Value -= 10; this.progressBar3.Value -= 10;
else else
this.smartTimerProgressBar.Stop(); this.smartTimerProgressBar.Stop();
break; break;
case Define.E_ProcessStatus._5_VacuumHold: case Define.E_ProcessStatus._5_ChamberMerge:
if (this.progressBar4.Value > 0) if (this.progressBar4.Value > 0)
this.progressBar4.Value -= 10; this.progressBar4.Value -= 10;
else else
this.smartTimerProgressBar.Stop(); this.smartTimerProgressBar.Stop();
break; break;
case Define.E_ProcessStatus._7_VacuumBreak: case Define.E_ProcessStatus._7_VacuumHold:
if (this.progressBar6.Value > 0) if (this.progressBar6.Value > 0)
this.progressBar6.Value -= 10; this.progressBar6.Value -= 10;
else else
@ -1139,28 +1139,28 @@ namespace INT_PT002.Forms
switch (this.testIndex) switch (this.testIndex)
{ {
case 0: case 0:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Initial); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Read);
break; break;
case 1: case 1:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._2_ProductEntry); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._2_ProductEntry);
break; break;
case 2: case 2:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._3_ChamberConbined); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._3_MoveToLeak);
break; break;
case 3: case 3:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._4_VacuumStart); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._4_MoveToCheck);
break; break;
case 4: case 4:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._5_VacuumHold); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._5_ChamberMerge);
break; break;
case 5: case 5:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._7_VacuumBreak); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._7_VacuumHold);
break; break;
case 6: case 6:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._8_ChamberSeparation); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._8_Judgment);
break; break;
case 7: case 7:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._9_ProductRelease); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._9_VacuumBreak);
break; break;
default: default:
break; break;

File diff suppressed because it is too large Load Diff

View File

@ -23,13 +23,8 @@ namespace INT_PT002.Forms
public string ChangeID; public string ChangeID;
private bool BeforeEthernetStatus; private bool BeforeEthernetStatus;
private int FlagIgnoreCNT; private int FlagIgnoreCNT;
private string MessageBoxRange; private string MessageBoxRange;
// 이전 단계 번호(Index 아님) 저장용 변수 private int testIndex;
private Define.E_ProcessStatus PreviousStageNum;
int testIndex;
private Define.E_ProcessStatus ProcessStatus;
private Color ColorProgressOn; private Color ColorProgressOn;
private Size SizeProgressOn; private Size SizeProgressOn;
@ -81,13 +76,9 @@ namespace INT_PT002.Forms
this.FlagIgnoreCNT = 0; this.FlagIgnoreCNT = 0;
this.MessageBoxRange = ""; this.MessageBoxRange = "";
this.ProcessStatus = Define.E_ProcessStatus._0_None;
this.PreviousStageNum = Define.E_ProcessStatus._0_None;
this.ColorProgressOff = Color.FromArgb(231, 231, 231); this.ColorProgressOff = Color.FromArgb(231, 231, 231);
this.SizeProgressOff = new Size(155, 140); this.ColorProgressOn = Color.Teal;
this.ColorProgressOn = Color.FromArgb(95, 196, 188);
this.SizeProgressOn = new Size(190, 170);
this.ColorResultPass = Color.FromArgb(39, 200, 64); this.ColorResultPass = Color.FromArgb(39, 200, 64);
this.ColorResultNG = Color.FromArgb(254, 70, 70); this.ColorResultNG = Color.FromArgb(254, 70, 70);
this.ColorResultNone = Color.FromArgb(42, 43, 45); this.ColorResultNone = Color.FromArgb(42, 43, 45);
@ -200,18 +191,17 @@ namespace INT_PT002.Forms
} }
} }
private void SelectProcessLabelRefresh(int index) private void InitializeProcessStatus()
{ {
this.pictureBoxProgress0Selected.Visible = false;
this.pictureBoxProgress1Selected.Visible = false;
this.pictureBoxProgress2Selected.Visible = false;
this.pictureBoxProgress3Selected.Visible = false;
this.progressBar1.Value = this.progressBar1.Minimum;
this.labelProgress2.RoundRectFillColor = this.ColorProgressOff;
this.labelProgress2_1.BackGroundColor = this.ColorProgressOff;
} }
private void UnselectProcessLabelRefresh(int index)
{
}
private void InitializeProcessLabelRefresh()
{
}
private bool UI_Invoke(ThreadStart invoker) private bool UI_Invoke(ThreadStart invoker)
{ {
try try
@ -596,29 +586,19 @@ namespace INT_PT002.Forms
{ {
switch (status) switch (status)
{ {
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._6_VacuumStart:
this.progressBar1.Visible = false; this.smartTimerProgressBar.Start();
if (this.smartTimerProgressBar.IsStart == true) break;
case Define.E_ProcessStatus._7_VacuumHold:
this.progressBar1.Value = 25;
break;
case Define.E_ProcessStatus._8_Judgment:
this.progressBar1.Value = 25;
break;
case Define.E_ProcessStatus._9_VacuumBreak:
this.progressBar1.Value = this.progressBar1.Maximum;
this.smartTimerProgressBar.Stop(); this.smartTimerProgressBar.Stop();
break; break;
case Define.E_ProcessStatus._4_VacuumStart:
this.progressBar1.Value = +10;
this.progressBar1.Visible = true;
//this.smartTimerProgressBar.Start();
break;
case Define.E_ProcessStatus._5_VacuumHold:
this.progressBar1.Value = +10;
this.progressBar1.Visible = true;
//this.smartTimerProgressBar.Start();
break;
case Define.E_ProcessStatus._7_VacuumBreak:
this.progressBar1.Value = +10;
this.progressBar1.Visible = true;
//this.smartTimerProgressBar.Start();
break;
case Define.E_ProcessStatus._8_ChamberSeparation:
//this.progressBar6.Visible = false;
break;
default: default:
break; break;
} }
@ -680,78 +660,48 @@ namespace INT_PT002.Forms
public void UpdateProcessStatusDisplay(Define.E_ProcessStatus status) public void UpdateProcessStatusDisplay(Define.E_ProcessStatus status)
{ {
this.ProcessStatus = status;
switch (this.PreviousStageNum)
{
case Define.E_ProcessStatus._0_None:
break;
case Define.E_ProcessStatus._1_Initial:
this.UnselectProcessLabelRefresh(0);
break;
case Define.E_ProcessStatus._2_ProductEntry:
this.UnselectProcessLabelRefresh(1);
break;
case Define.E_ProcessStatus._3_ChamberConbined:
this.UnselectProcessLabelRefresh(2);
break;
case Define.E_ProcessStatus._4_VacuumStart:
this.UnselectProcessLabelRefresh(3);
break;
case Define.E_ProcessStatus._5_VacuumHold:
this.UnselectProcessLabelRefresh(4);
break;
case Define.E_ProcessStatus._6_Judgment:
break;
case Define.E_ProcessStatus._7_VacuumBreak:
this.UnselectProcessLabelRefresh(5);
break;
case Define.E_ProcessStatus._8_ChamberSeparation:
this.UnselectProcessLabelRefresh(6);
break;
case Define.E_ProcessStatus._9_ProductRelease:
this.UnselectProcessLabelRefresh(7);
break;
default:
break;
}
switch (status) switch (status)
{ {
case Define.E_ProcessStatus._0_None: case Define.E_ProcessStatus._0_None:
break; break;
case Define.E_ProcessStatus._1_Initial: case Define.E_ProcessStatus._1_Read:
this.SelectProcessLabelRefresh(0); this.pictureBoxProgress3.Visible = true;
this.pictureBoxProgress3Selected.Visible = false;
this.pictureBoxProgress0.Visible = false;
this.pictureBoxProgress0Selected.Visible = true;
break; break;
case Define.E_ProcessStatus._2_ProductEntry: case Define.E_ProcessStatus._2_ProductEntry:
this.SelectProcessLabelRefresh(1); case Define.E_ProcessStatus._3_MoveToLeak:
case Define.E_ProcessStatus._4_MoveToCheck:
case Define.E_ProcessStatus._5_ChamberMerge:
this.pictureBoxProgress0.Visible = true;
this.pictureBoxProgress0Selected.Visible = false;
this.pictureBoxProgress1.Visible = false;
this.pictureBoxProgress1Selected.Visible = true;
break; break;
case Define.E_ProcessStatus._3_ChamberConbined: case Define.E_ProcessStatus._6_VacuumStart:
this.SelectProcessLabelRefresh(2); case Define.E_ProcessStatus._7_VacuumHold:
case Define.E_ProcessStatus._8_Judgment:
case Define.E_ProcessStatus._9_VacuumBreak:
this.pictureBoxProgress1.Visible = true;
this.pictureBoxProgress1Selected.Visible = false;
this.pictureBoxProgress2.Visible = false;
this.pictureBoxProgress2Selected.Visible = true;
this.labelProgress2.RoundRectFillColor = Color.Teal;
this.ProgressBarSetting(status);
break; break;
case Define.E_ProcessStatus._4_VacuumStart: case Define.E_ProcessStatus._10_ChamberRelease:
this.SelectProcessLabelRefresh(3); case Define.E_ProcessStatus._11_MoveToReady:
break; this.labelProgress2.RoundRectFillColor = Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(231)))), ((int)(((byte)(231)))));
case Define.E_ProcessStatus._5_VacuumHold: this.pictureBoxProgress2.Visible = true;
this.SelectProcessLabelRefresh(4); this.pictureBoxProgress2Selected.Visible = false;
break; this.pictureBoxProgress3.Visible = false;
case Define.E_ProcessStatus._6_Judgment: this.pictureBoxProgress3Selected.Visible = true;
break;
case Define.E_ProcessStatus._7_VacuumBreak:
this.SelectProcessLabelRefresh(5);
break;
case Define.E_ProcessStatus._8_ChamberSeparation:
this.SelectProcessLabelRefresh(6);
break;
case Define.E_ProcessStatus._9_ProductRelease:
this.SelectProcessLabelRefresh(7);
break; break;
default: default:
break; break;
} }
this.PreviousStageNum = status;
this.ProgressBarSetting(status);
} }
private void UpdateDisplayDotGraphDiff(SmartDraw draw, DiffData diff) private void UpdateDisplayDotGraphDiff(SmartDraw draw, DiffData diff)
{ {
@ -1115,7 +1065,7 @@ namespace INT_PT002.Forms
this.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Normal); this.ParentForm.SetDisplayMode(Define.E_EquipmentMode.Normal);
this.buttonRecipeNo.ButtonText = this.ParentForm.CurrentRecipe.NUMBER.ToString(); this.buttonRecipeNo.ButtonText = this.ParentForm.CurrentRecipe.NUMBER.ToString();
this.InitializeProcessLabelRefresh(); this.InitializeProcessStatus();
this.UpdateDisplayUser(this.ParentForm.CurrentSystemStatus.CurrentUser); this.UpdateDisplayUser(this.ParentForm.CurrentSystemStatus.CurrentUser);
} }
@ -1202,7 +1152,7 @@ namespace INT_PT002.Forms
this.Logout(); this.Logout();
} }
} }
this.InitializeProcessLabelRefresh(); this.InitializeProcessStatus();
} }
private void buttonMenu_Click(object sender, EventArgs e) private void buttonMenu_Click(object sender, EventArgs e)
{ {
@ -1306,29 +1256,17 @@ namespace INT_PT002.Forms
} }
private void smartTimerProgressBar_Tick(object sender, EventArgs e) private void smartTimerProgressBar_Tick(object sender, EventArgs e)
{ {
//switch (this.ProcessStatus) if (this.progressBar1.Value == 0 || this.progressBar1.Value < 25)
//{ this.progressBar1.Value++;
// case Define.E_ProcessStatus._4_VacuumStart: else if (this.progressBar1.Value == 25 || this.progressBar1.Value < 50)
// if (this.progressBar3.Value > 0) this.progressBar1.Value++;
// this.progressBar3.Value -= 10; else if (this.progressBar1.Value == 50 || this.progressBar1.Value < 75)
// else this.progressBar1.Value++;
// this.smartTimerProgressBar.Stop(); else
// break; {
// case Define.E_ProcessStatus._5_VacuumHold: if (this.progressBar1.Value != this.progressBar1.Maximum)
// if (this.progressBar4.Value > 0) this.progressBar1.Value++;
// this.progressBar4.Value -= 10; }
// else
// this.smartTimerProgressBar.Stop();
// break;
// case Define.E_ProcessStatus._7_VacuumBreak:
// if (this.progressBar6.Value > 0)
// this.progressBar6.Value -= 10;
// else
// this.smartTimerProgressBar.Stop();
// break;
// default:
// break;
//}
} }
private void timerServer_Tick(object sender, EventArgs e) private void timerServer_Tick(object sender, EventArgs e)
{ {
@ -1459,37 +1397,91 @@ namespace INT_PT002.Forms
switch (this.testIndex) switch (this.testIndex)
{ {
case 0: case 0:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Initial); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Read);
break; break;
case 1: case 1:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._2_ProductEntry); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._2_ProductEntry);
break; break;
case 2: case 2:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._3_ChamberConbined); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._3_MoveToLeak);
break; break;
case 3: case 3:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._4_VacuumStart); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._4_MoveToCheck);
break; break;
case 4: case 4:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._5_VacuumHold); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._5_ChamberMerge);
break; break;
case 5: case 5:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._7_VacuumBreak); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._6_VacuumStart);
break; break;
case 6: case 6:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._8_ChamberSeparation); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._7_VacuumHold);
break; break;
case 7: case 7:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._9_ProductRelease); this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._8_Judgment);
break;
case 8:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._9_VacuumBreak);
break;
case 9:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._10_ChamberRelease);
break;
case 10:
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._11_MoveToReady);
break; break;
default: default:
break; break;
} }
if (this.testIndex >= 7) if (this.testIndex >= 10)
this.testIndex = 0; this.testIndex = 0;
else else
this.testIndex++; this.testIndex++;
} }
private void buttonProgress1_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._1_Read);
}
private void buttonProgress2_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._2_ProductEntry);
}
private void buttonProgress3_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._3_MoveToLeak);
}
private void buttonProgress4_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._4_MoveToCheck);
}
private void buttonProgress5_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._5_ChamberMerge);
}
private void buttonProgress6_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._6_VacuumStart);
}
private void buttonProgress7_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._7_VacuumHold);
}
private void buttonProgress8_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._8_Judgment);
}
private void buttonProgress9_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._9_VacuumBreak);
}
private void buttonProgress10_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._10_ChamberRelease);
}
private void buttonProgress11_Click(object sender, EventArgs e)
{
this.UpdateProcessStatusDisplay(Define.E_ProcessStatus._11_MoveToReady);
}
} }
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -106,39 +106,48 @@ namespace INT_PT002
public static Define.E_ProcessStatus StringToProcessStatus(string value) public static Define.E_ProcessStatus StringToProcessStatus(string value)
{ {
int iValue = 0;
Define.E_ProcessStatus status; Define.E_ProcessStatus status;
if (value.Length != 1) if (value.Length != 2)
return Define.E_ProcessStatus._0_None; return Define.E_ProcessStatus._0_None;
switch (value) iValue = int.Parse(value);
switch (iValue)
{ {
case "0": case 0:
status = Define.E_ProcessStatus._1_Initial; status = Define.E_ProcessStatus._1_Read;
break; break;
case "1": case 1:
status = Define.E_ProcessStatus._2_ProductEntry; status = Define.E_ProcessStatus._2_ProductEntry;
break; break;
case "2": case 2:
status = Define.E_ProcessStatus._3_ChamberConbined; status = Define.E_ProcessStatus._3_MoveToLeak;
break; break;
case "3": case 3:
status = Define.E_ProcessStatus._4_VacuumStart; status = Define.E_ProcessStatus._4_MoveToCheck;
break; break;
case "4": case 4:
status = Define.E_ProcessStatus._5_VacuumHold; status = Define.E_ProcessStatus._5_ChamberMerge;
break; break;
case "5": case 5:
status = Define.E_ProcessStatus._6_Judgment; status = Define.E_ProcessStatus._6_VacuumStart;
break; break;
case "6": case 6:
status = Define.E_ProcessStatus._7_VacuumBreak; status = Define.E_ProcessStatus._7_VacuumHold;
break; break;
case "7": case 7:
status = Define.E_ProcessStatus._8_ChamberSeparation; status = Define.E_ProcessStatus._8_Judgment;
break; break;
case "8": case 8:
status = Define.E_ProcessStatus._9_ProductRelease; status = Define.E_ProcessStatus._9_VacuumBreak;
break;
case 9:
status = Define.E_ProcessStatus._10_ChamberRelease;
break;
case 10:
status = Define.E_ProcessStatus._11_MoveToReady;
break; break;
default: default:
status = Define.E_ProcessStatus._0_None; status = Define.E_ProcessStatus._0_None;