diff --git a/ITC81DB_2/DataStore.cs b/ITC81DB_2/DataStore.cs index 804f972..6309321 100644 --- a/ITC81DB_2/DataStore.cs +++ b/ITC81DB_2/DataStore.cs @@ -81,12 +81,12 @@ namespace ITC81DB_2 public enum MainDisplayStore { //DisplayStop, - DisplayNormal, - DisplayXYChart, - DisplayList, - DisplayDataStat, - DisplayMenu, - DisplayFeedback, + BarGraph, + LineGraph, + List, + DataStat, + SubMenu, + Feedback, } public enum MenuSide diff --git a/ITC81DB_2/Forms/FormMain.cs b/ITC81DB_2/Forms/FormMain.cs index 18858c7..58831fc 100644 --- a/ITC81DB_2/Forms/FormMain.cs +++ b/ITC81DB_2/Forms/FormMain.cs @@ -783,7 +783,7 @@ namespace ITC81DB_2.Forms private void UpdateScreen() { - if (this.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) + if (int.Parse(this.CurrentSystemParameter9507.OptionBoard) > 0) { this.ChildFormMainDisplay.CurrentBottomMenuControlEnable(); this.ChildFormMainDisplay.UpdateIcomDisplay(); @@ -817,8 +817,8 @@ namespace ITC81DB_2.Forms #region Test ìš© 통신 로그 fullPath = this.PathDataBackupFolder + "Communicationlog.txt"; this.smartFileCommunicationLog.FilePathName = fullPath; - //this.smartFileCommunicationLog.Open(); - //this.IsCommunicationLogOpen = true; + this.smartFileCommunicationLog.Open(); + this.IsCommunicationLogOpen = true; #endregion } public void CloseSmartUartLink() @@ -1819,8 +1819,8 @@ namespace ITC81DB_2.Forms this.IsJudgmentNow2 = true; // 로그 - if (this.IsCommunicationLogOpen == true) - this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow2 ({0:yyyy-MM-dd HH:mm:ss}): true", DateTime.Now)); + //if (this.IsCommunicationLogOpen == true) + // this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow2 ({0:yyyy-MM-dd HH:mm:ss}): true", DateTime.Now)); this.timerEntryNotDetectedIgnoreTime2.Enabled = true; // 통신 COM1 diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index 8212422..e64c1a1 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -183,7 +183,7 @@ namespace ITC81DB_2.Forms else this.ParentForm.CurrentSystemStatus.CurrentUser.Group = DataStore.UserGroup.Level4Developer; - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; + this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } @@ -692,6 +692,11 @@ namespace ITC81DB_2.Forms 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++) { @@ -701,44 +706,37 @@ namespace ITC81DB_2.Forms } public void UpdateDisplayMenuButton(DataStore.MainDisplayStore main) { - if (this.buttonStop.ButtonStatus != SmartButton.BUTSTATUS.UP) - this.buttonStop.ButtonUp(); - if (this.buttonStartMenu.ButtonStatus != SmartButton.BUTSTATUS.UP) - this.buttonStartMenu.ButtonDown(); - if (this.buttonBargraph.ButtonStatus != SmartButton.BUTSTATUS.UP) - this.buttonBargraph.ButtonUp(); - if (this.buttonLinegraph.ButtonStatus != SmartButton.BUTSTATUS.UP) - this.buttonLinegraph.ButtonUp(); - if (this.buttonFeedback.ButtonStatus != SmartButton.BUTSTATUS.UP) - this.buttonFeedback.ButtonUp(); - if (this.buttonList.ButtonStatus != SmartButton.BUTSTATUS.UP) - this.buttonList.ButtonUp(); - if (this.buttonDataStat.ButtonStatus != SmartButton.BUTSTATUS.UP) - this.buttonDataStat.ButtonUp(); + this.buttonStop.ButtonUp(); + this.buttonStartMenu.ButtonUp(); + this.buttonBargraph.ButtonUp(); + this.buttonLinegraph.ButtonUp(); + this.buttonFeedback.ButtonUp(); + this.buttonList.ButtonUp(); + this.buttonDataStat.ButtonUp(); switch (main) { - case DataStore.MainDisplayStore.DisplayMenu: + case DataStore.MainDisplayStore.SubMenu: if (this.buttonStartMenu.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonStartMenu.ButtonDown(); break; - case DataStore.MainDisplayStore.DisplayNormal: + case DataStore.MainDisplayStore.BarGraph: if (this.buttonBargraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonBargraph.ButtonDown(); break; - case DataStore.MainDisplayStore.DisplayXYChart: + case DataStore.MainDisplayStore.LineGraph: if (this.buttonLinegraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonLinegraph.ButtonDown(); break; - case DataStore.MainDisplayStore.DisplayList: + case DataStore.MainDisplayStore.List: if (this.buttonList.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonList.ButtonDown(); break; - case DataStore.MainDisplayStore.DisplayDataStat: + case DataStore.MainDisplayStore.DataStat: if (this.buttonDataStat.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonDataStat.ButtonDown(); break; - case DataStore.MainDisplayStore.DisplayFeedback: + case DataStore.MainDisplayStore.Feedback: if (this.buttonFeedback.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonFeedback.ButtonDown(); break; @@ -752,31 +750,31 @@ namespace ITC81DB_2.Forms switch (main) { - case DataStore.MainDisplayStore.DisplayMenu: + case DataStore.MainDisplayStore.SubMenu: this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainSubMenu.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.DisplayNormal: + case DataStore.MainDisplayStore.BarGraph: this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainBarGraph.BringToFront(); break; - case DataStore.MainDisplayStore.DisplayXYChart: + case DataStore.MainDisplayStore.LineGraph: this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainLineGraph.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.DisplayList: + case DataStore.MainDisplayStore.List: this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainList.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.DisplayDataStat: + case DataStore.MainDisplayStore.DataStat: this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainDataStatistics.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.DisplayFeedback: + case DataStore.MainDisplayStore.Feedback: this.MainFeedback.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainFeedback.BringToFront(); this.MainWeightScreen.BringToFront(); @@ -806,10 +804,13 @@ namespace ITC81DB_2.Forms if (this.ParentForm.SystemConfig1.EquipmentType == 4) this.buttonConveyorUpDown.ButtonUp(); - if (this.CurrentDisplay == DataStore.MainDisplayStore.DisplayFeedback) + if (this.CurrentDisplay == DataStore.MainDisplayStore.Feedback) { - if (this.buttonFeedback.Visible == false) - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; + if (this.MainFeedback.IsUsingFeedback() == false) + { + this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; + this.DisplayBottomMain(this.CurrentDisplay); + } } this.MainBarGraph.DisplayRefresh(status); @@ -991,19 +992,19 @@ namespace ITC81DB_2.Forms switch (this.CurrentDisplay) { - case DataStore.MainDisplayStore.DisplayMenu: + case DataStore.MainDisplayStore.SubMenu: this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayNormal: + case DataStore.MainDisplayStore.BarGraph: this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayXYChart: + case DataStore.MainDisplayStore.LineGraph: this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayList: + case DataStore.MainDisplayStore.List: this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayDataStat: + case DataStore.MainDisplayStore.DataStat: this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; default: @@ -1027,19 +1028,19 @@ namespace ITC81DB_2.Forms switch (this.CurrentDisplay) { - case DataStore.MainDisplayStore.DisplayMenu: + case DataStore.MainDisplayStore.SubMenu: this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayNormal: + case DataStore.MainDisplayStore.BarGraph: this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayXYChart: + case DataStore.MainDisplayStore.LineGraph: this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayList: + case DataStore.MainDisplayStore.List: this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DisplayDataStat: + case DataStore.MainDisplayStore.DataStat: this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; default: @@ -1080,43 +1081,43 @@ namespace ITC81DB_2.Forms private void buttonStop_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; + this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonBargraph_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayNormal; + this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonLinegraph_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayXYChart; + this.CurrentDisplay = DataStore.MainDisplayStore.LineGraph; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonList_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayList; + this.CurrentDisplay = DataStore.MainDisplayStore.List; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonDataStat_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayDataStat; + this.CurrentDisplay = DataStore.MainDisplayStore.DataStat; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonStartMenu_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayMenu; + this.CurrentDisplay = DataStore.MainDisplayStore.SubMenu; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonFeedback_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DisplayFeedback; + this.CurrentDisplay = DataStore.MainDisplayStore.Feedback; this.DisplayBottomMain(this.CurrentDisplay); } diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index d5931b0..c865e3b 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -18,7 +18,7 @@ - Ver 2.6.4 Modify - Board Program INT81M-2 : V3.0.1 ȣȯ - Çǵå¹é ±â´É Ãß°¡ - - ¿µ¹® »ç¿ë ½Ã ¹ö±× ¼öÁ¤ + - ¿µ¹® »ç¿ë ½Ã ¹ö±× ¼öÁ¤ @ Ver 2.6.4 by CJY - 2023.9.7 diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index bd675e6..680287d 100644 Binary files a/ITC81DB_2/bin/Release/ITC81DB_2.exe and b/ITC81DB_2/bin/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2/obj/Release/ITC81DB_2.exe b/ITC81DB_2/obj/Release/ITC81DB_2.exe index bd675e6..680287d 100644 Binary files a/ITC81DB_2/obj/Release/ITC81DB_2.exe and b/ITC81DB_2/obj/Release/ITC81DB_2.exe differ