TrendViewer, 차트 LegendText 변경한 셀이름으로 표시

2024-11-27 11:55:33 +09:00
parent cb6a25f0a2
commit 3781977741
9 changed files with 161 additions and 142 deletions
--- a/cVMS.NET_CS/Setting/Frm_Config.Designer.cs
+++ b/cVMS.NET_CS/Setting/Frm_Config.Designer.cs
@@ -1229,7 +1229,7 @@ namespace vmsnet
            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.dv_device.DefaultCellStyle = dataGridViewCellStyle8;
            this.dv_device.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dv_device.Location = new System.Drawing.Point(0, 34);
+            this.dv_device.Location = new System.Drawing.Point(0, 33);
            this.dv_device.Margin = new System.Windows.Forms.Padding(4);
            this.dv_device.MultiSelect = false;
            this.dv_device.Name = "dv_device";
@@ -1245,7 +1245,7 @@ namespace vmsnet
            this.dv_device.RowHeadersWidth = 62;
            this.dv_device.RowTemplate.Height = 23;
            this.dv_device.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
-            this.dv_device.Size = new System.Drawing.Size(1509, 815);
+            this.dv_device.Size = new System.Drawing.Size(1509, 816);
            this.dv_device.TabIndex = 0;
            // 
            // M_IDX
@@ -1411,7 +1411,7 @@ namespace vmsnet
            this.bn_Device.Name = "bn_Device";
            this.bn_Device.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
            this.bn_Device.PositionItem = this.BindingNavigatorPositionItem;
-            this.bn_Device.Size = new System.Drawing.Size(1509, 34);
+            this.bn_Device.Size = new System.Drawing.Size(1509, 33);
            this.bn_Device.TabIndex = 1;
            this.bn_Device.Text = "BindingNavigator1";
            // 
@@ -1421,13 +1421,13 @@ namespace vmsnet
            this.BindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("BindingNavigatorAddNewItem.Image")));
            this.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem";
            this.BindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
-            this.BindingNavigatorAddNewItem.Size = new System.Drawing.Size(34, 29);
+            this.BindingNavigatorAddNewItem.Size = new System.Drawing.Size(34, 28);
            this.BindingNavigatorAddNewItem.Text = "새로 추가";
            // 
            // BindingNavigatorCountItem
            // 
            this.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem";
-            this.BindingNavigatorCountItem.Size = new System.Drawing.Size(39, 29);
+            this.BindingNavigatorCountItem.Size = new System.Drawing.Size(39, 28);
            this.BindingNavigatorCountItem.Text = "/{0}";
            this.BindingNavigatorCountItem.ToolTipText = "전체 항목 수";
            // 
@@ -1437,7 +1437,7 @@ namespace vmsnet
            this.BindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("BindingNavigatorDeleteItem.Image")));
            this.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem";
            this.BindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
-            this.BindingNavigatorDeleteItem.Size = new System.Drawing.Size(34, 29);
+            this.BindingNavigatorDeleteItem.Size = new System.Drawing.Size(34, 28);
            this.BindingNavigatorDeleteItem.Text = "삭제";
            // 
            // BindingNavigatorMoveFirstItem
@@ -1446,7 +1446,7 @@ namespace vmsnet
            this.BindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("BindingNavigatorMoveFirstItem.Image")));
            this.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem";
            this.BindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
-            this.BindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(34, 29);
+            this.BindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(34, 28);
            this.BindingNavigatorMoveFirstItem.Text = "처음으로 이동";
            // 
            // BindingNavigatorMovePreviousItem
@@ -1455,13 +1455,13 @@ namespace vmsnet
            this.BindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("BindingNavigatorMovePreviousItem.Image")));
            this.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem";
            this.BindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
-            this.BindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(34, 29);
+            this.BindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(34, 28);
            this.BindingNavigatorMovePreviousItem.Text = "이전으로 이동";
            // 
            // BindingNavigatorSeparator
            // 
            this.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator";
-            this.BindingNavigatorSeparator.Size = new System.Drawing.Size(6, 34);
+            this.BindingNavigatorSeparator.Size = new System.Drawing.Size(6, 33);
            // 
            // BindingNavigatorPositionItem
            // 
@@ -1476,7 +1476,7 @@ namespace vmsnet
            // BindingNavigatorSeparator1
            // 
            this.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1";
-            this.BindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 34);
+            this.BindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 33);
            // 
            // BindingNavigatorMoveNextItem
            // 
@@ -1484,7 +1484,7 @@ namespace vmsnet
            this.BindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("BindingNavigatorMoveNextItem.Image")));
            this.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem";
            this.BindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
-            this.BindingNavigatorMoveNextItem.Size = new System.Drawing.Size(34, 29);
+            this.BindingNavigatorMoveNextItem.Size = new System.Drawing.Size(34, 28);
            this.BindingNavigatorMoveNextItem.Text = "다음으로 이동";
            // 
            // BindingNavigatorMoveLastItem
@@ -1493,18 +1493,18 @@ namespace vmsnet
            this.BindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("BindingNavigatorMoveLastItem.Image")));
            this.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem";
            this.BindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
-            this.BindingNavigatorMoveLastItem.Size = new System.Drawing.Size(34, 29);
+            this.BindingNavigatorMoveLastItem.Size = new System.Drawing.Size(34, 28);
            this.BindingNavigatorMoveLastItem.Text = "마지막으로 이동";
            // 
            // BindingNavigatorSeparator2
            // 
            this.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2";
-            this.BindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 34);
+            this.BindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 33);
            // 
            // ToolStripSeparator8
            // 
            this.ToolStripSeparator8.Name = "ToolStripSeparator8";
-            this.ToolStripSeparator8.Size = new System.Drawing.Size(6, 34);
+            this.ToolStripSeparator8.Size = new System.Drawing.Size(6, 33);
            // 
            // toolStripButton1
            // 
@@ -1513,6 +1513,7 @@ namespace vmsnet
            this.toolStripButton1.Name = "toolStripButton1";
            this.toolStripButton1.Size = new System.Drawing.Size(172, 29);
            this.toolStripButton1.Text = "IP SET(127.0.0.1)";
+            this.toolStripButton1.Visible = false;
            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
            // 
            // toolStripButton2
@@ -1522,6 +1523,7 @@ namespace vmsnet
            this.toolStripButton2.Name = "toolStripButton2";
            this.toolStripButton2.Size = new System.Drawing.Size(217, 29);
            this.toolStripButton2.Text = "IP SET(192.168.0.1 ~ )";
+            this.toolStripButton2.Visible = false;
            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
            // 
            // TabPage5
@@ -2726,7 +2728,7 @@ namespace vmsnet
            // 
            // toolStripButton15
            // 
-            this.toolStripButton15.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton15.Image")));
+            this.toolStripButton15.Image = global::vmsnet.Properties.Resources.applix;
            this.toolStripButton15.ImageTransparentColor = System.Drawing.Color.Magenta;
            this.toolStripButton15.Name = "toolStripButton15";
            this.toolStripButton15.Size = new System.Drawing.Size(130, 29);
--- a/cVMS.NET_CS/Setting/Frm_Config.cs
+++ b/cVMS.NET_CS/Setting/Frm_Config.cs
@@ -38,11 +38,16 @@ namespace vmsnet
            this.Controls.Add(StatusStrip1);
            this.Controls.Add(ToolStrip1);

-            /* 작성자: 이재웅, 작성일: 2024-10-11, 작성내용: PC에 인가된 통신포트들만 표시 */
            string[] ports = GetAvailablePorts();
+
+            /* 작성자: 이재웅, 작성일: 2024-10-11, 작성내용: PC에 인가된 통신포트들만 표시 */
            cmb_plcport.Items.Clear();
            cmb_plcport.Items.AddRange(ports);

+            /* 작성자: 이재웅, 작성일: 2024-11-27, 작성내용: KA 인디게이터용 PC에서 인가된 통신포트 표시 */
+            cmbIndiport.Items.Clear();
+            cmbIndiport.Items.AddRange(ports);
+
            /* 작성자: 이재웅, 작성일: 2024-09-24, 작성내용: 유닛의 채널설정 ToolTip 초기화 */
            for (int i = 0; i < tTip.GetLength(0); i++)
                for (int j = 0; j < tTip.GetLength(1); j++)
@@ -1017,7 +1022,7 @@ namespace vmsnet
        }

        private void toolStripButton15_Click_1(object sender, EventArgs e)
-        {
+        { // 셀이름변경
            this.bs_channel.EndEdit();
            using (var f = new Dialog.fCellNameChange())
                if (f.ShowDialog() == DialogResult.OK)
@@ -1053,7 +1058,7 @@ namespace vmsnet
                        dr.EndEdit();
                        chno += 1;
                    }
-                    UTIL.MsgE("이름이 변경되었습니다");
+                    UTIL.MsgI("이름이 변경되었습니다");
                }
        }
    }
--- a/cVMS.NET_CS/Setting/Frm_Config.resx
+++ b/cVMS.NET_CS/Setting/Frm_Config.resx
@@ -647,21 +647,6 @@
        +UkzM4NkSVIS9Kf8d6OjoxdNuQMUj96BoKCg2TExMc9RoRfYEBV9mYuFhITM4w7R+I0R+J5O/BrlvRIc
        HPwS76H554lnp/QOjApOFsyMwEX4FGyOofunRuB7ypnBOaP3jNThgu4xbdpfHAkWza6mNEcAAAAASUVO
        RK5CYII=
-</value>
-  </data>
-  <data name="toolStripButton15.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="bs_normal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">