chojy
/
ITC81DB_2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2열 피드백 버그 수정

master
DESKTOP-999R8N3\CJY 2023-10-04 17:30:15 +09:00
parent bbb72386d7
commit b7d010be2b
6 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ITC81DB_2/DataStore.cs
View File

@ -81,12 +81,12 @@ namespace ITC81DB_2
public enum MainDisplayStore public enum MainDisplayStore
{ {
//DisplayStop, //DisplayStop,
DisplayNormal, BarGraph,
DisplayXYChart, LineGraph,
DisplayList, List,
DisplayDataStat, DataStat,
DisplayMenu, SubMenu,
DisplayFeedback, Feedback,
} }
public enum MenuSide public enum MenuSide

10
ITC81DB_2/Forms/FormMain.cs
View File

@ -783,7 +783,7 @@ namespace ITC81DB_2.Forms
private void UpdateScreen() private void UpdateScreen()
{ {
if (this.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) if (int.Parse(this.CurrentSystemParameter9507.OptionBoard) > 0)
{ {
this.ChildFormMainDisplay.CurrentBottomMenuControlEnable(); this.ChildFormMainDisplay.CurrentBottomMenuControlEnable();
this.ChildFormMainDisplay.UpdateIcomDisplay(); this.ChildFormMainDisplay.UpdateIcomDisplay();
@ -817,8 +817,8 @@ namespace ITC81DB_2.Forms
#region Test 용 통신 로그 #region Test 용 통신 로그
fullPath = this.PathDataBackupFolder + "Communicationlog.txt"; fullPath = this.PathDataBackupFolder + "Communicationlog.txt";
this.smartFileCommunicationLog.FilePathName = fullPath; this.smartFileCommunicationLog.FilePathName = fullPath;
//this.smartFileCommunicationLog.Open(); this.smartFileCommunicationLog.Open();
//this.IsCommunicationLogOpen = true; this.IsCommunicationLogOpen = true;
#endregion #endregion
} }
public void CloseSmartUartLink() public void CloseSmartUartLink()
@ -1819,8 +1819,8 @@ namespace ITC81DB_2.Forms
this.IsJudgmentNow2 = true; this.IsJudgmentNow2 = true;
// 로그 // 로그
if (this.IsCommunicationLogOpen == true) //if (this.IsCommunicationLogOpen == true)
this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow2 ({0:yyyy-MM-dd HH:mm:ss}): true", DateTime.Now)); // this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow2 ({0:yyyy-MM-dd HH:mm:ss}): true", DateTime.Now));
this.timerEntryNotDetectedIgnoreTime2.Enabled = true; this.timerEntryNotDetectedIgnoreTime2.Enabled = true;
// 통신 COM1 // 통신 COM1

83
ITC81DB_2/Forms/FormMainDisplay.cs
View File

@ -183,7 +183,7 @@ namespace ITC81DB_2.Forms
else else
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = DataStore.UserGroup.Level4Developer; this.ParentForm.CurrentSystemStatus.CurrentUser.Group = DataStore.UserGroup.Level4Developer;
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }
@ -692,6 +692,11 @@ namespace ITC81DB_2.Forms
this.ParentForm.UpdateFeedbackDeviation2(this.ParentForm.CurrentProductItem2, this.ParentForm.CurrentSystemParameter9508); this.ParentForm.UpdateFeedbackDeviation2(this.ParentForm.CurrentProductItem2, this.ParentForm.CurrentSystemParameter9508);
} }
} }
else
{
this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph;
this.DisplayBottomMain(this.CurrentDisplay);
}
for (int i = 0; i < buttons.Count; i++) for (int i = 0; i < buttons.Count; i++)
{ {
@ -701,44 +706,37 @@ namespace ITC81DB_2.Forms
} }
public void UpdateDisplayMenuButton(DataStore.MainDisplayStore main) public void UpdateDisplayMenuButton(DataStore.MainDisplayStore main)
{ {
if (this.buttonStop.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonStop.ButtonUp(); this.buttonStop.ButtonUp();
if (this.buttonStartMenu.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonStartMenu.ButtonUp();
this.buttonStartMenu.ButtonDown();
if (this.buttonBargraph.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonBargraph.ButtonUp(); this.buttonBargraph.ButtonUp();
if (this.buttonLinegraph.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLinegraph.ButtonUp(); this.buttonLinegraph.ButtonUp();
if (this.buttonFeedback.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonFeedback.ButtonUp(); this.buttonFeedback.ButtonUp();
if (this.buttonList.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonList.ButtonUp(); this.buttonList.ButtonUp();
if (this.buttonDataStat.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonDataStat.ButtonUp(); this.buttonDataStat.ButtonUp();
switch (main) switch (main)
{ {
case DataStore.MainDisplayStore.DisplayMenu: case DataStore.MainDisplayStore.SubMenu:
if (this.buttonStartMenu.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonStartMenu.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonStartMenu.ButtonDown(); this.buttonStartMenu.ButtonDown();
break; break;
case DataStore.MainDisplayStore.DisplayNormal: case DataStore.MainDisplayStore.BarGraph:
if (this.buttonBargraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonBargraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonBargraph.ButtonDown(); this.buttonBargraph.ButtonDown();
break; break;
case DataStore.MainDisplayStore.DisplayXYChart: case DataStore.MainDisplayStore.LineGraph:
if (this.buttonLinegraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonLinegraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonLinegraph.ButtonDown(); this.buttonLinegraph.ButtonDown();
break; break;
case DataStore.MainDisplayStore.DisplayList: case DataStore.MainDisplayStore.List:
if (this.buttonList.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonList.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonList.ButtonDown(); this.buttonList.ButtonDown();
break; break;
case DataStore.MainDisplayStore.DisplayDataStat: case DataStore.MainDisplayStore.DataStat:
if (this.buttonDataStat.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonDataStat.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonDataStat.ButtonDown(); this.buttonDataStat.ButtonDown();
break; break;
case DataStore.MainDisplayStore.DisplayFeedback: case DataStore.MainDisplayStore.Feedback:
if (this.buttonFeedback.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonFeedback.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonFeedback.ButtonDown(); this.buttonFeedback.ButtonDown();
break; break;
@ -752,31 +750,31 @@ namespace ITC81DB_2.Forms
switch (main) switch (main)
{ {
case DataStore.MainDisplayStore.DisplayMenu: case DataStore.MainDisplayStore.SubMenu:
this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.MainSubMenu.BringToFront(); this.MainSubMenu.BringToFront();
this.MainWeightScreen.BringToFront(); this.MainWeightScreen.BringToFront();
break; break;
case DataStore.MainDisplayStore.DisplayNormal: case DataStore.MainDisplayStore.BarGraph:
this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.MainBarGraph.BringToFront(); this.MainBarGraph.BringToFront();
break; break;
case DataStore.MainDisplayStore.DisplayXYChart: case DataStore.MainDisplayStore.LineGraph:
this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.MainLineGraph.BringToFront(); this.MainLineGraph.BringToFront();
this.MainWeightScreen.BringToFront(); this.MainWeightScreen.BringToFront();
break; break;
case DataStore.MainDisplayStore.DisplayList: case DataStore.MainDisplayStore.List:
this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.MainList.BringToFront(); this.MainList.BringToFront();
this.MainWeightScreen.BringToFront(); this.MainWeightScreen.BringToFront();
break; break;
case DataStore.MainDisplayStore.DisplayDataStat: case DataStore.MainDisplayStore.DataStat:
this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.MainDataStatistics.BringToFront(); this.MainDataStatistics.BringToFront();
this.MainWeightScreen.BringToFront(); this.MainWeightScreen.BringToFront();
break; break;
case DataStore.MainDisplayStore.DisplayFeedback: case DataStore.MainDisplayStore.Feedback:
this.MainFeedback.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainFeedback.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.MainFeedback.BringToFront(); this.MainFeedback.BringToFront();
this.MainWeightScreen.BringToFront(); this.MainWeightScreen.BringToFront();
@ -806,10 +804,13 @@ namespace ITC81DB_2.Forms
if (this.ParentForm.SystemConfig1.EquipmentType == 4) if (this.ParentForm.SystemConfig1.EquipmentType == 4)
this.buttonConveyorUpDown.ButtonUp(); this.buttonConveyorUpDown.ButtonUp();
if (this.CurrentDisplay == DataStore.MainDisplayStore.DisplayFeedback) if (this.CurrentDisplay == DataStore.MainDisplayStore.Feedback)
{ {
if (this.buttonFeedback.Visible == false) if (this.MainFeedback.IsUsingFeedback() == false)
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; {
this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph;
this.DisplayBottomMain(this.CurrentDisplay);
}
} }
this.MainBarGraph.DisplayRefresh(status); this.MainBarGraph.DisplayRefresh(status);
@ -991,19 +992,19 @@ namespace ITC81DB_2.Forms
switch (this.CurrentDisplay) switch (this.CurrentDisplay)
{ {
case DataStore.MainDisplayStore.DisplayMenu: case DataStore.MainDisplayStore.SubMenu:
this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayNormal: case DataStore.MainDisplayStore.BarGraph:
this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayXYChart: case DataStore.MainDisplayStore.LineGraph:
this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayList: case DataStore.MainDisplayStore.List:
this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayDataStat: case DataStore.MainDisplayStore.DataStat:
this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
default: default:
@ -1027,19 +1028,19 @@ namespace ITC81DB_2.Forms
switch (this.CurrentDisplay) switch (this.CurrentDisplay)
{ {
case DataStore.MainDisplayStore.DisplayMenu: case DataStore.MainDisplayStore.SubMenu:
this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayNormal: case DataStore.MainDisplayStore.BarGraph:
this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayXYChart: case DataStore.MainDisplayStore.LineGraph:
this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayList: case DataStore.MainDisplayStore.List:
this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case DataStore.MainDisplayStore.DisplayDataStat: case DataStore.MainDisplayStore.DataStat:
this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
default: default:
@ -1080,43 +1081,43 @@ namespace ITC81DB_2.Forms
private void buttonStop_Click(object sender, EventArgs e) private void buttonStop_Click(object sender, EventArgs e)
{ {
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }
private void buttonBargraph_Click(object sender, EventArgs e) private void buttonBargraph_Click(object sender, EventArgs e)
{ {
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }
private void buttonLinegraph_Click(object sender, EventArgs e) private void buttonLinegraph_Click(object sender, EventArgs e)
{ {
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayXYChart; this.CurrentDisplay = DataStore.MainDisplayStore.LineGraph;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }
private void buttonList_Click(object sender, EventArgs e) private void buttonList_Click(object sender, EventArgs e)
{ {
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayList; this.CurrentDisplay = DataStore.MainDisplayStore.List;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }
private void buttonDataStat_Click(object sender, EventArgs e) private void buttonDataStat_Click(object sender, EventArgs e)
{ {
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayDataStat; this.CurrentDisplay = DataStore.MainDisplayStore.DataStat;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }
private void buttonStartMenu_Click(object sender, EventArgs e) private void buttonStartMenu_Click(object sender, EventArgs e)
{ {
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayMenu; this.CurrentDisplay = DataStore.MainDisplayStore.SubMenu;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }
private void buttonFeedback_Click(object sender, EventArgs e) private void buttonFeedback_Click(object sender, EventArgs e)
{ {
this.CurrentDisplay = DataStore.MainDisplayStore.DisplayFeedback; this.CurrentDisplay = DataStore.MainDisplayStore.Feedback;
this.DisplayBottomMain(this.CurrentDisplay); this.DisplayBottomMain(this.CurrentDisplay);
} }

BIN
ITC81DB_2/bin/Release/ITC81DB_2.exe
View File

Binary file not shown.

BIN
ITC81DB_2/obj/Release/ITC81DB_2.exe
View File

Binary file not shown.