SJ84
/
INT_PT002
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Log 줄 수 버그 수정 

- Measurement 오타수정
- Equipment 화면에서 Start 시 우측/하단 버튼 Disable
main
DESKTOP-999R8N3\CJY 2023-04-14 11:03:30 +09:00
parent 12d9ad9e59
commit 342918bd89
7 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
INT_PT002/Controls/Log/ControlMenuLogAlarm.cs
View File

@ -100,8 +100,11 @@ namespace INT_PT002.Controls
}
private void UpdateListBoxCount()
{
this.labelTotalIndex.Text = this.ListBoxCount.ToString();
this.labelRemainIndex.Text = (this.ListBoxCount - this.listBoxTime.ViewRemainCount).ToString();
this.labelTotalIndex.Text = (this.ListBoxCount - 1).ToString();
if (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount < 0)
this.labelRemainIndex.Text = "0";
else
this.labelRemainIndex.Text = (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount).ToString();
}
private void UpdateListBoxDataDisplay(string data)
{

7
INT_PT002/Controls/Log/ControlMenuLogHistory.cs
View File

@ -104,8 +104,11 @@ namespace INT_PT002.Controls
}
private void UpdateListBoxCount()
{
this.labelTotalIndex.Text = this.ListBoxCount.ToString();
this.labelRemainIndex.Text = (this.ListBoxCount - this.listBoxTime.ViewRemainCount).ToString();
this.labelTotalIndex.Text = (this.ListBoxCount - 1).ToString();
if (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount < 0)
this.labelRemainIndex.Text = "0";
else
this.labelRemainIndex.Text = (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount).ToString();
}
private void UpdateListBoxDataDisplay(string data)
{

11
INT_PT002/Controls/Log/ControlMenuLogInspection.cs
View File

@ -157,8 +157,11 @@ namespace INT_PT002.Controls
}
private void UpdateListBoxCount()
{
this.labelTotalIndex.Text = this.ListBoxCount.ToString();
this.labelRemainIndex.Text = (this.ListBoxCount - this.listBoxTime.ViewRemainCount).ToString();
this.labelTotalIndex.Text = (this.ListBoxCount - 1).ToString();
if (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount < 0)
this.labelRemainIndex.Text = "0";
else
this.labelRemainIndex.Text = (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount).ToString();
}
private void UpdateListBoxDataDisplay(string data)
{
@ -312,8 +315,8 @@ namespace INT_PT002.Controls
this.ListBoxCount = 0;
for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++)
{
this.ListPassCount[i] = 0;
this.ListLeakCount[i] = 0;
this.CollectionPassCount[i].Text = "0";
this.CollectionLeakCount[i].Text = "0";
}
if (int.Parse(this.labelCount.Text) == 0)

4
INT_PT002/Controls/System/ControlMenuSystemStatus.cs
View File

@ -325,8 +325,6 @@ namespace INT_PT002.Controls
this.timerOn.Stop();
this.timerOff.Stop();
this.ParentForm.Set_Equipment_ButtonEnable(true);
//if (this.CollectionLabelResult[0].Text == "Measuring..")
//{
// for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++)
@ -340,8 +338,6 @@ namespace INT_PT002.Controls
break;
case Define.E_ProcessStatus._2_ProductEntry:
this.SelectProcessLabelRefresh(1);
this.ParentForm.Set_Equipment_ButtonEnable(false);
break;
case Define.E_ProcessStatus._3_ChamberConbined:
this.SelectProcessLabelRefresh(2);

2
INT_PT002/Forms/FormMainDisplay2.Designer.cs generated
View File

@ -1680,7 +1680,7 @@
this.labelProgress4_1.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(101)))), ((int)(((byte)(103)))));
this.labelProgress4_1.Size = new System.Drawing.Size(150, 24);
this.labelProgress4_1.TabIndex = 198;
this.labelProgress4_1.Text = "Measuerment";
this.labelProgress4_1.Text = "Measurement";
this.labelProgress4_1.TextColor = System.Drawing.Color.Black;
this.labelProgress4_1.TextColorDisable = System.Drawing.Color.Gray;
this.labelProgress4_1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;

2
INT_PT002/Forms/FormMainDisplay2.cs
View File

@ -239,7 +239,7 @@ namespace INT_PT002.Forms
this.labelProgress1_1.Text = "Entry";
this.labelProgress2_1.Text = "Linkage";
this.labelProgress3_1.Text = "V. Start";
this.labelProgress4_1.Text = "Measuerment";
this.labelProgress4_1.Text = "Measurement";
this.labelProgress6_1.Text = "V. Break";
this.labelProgress7_1.Text = "Separation";
this.labelProgress8_1.Text = "Release";

4
INT_PT002/Forms/FormMenu.cs
View File

@ -602,6 +602,8 @@ namespace INT_PT002.Forms
this.labelStart.Visible = true;
this.labelStop.Visible = false;
#endregion
this.Set_Equipment_ButtonEnable(false);
}
else
{
@ -609,6 +611,8 @@ namespace INT_PT002.Forms
this.labelStart.Visible = false;
this.labelStop.Visible = true;
#endregion
this.Set_Equipment_ButtonEnable(true);
}
}
public void Set_Equipment_ButtonEnable(bool data)