diff --git a/INT_PT002/DataStore/SystemConfiguration.cs b/INT_PT002/DataStore/SystemConfiguration.cs index 3e7937f..f48cbe9 100644 --- a/INT_PT002/DataStore/SystemConfiguration.cs +++ b/INT_PT002/DataStore/SystemConfiguration.cs @@ -17,7 +17,6 @@ namespace INT_PT002.DataStore private int m_RECIPE_NUMBER; private Define.E_LanguageID m_LANGUAGE; - private Define.E_FormStore m_CURRENT_FORM; private UserItem m_CURRENT_USER; private int m_CHART1_DRAW_STEP; @@ -72,11 +71,6 @@ namespace INT_PT002.DataStore get { return this.m_LANGUAGE; } set { this.m_LANGUAGE = value; } } - public Define.E_FormStore CURRENT_FORM - { - get { return this.m_CURRENT_FORM; } - set { this.m_CURRENT_FORM = value; } - } public UserItem CURRENT_USER { get { return this.m_CURRENT_USER; } @@ -174,7 +168,6 @@ namespace INT_PT002.DataStore this.RECIPE_NUMBER = 1; this.LANGUAGE = Define.E_LanguageID.Korean; - this.CURRENT_FORM = Define.E_FormStore.FormNone; this.CURRENT_USER = new UserItem(); this.CHART1_DRAW_STEP = 4; @@ -1480,6 +1473,7 @@ namespace INT_PT002.DataStore #region Constructor public HistoryData() { + this.Initialize(); } #endregion diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs index edabcf3..5a06418 100644 --- a/INT_PT002/Forms/FormMain.cs +++ b/INT_PT002/Forms/FormMain.cs @@ -443,7 +443,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_user_list_t userList = (UserManager.UserMgr_user_list_t)data; - if (this.SystemConfig.CURRENT_FORM == Define.E_FormStore.FormUserEditor) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormUserEditor) this.ChildFormMenu.Child_User_UserEditor.CallBackGetUserData(userList); } catch @@ -456,7 +456,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_login_timeout_t loginTimeout = (UserManager.UserMgr_login_timeout_t)data; - if (this.SystemConfig.CURRENT_FORM == Define.E_FormStore.FormMainDisplay) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) this.ChildFormMainDisplay.CallBackUserListLoginTimeoutDataEvent(loginTimeout); } catch (Exception e) @@ -469,7 +469,7 @@ namespace INT_PT002.Forms { UserManager.UserMgr_user_lock_t user = (UserManager.UserMgr_user_lock_t)data; - if (this.SystemConfig.CURRENT_FORM == Define.E_FormStore.FormUserEditor) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormUserEditor) this.ChildFormMenu.Child_User_UserEditor.CallBackUserListLockDataEvent(user); } catch @@ -1535,13 +1535,13 @@ namespace INT_PT002.Forms switch (lane) { - case "0": + case "Z": #region Value Assign for (int i = 0; i < 5; i++) this.CollectionIOTest_InputData[i] = receiveData.Substring(i, 1); #endregion - //if (this.SystemConfig.CURRENT_FORM == Define.E_FormStore.FormIOTest) + //if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) // this.ChildFormIOTest.UpdateInputRead(this.CollectionIOTest_InputData); if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) @@ -1560,15 +1560,16 @@ namespace INT_PT002.Forms switch (lane) { - case "0": + case "Z": #region Value Assign this.CurrentAlarmList.SetAlarm(receiveData.Substring(0, 8)); #endregion - if (this.SystemConfig.CURRENT_FORM == Define.E_FormStore.FormIOTest) - this.ChildFormMenu.Child_Manual_IoTest.UpdateDisplayAlarmView(this.CurrentAlarmList); - else + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay) this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList); + else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest) + this.ChildFormMenu.Child_Manual_IoTest.UpdateDisplayAlarmView(this.CurrentAlarmList); + break; default: break; diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index 4741229..6c2be90 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -473,98 +473,90 @@ namespace INT_PT002.Forms } public void UpdateDisplayAlarmView(AlarmList alarm) { + this.labelAlarm.Text = ""; + if (alarm.IsServoEmergencyStop == true) - this.labelAlarm.Text = "a1_Servo emergency stop"; + this.labelAlarm.Text = "a1_Servo emergency stop "; if (alarm.IsServo1Alarm == true) - { - if(this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a2_Servo1"; - } + this.labelAlarm.Text += "a2_Servo1 "; if (alarm.IsServo2Alarm == true) - { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a3_Servo2"; - } + this.labelAlarm.Text += "a3_Servo2 "; if (alarm.IsServoTorque1AlarmTorque == true) - { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a4_Servo1 Torque"; - } + this.labelAlarm.Text += "a4_Servo1 Torque "; if (alarm.IsServoTorque2AlarmTorque == true) - { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a5_Servo2 Torque"; - } + this.labelAlarm.Text += "a5_Servo2 Torque "; if (alarm.IsPressureError == true) - { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a6_Pressure"; - } + this.labelAlarm.Text += "a6_Pressure "; if (alarm.CollectionIsSensorBoardError[0] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a7_Sensor board 1"; + this.labelAlarm.Text += "a7_Sensor board 1 "; + this.CollectionLabelSensorStatus[0].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[0].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[1] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a8_Sensor board 2"; + this.labelAlarm.Text += "a8_Sensor board 2 "; + this.CollectionLabelSensorStatus[1].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[1].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[2] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a9_Sensor board 3"; + this.labelAlarm.Text += "a9_Sensor board 3 "; + this.CollectionLabelSensorStatus[2].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[2].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[3] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a10_Sensor board 4"; + this.labelAlarm.Text += "a10_Sensor board 4 "; + this.CollectionLabelSensorStatus[3].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[3].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[4] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a11_Sensor board 5"; + this.labelAlarm.Text += "a11_Sensor board 5 "; + this.CollectionLabelSensorStatus[4].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[4].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[5] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a12_Sensor board 6"; + this.labelAlarm.Text += "a12_Sensor board 6 "; + this.CollectionLabelSensorStatus[5].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[5].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[6] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a13_Sensor board 7"; + this.labelAlarm.Text += "a13_Sensor board 7 "; + this.CollectionLabelSensorStatus[6].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[6].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[7] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a14_Sensor board 8"; + this.labelAlarm.Text += "a14_Sensor board 8 "; + this.CollectionLabelSensorStatus[7].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[7].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[8] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a15_Sensor board 9"; + this.labelAlarm.Text += "a15_Sensor board 9 "; + this.CollectionLabelSensorStatus[8].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[8].BackGroundColor = this.ColorSensorNormal; if (alarm.CollectionIsSensorBoardError[9] == true) { - if (this.labelAlarm.Text != "") - this.labelAlarm.Text += " "; - this.labelAlarm.Text += "a16_Sensor board 10"; + this.labelAlarm.Text += "a16_Sensor board 10 "; + this.CollectionLabelSensorStatus[9].BackGroundColor = this.ColorSensorError; } + else + this.CollectionLabelSensorStatus[9].BackGroundColor = this.ColorSensorNormal; } private void UpdateProgressBarPressure() diff --git a/INT_PT002/INT_PT002.csproj b/INT_PT002/INT_PT002.csproj index 79cdb51..218108d 100644 --- a/INT_PT002/INT_PT002.csproj +++ b/INT_PT002/INT_PT002.csproj @@ -49,15 +49,15 @@ False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXNCommon.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXNFDCommon.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNFDCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXN_IEC1000.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXN_IEC1000.dll