From 41a55f8690669f9eddbbcca505b5ce5541a3eb30 Mon Sep 17 00:00:00 2001 From: Seonjae Date: Mon, 21 Apr 2025 10:25:31 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT_LKD_2.suo | Bin 145408 -> 147968 bytes .../ControlMenuManualIoTest.Designer.cs | 82 ++-- .../Recipe/ControlMenuRecipeSetting.cs | 18 + .../User/ControlMenuUserMyPage.Designer.cs | 8 +- .../User/ControlMenuUserUserEditor.cs | 4 + INT_LKD_2/DataStore/AlarmList.cs | 453 ++++++++++++++---- INT_LKD_2/DialogForms/DialogFormMessage.cs | 16 +- .../DialogForms/DialogFormProgressBar.cs | 14 +- INT_LKD_2/Forms/FormMain.cs | 4 +- INT_LKD_2/Forms/FormMainDisplay.Designer.cs | 67 +-- INT_LKD_2/Forms/FormMainDisplay.cs | 45 +- INT_LKD_2/Forms/FormMenu.cs | 22 +- 12 files changed, 536 insertions(+), 197 deletions(-) diff --git a/INT_LKD_2.suo b/INT_LKD_2.suo index 1c6ed8eb0356891e51081deda3c392ef53dc736d..fc606d0c4bea20e659bbe6f620857abd26eebf9d 100644 GIT binary patch delta 3164 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 400) - { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); - } - else - { - this.smartTimerAlarm.Stop(); - this.labelAlarm.Location = new Point(3, 26); - } + //if (this.labelAlarm.Width > 400) + //{ + // if (this.labelAlarm.Text != "") + // this.smartTimerAlarm.Start(); + //} + //else + //{ + // this.smartTimerAlarm.Stop(); + // this.labelAlarm.Location = new Point(3, 26); + //} } private void ProcessStatusPicturBox(Define.E_ProcessStatus status) diff --git a/INT_LKD_2/Forms/FormMenu.cs b/INT_LKD_2/Forms/FormMenu.cs index a6cb057..543db5e 100644 --- a/INT_LKD_2/Forms/FormMenu.cs +++ b/INT_LKD_2/Forms/FormMenu.cs @@ -253,19 +253,19 @@ namespace INT_LKD_2.Forms value += "a18_Disp Sensor2 "; value = value.Trim(); - this.labelAlarm.Size = new Size(value.Length * 9, 20); + //this.labelAlarm.Size = new Size(value.Length * 9, 20); this.labelAlarm.Text = value; - if (this.labelAlarm.Width > 465) - { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); - } - else - { - this.smartTimerAlarm.Stop(); - this.labelAlarm.Location = new Point(0, 10); - } + //if (this.labelAlarm.Width > 465) + //{ + // if (this.labelAlarm.Text != "") + // this.smartTimerAlarm.Start(); + //} + //else + //{ + // this.smartTimerAlarm.Stop(); + // this.labelAlarm.Location = new Point(0, 10); + //} } public void UpdateDisplayTime(DateTime time) {