From bef1c65158b6432ce81ff416a33e174cf45ba9cb Mon Sep 17 00:00:00 2001 From: Seonjae Date: Tue, 28 Mar 2023 09:04:33 +0900 Subject: [PATCH] =?UTF-8?q?Form1=20-=20UpdateDisplayAlarmView()=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT_PT002/Forms/FormMainDisplay1.cs | 95 ++++++++++++++++++++++++++++ INT_PT002/Forms/FormMenu.Designer.cs | 6 +- 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/INT_PT002/Forms/FormMainDisplay1.cs b/INT_PT002/Forms/FormMainDisplay1.cs index 8dbe4ff..7cf3eaf 100644 --- a/INT_PT002/Forms/FormMainDisplay1.cs +++ b/INT_PT002/Forms/FormMainDisplay1.cs @@ -647,6 +647,101 @@ namespace INT_PT002.Forms this.CollectionPressureMaster[i].Text = value; } } + public void UpdateDisplayAlarmView(AlarmList alarm) + { + //if (alarm.IsServoEmergencyStop == true) + // this.labelAlarm.Text = "a1_Servo emergency stop"; + //if (alarm.IsServo1Alarm == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a2_Servo1"; + //} + //if (alarm.IsServo2Alarm == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a3_Servo2"; + //} + //if (alarm.IsServoTorque1AlarmTorque == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a4_Servo1 Torque"; + //} + //if (alarm.IsServoTorque2AlarmTorque == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a5_Servo2 Torque"; + //} + //if (alarm.IsPressureError == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a6_Pressure"; + //} + //if (alarm.CollectionIsSensorBoardError[0] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a7_Sensor board 1"; + //} + //if (alarm.CollectionIsSensorBoardError[1] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a8_Sensor board 2"; + //} + //if (alarm.CollectionIsSensorBoardError[2] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a9_Sensor board 3"; + //} + //if (alarm.CollectionIsSensorBoardError[3] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a10_Sensor board 4"; + //} + //if (alarm.CollectionIsSensorBoardError[4] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a11_Sensor board 5"; + //} + //if (alarm.CollectionIsSensorBoardError[5] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a12_Sensor board 6"; + //} + //if (alarm.CollectionIsSensorBoardError[6] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a13_Sensor board 7"; + //} + //if (alarm.CollectionIsSensorBoardError[7] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a14_Sensor board 8"; + //} + //if (alarm.CollectionIsSensorBoardError[8] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a15_Sensor board 9"; + //} + //if (alarm.CollectionIsSensorBoardError[9] == true) + //{ + // if (this.labelAlarm.Text != "") + // this.labelAlarm.Text += " "; + // this.labelAlarm.Text += "a16_Sensor board 10"; + //} + } public void UpdateDisplayJudgmentData(LeakData datas) { diff --git a/INT_PT002/Forms/FormMenu.Designer.cs b/INT_PT002/Forms/FormMenu.Designer.cs index 5adec8d..84ec1ce 100644 --- a/INT_PT002/Forms/FormMenu.Designer.cs +++ b/INT_PT002/Forms/FormMenu.Designer.cs @@ -124,7 +124,7 @@ this.smartLabel3.BackGroundColor = System.Drawing.Color.SkyBlue; this.smartLabel3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel3.LineSpacing = 0F; this.smartLabel3.Location = new System.Drawing.Point(743, 3); this.smartLabel3.Name = "smartLabel3"; @@ -147,7 +147,7 @@ this.smartLabel2.BackGroundColor = System.Drawing.Color.SkyBlue; this.smartLabel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel2.LineSpacing = 0F; this.smartLabel2.Location = new System.Drawing.Point(849, 3); this.smartLabel2.Name = "smartLabel2"; @@ -177,7 +177,7 @@ this.smartLabel1.BackGroundColor = System.Drawing.Color.SkyBlue; this.smartLabel1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.smartLabel1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel1.LineSpacing = 0F; this.smartLabel1.Location = new System.Drawing.Point(119, 3); this.smartLabel1.Name = "smartLabel1";