diff --git a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiSerial.cs b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiSerial.cs index 4e2170d..bd492a9 100644 --- a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiSerial.cs +++ b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiSerial.cs @@ -931,7 +931,7 @@ namespace ITC81DB_2.Controls this.buttonTestSend.Enabled = true; this.SaveComboBox(this.comboBoxSerialBaudRate.SelectedIndex, this.comboBoxSerialMode.SelectedIndex); - this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateIconDisplay(); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateIcomDisplay(); this.ButtonAddOnDisplay(); this.buttonSave.Enabled = false; diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs index 48596c5..c5ca6f8 100644 --- a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -63,7 +63,7 @@ namespace ITC81DB_2.Controls private void DefaultSetting() { this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SerialNumber; - this.labelDisplayVer.Text = "3.1.2"; + this.labelDisplayVer.Text = "3.1.3"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index 23ee1cc..0b642e4 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -438,6 +438,93 @@ namespace ITC81DB_2.Forms this.pictureBoxFeedbackEnable.Visible = false; } } + /// + /// 사용안함(Modbus 유료화 추가되면 사용할 것) + /// + public void UpdateIconDisplay() + { + int value = 0; + + // Icon - COM1 + if (this.ParentForm.SystemConfig.SerialCOM1Mode == 0) + { + this.pictureBoxCOM1Enable.Visible = false; + this.pictureBoxCOM1Disable.Visible = true; + } + else + { + if (this.ParentForm.SystemConfig.SerialCOM1Mode == (int)Define.E_CommMode.f5_Modbus && this.ParentForm.SystemConfig.IsModbus == false) + { + this.pictureBoxCOM1Enable.Visible = false; + this.pictureBoxCOM1Disable.Visible = true; + } + else + { + this.pictureBoxCOM1Enable.Visible = true; + this.pictureBoxCOM1Disable.Visible = false; + } + } + + // Icon - COM3 + if (this.ParentForm.SystemConfig.SerialCOM3Mode == (int)Define.E_CommMode.f0_None) + { + this.pictureBoxCOM3Enable.Visible = false; + this.pictureBoxCOM3Disable.Visible = true; + } + else + { + if (this.ParentForm.SystemConfig.SerialCOM3Mode == (int)Define.E_CommMode.f5_Modbus && this.ParentForm.SystemConfig.IsModbus == false) + { + this.pictureBoxCOM3Enable.Visible = false; + this.pictureBoxCOM3Disable.Visible = true; + } + else + { + this.pictureBoxCOM3Enable.Visible = true; + this.pictureBoxCOM3Disable.Visible = false; + } + } + + // Icon - COM3 + if (this.ParentForm.SystemConfig.SerialCOM4Mode == 0) + { + this.pictureBoxCOM4Enable.Visible = false; + this.pictureBoxCOM4Disable.Visible = true; + } + else + { + if (this.ParentForm.SystemConfig.SerialCOM4Mode == (int)Define.E_CommMode.f5_Modbus && this.ParentForm.SystemConfig.IsModbus == false) + { + this.pictureBoxCOM4Enable.Visible = false; + this.pictureBoxCOM4Disable.Visible = true; + } + else + { + this.pictureBoxCOM4Enable.Visible = true; + this.pictureBoxCOM4Disable.Visible = false; + } + } + + // 옵션보드 + try + { + value = int.Parse(this.ParentForm.CurrentSystemParameter9507.OptionBoard); + } + catch + { + value = 0; + } + if (value == 1 && int.Parse(this.ParentForm.CurrentSystemParameter9508.OPT1SamplingCount) != 0) // Feedback + { + this.pictureBoxFeedbackDisable.Visible = false; + this.pictureBoxFeedbackEnable.Visible = true; + } + else + { + this.pictureBoxFeedbackDisable.Visible = true; + this.pictureBoxFeedbackEnable.Visible = false; + } + } private void UpdateDisplayUser(SystemStatus status) { string id = "", group = ""; @@ -706,90 +793,6 @@ namespace ITC81DB_2.Forms this.pictureBoxEthernetDisconnection.Visible = true; } } - public void UpdateIconDisplay() - { - int value = 0; - - // Icon - COM1 - if (this.ParentForm.SystemConfig.SerialCOM1Mode == 0) - { - this.pictureBoxCOM1Enable.Visible = false; - this.pictureBoxCOM1Disable.Visible = true; - } - else - { - if (this.ParentForm.SystemConfig.SerialCOM1Mode == 22 && this.ParentForm.SystemConfig.IsModbus == false) - { - this.pictureBoxCOM1Enable.Visible = false; - this.pictureBoxCOM1Disable.Visible = true; - } - else - { - this.pictureBoxCOM1Enable.Visible = true; - this.pictureBoxCOM1Disable.Visible = false; - } - } - - // Icon - COM3 - if (this.ParentForm.SystemConfig.SerialCOM3Mode == (int)Define.E_CommMode.f0_None) - { - this.pictureBoxCOM3Enable.Visible = false; - this.pictureBoxCOM3Disable.Visible = true; - } - else - { - if (this.ParentForm.SystemConfig.SerialCOM3Mode == 22 && this.ParentForm.SystemConfig.IsModbus == false) - { - this.pictureBoxCOM3Enable.Visible = false; - this.pictureBoxCOM3Disable.Visible = true; - } - else - { - this.pictureBoxCOM3Enable.Visible = true; - this.pictureBoxCOM3Disable.Visible = false; - } - } - - // Icon - COM3 - if (this.ParentForm.SystemConfig.SerialCOM4Mode == 0) - { - this.pictureBoxCOM4Enable.Visible = false; - this.pictureBoxCOM4Disable.Visible = true; - } - else - { - if (this.ParentForm.SystemConfig.SerialCOM4Mode == 22 && this.ParentForm.SystemConfig.IsModbus == false) - { - this.pictureBoxCOM4Enable.Visible = false; - this.pictureBoxCOM4Disable.Visible = true; - } - else - { - this.pictureBoxCOM4Enable.Visible = true; - this.pictureBoxCOM4Disable.Visible = false; - } - } - - // 옵션보드 - try - { - value = int.Parse(this.ParentForm.CurrentSystemParameter9507.OptionBoard); - } - catch - { - value = 0; - } - if (value == 1 && int.Parse(this.ParentForm.CurrentSystemParameter9508.OPT1SamplingCount) != 0) // Feedback - { - this.pictureBoxFeedbackDisable.Visible = false; - this.pictureBoxFeedbackEnable.Visible = true; - } - else - { - this.pictureBoxFeedbackDisable.Visible = true; - this.pictureBoxFeedbackEnable.Visible = false; - } - } public void PopUpWarning(string warning) { this.labelAlarmWindow.Text = warning; diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index 32bc3b1..bf17b09 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -14,6 +14,11 @@ 2 ⺻ 跮 */ +@ Ver 3.1.3 by CJY + - 2025.02.13 + - Ver 3.1.2 Modify + - Icon Enable ȵǴ + @ Ver 3.1.2 by CJY - 2024.12.24 - Ver 3.1.1 Modify diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index 959c425..ce9d053 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 959c425..ce9d053 100644 Binary files a/ITC81DB_2/obj/Release/ITC81DB_2.exe and b/ITC81DB_2/obj/Release/ITC81DB_2.exe differ