From 1ff549ed759b59dd53ad079721a985cfad6da15d Mon Sep 17 00:00:00 2001 From: shark219-hub Date: Thu, 28 Nov 2024 09:35:50 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B0=BD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20[=EC=A0=80=EC=9E=A5]=20=EC=8B=9C,=20'KA=20=EC=9D=B8?= =?UTF-8?q?=EB=94=94=EC=BC=80=EC=9D=B4=ED=84=B0'=EC=99=80=20'Alarm=20PLC'?= =?UTF-8?q?=EC=9D=98=20=EB=8F=99=EC=9D=BC=ED=95=9C=20=ED=86=B5=EC=8B=A0?= =?UTF-8?q?=ED=8F=AC=ED=8A=B8=20=EC=84=A4=EC=A0=95=20=EB=B0=A9=EC=A7=80=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 --- cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs | 2 +- cVMS.NET_CS/Setting/Frm_Config.Designer.cs | 4 ---- cVMS.NET_CS/Setting/Frm_Config.cs | 12 ++++++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs b/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs index a83aa8d..c6ced90 100644 --- a/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs +++ b/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs @@ -55,7 +55,7 @@ namespace vmsnet //데이터를 요청하고 처리하는 코드 필요 RUN_GETDATA(); - //인디게이터 디스플레이 + //인디케이터 디스플레이 if (PUB.indicator.IsOpen) { PUB.KA1_SUM = 0f; diff --git a/cVMS.NET_CS/Setting/Frm_Config.Designer.cs b/cVMS.NET_CS/Setting/Frm_Config.Designer.cs index 037c2f1..efa7f39 100644 --- a/cVMS.NET_CS/Setting/Frm_Config.Designer.cs +++ b/cVMS.NET_CS/Setting/Frm_Config.Designer.cs @@ -1467,7 +1467,6 @@ namespace vmsnet // this.BindingNavigatorPositionItem.AccessibleName = "위치"; this.BindingNavigatorPositionItem.AutoSize = false; - this.BindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem"; this.BindingNavigatorPositionItem.Size = new System.Drawing.Size(70, 31); this.BindingNavigatorPositionItem.Text = "0"; @@ -1728,7 +1727,6 @@ namespace vmsnet // this.ToolStripTextBox3.AccessibleName = "위치"; this.ToolStripTextBox3.AutoSize = false; - this.ToolStripTextBox3.Font = new System.Drawing.Font("맑은 고딕", 9F); this.ToolStripTextBox3.Name = "ToolStripTextBox3"; this.ToolStripTextBox3.Size = new System.Drawing.Size(70, 31); this.ToolStripTextBox3.Text = "0"; @@ -2249,7 +2247,6 @@ namespace vmsnet // this.ToolStripTextBox2.AccessibleName = "위치"; this.ToolStripTextBox2.AutoSize = false; - this.ToolStripTextBox2.Font = new System.Drawing.Font("맑은 고딕", 9F); this.ToolStripTextBox2.Name = "ToolStripTextBox2"; this.ToolStripTextBox2.Size = new System.Drawing.Size(70, 31); this.ToolStripTextBox2.Text = "0"; @@ -2677,7 +2674,6 @@ namespace vmsnet // this.ToolStripTextBox1.AccessibleName = "위치"; this.ToolStripTextBox1.AutoSize = false; - this.ToolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.ToolStripTextBox1.Name = "ToolStripTextBox1"; this.ToolStripTextBox1.Size = new System.Drawing.Size(70, 31); this.ToolStripTextBox1.Text = "0"; diff --git a/cVMS.NET_CS/Setting/Frm_Config.cs b/cVMS.NET_CS/Setting/Frm_Config.cs index 449f8d4..5c28838 100644 --- a/cVMS.NET_CS/Setting/Frm_Config.cs +++ b/cVMS.NET_CS/Setting/Frm_Config.cs @@ -44,7 +44,7 @@ namespace vmsnet cmb_plcport.Items.Clear(); cmb_plcport.Items.AddRange(ports); - /* 작성자: 이재웅, 작성일: 2024-11-27, 작성내용: KA 인디게이터용 PC에서 인가된 통신포트 표시 */ + /* 작성자: 이재웅, 작성일: 2024-11-27, 작성내용: KA 인디케이터용 PC에서 인가된 통신포트들만 표시 */ cmbIndiport.Items.Clear(); cmbIndiport.Items.AddRange(ports); @@ -311,11 +311,15 @@ namespace vmsnet this.bs_normal.EndEdit(); this.bs_win.EndEdit(); + if (cmbIndiport.Text.Trim() == cmb_plcport.Text.Trim()) { - UTIL.MsgE("「KA 인디게이터」와 「Alarm PLC」의 통신포트는\n\n동일하게 설정할 수 없습니다."); - cmbIndiport.Focus(); - return; + if (cmbIndiport.Text.Trim().Length > 0 && cmb_plcport.Text.Trim().Length > 0) + { // 동일한 통신포트 방지 + UTIL.MsgE("「KA 인디케이터」와 「Alarm PLC」의 통신포트는\n\n동일하게 설정할 수 없습니다."); + cmbIndiport.Focus(); + return; + } } if (nudPri1.Value < 1 || nudPri2.Value < 1)