From ae080ab1fcdfd62ca670392815d04c5e1d687279 Mon Sep 17 00:00:00 2001 From: shark219-hub Date: Wed, 18 Dec 2024 12:29:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=A4=EC=8B=9C=EA=B0=84=ED=8A=B8=EB=A0=8C?= =?UTF-8?q?=EB=93=9C=EB=B7=B0=EB=8F=84=20=EC=A0=84=ED=95=B4=EC=A1=B0=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20=EB=B3=80=EA=B2=BD=20=E6=99=82=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=EC=9C=BC=EB=A1=9C=20=EC=84=A0=ED=83=9D=EB=90=9C=20?= =?UTF-8?q?=EC=A0=84=ED=95=B4=EC=A1=B0=20=EC=B1=84=EB=84=90=20=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cVMS.NET_CS/Device/DigitalIndicator.cs | 7 -- .../TrendView/Frm_trend_real.Designer.cs | 22 ++-- .../Dialog/TrendView/Frm_trend_real.cs | 26 ++++ cVMS.NET_CS/FMain.Designer.cs | 4 +- cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs | 2 - cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs | 2 +- cVMS.NET_CS/Setting/Frm_Config.Designer.cs | 118 +++++++++--------- 7 files changed, 100 insertions(+), 81 deletions(-) diff --git a/cVMS.NET_CS/Device/DigitalIndicator.cs b/cVMS.NET_CS/Device/DigitalIndicator.cs index 56f4d4c..eb8202f 100644 --- a/cVMS.NET_CS/Device/DigitalIndicator.cs +++ b/cVMS.NET_CS/Device/DigitalIndicator.cs @@ -52,13 +52,6 @@ namespace vmsnet return new ushort[] { hValue, lValue }; } - UInt16[] splitI32(Int32 value) - { - var hValue = (UInt16)(value >> 16); - var lValue = (UInt16)(value & 0xFFFF); - return new ushort[] { hValue, lValue }; - } - public bool WriteValue(UInt16[] values) { if (IsOpen == false) diff --git a/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.Designer.cs b/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.Designer.cs index 5b80328..cae25fc 100644 --- a/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.Designer.cs +++ b/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.Designer.cs @@ -87,7 +87,7 @@ namespace vmsnet this.cmb_tanks.FormattingEnabled = true; this.cmb_tanks.Location = new System.Drawing.Point(72, 3); this.cmb_tanks.Name = "cmb_tanks"; - this.cmb_tanks.Size = new System.Drawing.Size(1052, 37); + this.cmb_tanks.Size = new System.Drawing.Size(1052, 40); this.cmb_tanks.TabIndex = 16; this.cmb_tanks.SelectedIndexChanged += new System.EventHandler(this.cmb_group_SelectedIndexChanged); // @@ -124,7 +124,7 @@ namespace vmsnet this.TableLayoutPanel1.RowCount = 2; this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 39F)); this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.TableLayoutPanel1.Size = new System.Drawing.Size(1247, 862); + this.TableLayoutPanel1.Size = new System.Drawing.Size(1247, 860); this.TableLayoutPanel1.TabIndex = 9; // // Panel2 @@ -132,7 +132,7 @@ namespace vmsnet this.Panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.Panel2.Location = new System.Drawing.Point(3, 42); this.Panel2.Name = "Panel2"; - this.Panel2.Size = new System.Drawing.Size(1241, 817); + this.Panel2.Size = new System.Drawing.Size(1241, 815); this.Panel2.TabIndex = 8; // // bsCHList @@ -167,21 +167,22 @@ namespace vmsnet this.cmb_time, this.prb1, this.btConfig}); - this.ToolStrip2.Location = new System.Drawing.Point(0, 862); + this.ToolStrip2.Location = new System.Drawing.Point(0, 860); this.ToolStrip2.Name = "ToolStrip2"; - this.ToolStrip2.Size = new System.Drawing.Size(1247, 31); + this.ToolStrip2.Size = new System.Drawing.Size(1247, 33); this.ToolStrip2.TabIndex = 10; this.ToolStrip2.Text = "ToolStrip2"; // // ToolStripLabel1 // this.ToolStripLabel1.Name = "ToolStripLabel1"; - this.ToolStripLabel1.Size = new System.Drawing.Size(69, 28); + this.ToolStripLabel1.Size = new System.Drawing.Size(84, 28); this.ToolStripLabel1.Text = "전압범위"; // // cmb_volt // this.cmb_volt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_volt.Font = new System.Drawing.Font("맑은 고딕", 9F); this.cmb_volt.Items.AddRange(new object[] { "Auto", "3v", @@ -194,18 +195,19 @@ namespace vmsnet "17v", "20v"}); this.cmb_volt.Name = "cmb_volt"; - this.cmb_volt.Size = new System.Drawing.Size(75, 31); + this.cmb_volt.Size = new System.Drawing.Size(75, 33); this.cmb_volt.SelectedIndexChanged += new System.EventHandler(this.cmb_volt_SelectedIndexChanged); // // ToolStripLabel2 // this.ToolStripLabel2.Name = "ToolStripLabel2"; - this.ToolStripLabel2.Size = new System.Drawing.Size(69, 28); + this.ToolStripLabel2.Size = new System.Drawing.Size(84, 28); this.ToolStripLabel2.Text = "시간범위"; // // cmb_time // this.cmb_time.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_time.Font = new System.Drawing.Font("맑은 고딕", 9F); this.cmb_time.Items.AddRange(new object[] { "1분", "3분", @@ -214,7 +216,7 @@ namespace vmsnet "30분", "60분"}); this.cmb_time.Name = "cmb_time"; - this.cmb_time.Size = new System.Drawing.Size(75, 31); + this.cmb_time.Size = new System.Drawing.Size(75, 33); this.cmb_time.SelectedIndexChanged += new System.EventHandler(this.cmb_time_SelectedIndexChanged_1); // // prb1 @@ -230,7 +232,7 @@ namespace vmsnet this.btConfig.Image = global::vmsnet.Properties.Resources.graphsetting; this.btConfig.ImageTransparentColor = System.Drawing.Color.Magenta; this.btConfig.Name = "btConfig"; - this.btConfig.Size = new System.Drawing.Size(29, 28); + this.btConfig.Size = new System.Drawing.Size(34, 28); this.btConfig.Text = "config"; this.btConfig.Click += new System.EventHandler(this.btConfig_Click); // diff --git a/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.cs b/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.cs index 81ff3d3..81d7c03 100644 --- a/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.cs +++ b/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.cs @@ -395,6 +395,32 @@ namespace vmsnet newdr.c2 = ""; newdr.cname = dr.TITLE; newdr.cc = dr.COLOR; + + /* 작성자: 이재웅, 작성일: 2024-12-09, 내용: '개별보기' 상태에서 전해조 그룹 변경 時 자동으로 선택된 전해조 채널 보이기 */ + if (newdr.use) + { + int idx = dr.IDX; + //지정된 플롯의 표시여부를 변경한다. + if (this.Streamer1.Length < idx) + { + Array.Resize(ref Streamer1, idx); + Array.Resize(ref dataVolt, idx); + Array.Resize(ref dataTime, idx); + } + + if (dataTime[idx - 1] == null) dataTime[idx - 1] = new List(); + if (dataVolt[idx - 1] == null) dataVolt[idx - 1] = new List(); + if (Streamer1[idx - 1] == null) Streamer1[idx - 1] = formsPlot1.Plot.Add.ScatterPoints(dataTime[idx - 1], dataVolt[idx - 1]); + + Streamer1[idx - 1].LineWidth = 1; + Streamer1[idx - 1].MarkerSize = 0; + /* 작성자: 이재웅, 작성일: 2024-11-27, 내용: 변경한 셀이름으로 차트범례 표시 */ + Streamer1[idx - 1].LegendText = newdr.cname; //$"CH{idx}"; + Streamer1[idx - 1].IsVisible = true; + selectchlist.Add(idx); //선택채널에 추가한다. + } + /************************************************************************/ + ds1.channel.AddchannelRow(newdr); } ds1.channel.AcceptChanges(); diff --git a/cVMS.NET_CS/FMain.Designer.cs b/cVMS.NET_CS/FMain.Designer.cs index fe3c8fb..976dd77 100644 --- a/cVMS.NET_CS/FMain.Designer.cs +++ b/cVMS.NET_CS/FMain.Designer.cs @@ -357,7 +357,7 @@ namespace vmsnet this.bt_config.Image = ((System.Drawing.Image)(resources.GetObject("bt_config.Image"))); this.bt_config.ImageTransparentColor = System.Drawing.Color.Magenta; this.bt_config.Name = "bt_config"; - this.bt_config.Size = new System.Drawing.Size(76, 29); + this.bt_config.Size = new System.Drawing.Size(76, 39); this.bt_config.Text = "설정"; this.bt_config.Click += new System.EventHandler(this.btConfig_Click); // @@ -367,7 +367,7 @@ namespace vmsnet this.ToolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripButton1.Image"))); this.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.ToolStripButton1.Name = "ToolStripButton1"; - this.ToolStripButton1.Size = new System.Drawing.Size(76, 29); + this.ToolStripButton1.Size = new System.Drawing.Size(76, 39); this.ToolStripButton1.Text = "정보"; this.ToolStripButton1.Click += new System.EventHandler(this.ToolStripButton1_Click_6); // diff --git a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs index 1807e9a..20b4675 100644 --- a/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs +++ b/cVMS.NET_CS/HMI/MainDisplay/DispCtrl.cs @@ -1927,8 +1927,6 @@ namespace vmsnet.HMI { if (this.GROUPS == null) return -1; - - for (int i = 0; i < this.GROUPS.Length; i++) { RectangleF rect = this.GROUPS[i].Rect_Header; diff --git a/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs b/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs index 97ae0d9..2b33bcc 100644 --- a/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs +++ b/cVMS.NET_CS/RunCode/Step/_STEP_RUN.cs @@ -94,7 +94,7 @@ namespace vmsnet catch { } } - // '100.00(실제값) × 100 = 10,000' 식처럼 100 배 만든다. + // '100.00(실제값) × 100 = 10,000' 식처럼 100 배로 전송. var SUMKA = (PUB.KA1_SUM + PUB.KA2_SUM) * 100; // '10,000'을 전송한 후 Indicator 에서 왼쪽으로 소수점을 '2' 칸 이동시켜서 Display 하는 작업이 필요 PUB.indicator.SetKA((Int32)SUMKA); diff --git a/cVMS.NET_CS/Setting/Frm_Config.Designer.cs b/cVMS.NET_CS/Setting/Frm_Config.Designer.cs index 57bdd93..7147a12 100644 --- a/cVMS.NET_CS/Setting/Frm_Config.Designer.cs +++ b/cVMS.NET_CS/Setting/Frm_Config.Designer.cs @@ -396,7 +396,7 @@ namespace vmsnet this.TabControl1.Controls.Add(this.TabPage3); this.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.TabControl1.Location = new System.Drawing.Point(0, 34); - this.TabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TabControl1.Margin = new System.Windows.Forms.Padding(4); this.TabControl1.Name = "TabControl1"; this.TabControl1.SelectedIndex = 0; this.TabControl1.Size = new System.Drawing.Size(1518, 928); @@ -414,9 +414,9 @@ namespace vmsnet this.TabPage1.Controls.Add(this.Label3); this.TabPage1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.TabPage1.Location = new System.Drawing.Point(4, 28); - this.TabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TabPage1.Margin = new System.Windows.Forms.Padding(4); this.TabPage1.Name = "TabPage1"; - this.TabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TabPage1.Padding = new System.Windows.Forms.Padding(4); this.TabPage1.Size = new System.Drawing.Size(1510, 896); this.TabPage1.TabIndex = 0; this.TabPage1.Text = "일반설정"; @@ -425,7 +425,7 @@ namespace vmsnet // tb_viewsize // this.tb_viewsize.Location = new System.Drawing.Point(218, 78); - this.tb_viewsize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_viewsize.Margin = new System.Windows.Forms.Padding(4); this.tb_viewsize.Name = "tb_viewsize"; this.tb_viewsize.Size = new System.Drawing.Size(295, 39); this.tb_viewsize.TabIndex = 26; @@ -445,7 +445,7 @@ namespace vmsnet // this.chk_sound.AutoSize = true; this.chk_sound.Location = new System.Drawing.Point(218, 130); - this.chk_sound.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_sound.Margin = new System.Windows.Forms.Padding(4); this.chk_sound.Name = "chk_sound"; this.chk_sound.Size = new System.Drawing.Size(373, 36); this.chk_sound.TabIndex = 22; @@ -484,9 +484,9 @@ namespace vmsnet this.GroupBox1.Controls.Add(this.Label1); this.GroupBox1.Dock = System.Windows.Forms.DockStyle.Bottom; this.GroupBox1.Location = new System.Drawing.Point(4, 270); - this.GroupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.GroupBox1.Margin = new System.Windows.Forms.Padding(4); this.GroupBox1.Name = "GroupBox1"; - this.GroupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.GroupBox1.Padding = new System.Windows.Forms.Padding(4); this.GroupBox1.Size = new System.Drawing.Size(1502, 622); this.GroupBox1.TabIndex = 9; this.GroupBox1.TabStop = false; @@ -516,7 +516,7 @@ namespace vmsnet // this.txtValue.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.txtValue.Location = new System.Drawing.Point(172, 155); - this.txtValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.txtValue.Margin = new System.Windows.Forms.Padding(4); this.txtValue.Name = "txtValue"; this.txtValue.Size = new System.Drawing.Size(76, 39); this.txtValue.TabIndex = 47; @@ -571,7 +571,7 @@ namespace vmsnet // nudSlaveNo // this.nudSlaveNo.Location = new System.Drawing.Point(181, 94); - this.nudSlaveNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nudSlaveNo.Margin = new System.Windows.Forms.Padding(4); this.nudSlaveNo.Maximum = new decimal(new int[] { 255, 0, @@ -650,7 +650,7 @@ namespace vmsnet // nudLimit // this.nudLimit.Location = new System.Drawing.Point(224, 54); - this.nudLimit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nudLimit.Margin = new System.Windows.Forms.Padding(4); this.nudLimit.Maximum = new decimal(new int[] { 999999, 0, @@ -678,9 +678,9 @@ namespace vmsnet this.groupBox3.Controls.Add(this.nudMaxCH); this.groupBox3.Controls.Add(this.Label10); this.groupBox3.Location = new System.Drawing.Point(724, 272); - this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox3.Margin = new System.Windows.Forms.Padding(4); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox3.Padding = new System.Windows.Forms.Padding(4); this.groupBox3.Size = new System.Drawing.Size(754, 264); this.groupBox3.TabIndex = 62; this.groupBox3.TabStop = false; @@ -712,7 +712,7 @@ namespace vmsnet // tb_savepath // this.tb_savepath.Location = new System.Drawing.Point(188, 42); - this.tb_savepath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_savepath.Margin = new System.Windows.Forms.Padding(4); this.tb_savepath.Name = "tb_savepath"; this.tb_savepath.Size = new System.Drawing.Size(525, 39); this.tb_savepath.TabIndex = 14; @@ -722,7 +722,7 @@ namespace vmsnet // this.tb_trashper.ForeColor = System.Drawing.Color.Red; this.tb_trashper.Location = new System.Drawing.Point(188, 98); - this.tb_trashper.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_trashper.Margin = new System.Windows.Forms.Padding(4); this.tb_trashper.Name = "tb_trashper"; this.tb_trashper.Size = new System.Drawing.Size(55, 39); this.tb_trashper.TabIndex = 17; @@ -753,7 +753,7 @@ namespace vmsnet // this.tb_saveterm.ForeColor = System.Drawing.Color.Red; this.tb_saveterm.Location = new System.Drawing.Point(188, 154); - this.tb_saveterm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_saveterm.Margin = new System.Windows.Forms.Padding(4); this.tb_saveterm.Name = "tb_saveterm"; this.tb_saveterm.Size = new System.Drawing.Size(55, 39); this.tb_saveterm.TabIndex = 20; @@ -784,7 +784,7 @@ namespace vmsnet // this.tb_div.ForeColor = System.Drawing.Color.Red; this.tb_div.Location = new System.Drawing.Point(632, 98); - this.tb_div.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_div.Margin = new System.Windows.Forms.Padding(4); this.tb_div.Name = "tb_div"; this.tb_div.Size = new System.Drawing.Size(80, 39); this.tb_div.TabIndex = 32; @@ -804,7 +804,7 @@ namespace vmsnet // nudMaxCH // this.nudMaxCH.Location = new System.Drawing.Point(632, 154); - this.nudMaxCH.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nudMaxCH.Margin = new System.Windows.Forms.Padding(4); this.nudMaxCH.Maximum = new decimal(new int[] { 1000, 0, @@ -828,7 +828,7 @@ namespace vmsnet // nud4thp2 // this.nud4thp2.Location = new System.Drawing.Point(391, 432); - this.nud4thp2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud4thp2.Margin = new System.Windows.Forms.Padding(4); this.nud4thp2.Maximum = new decimal(new int[] { 1000, 0, @@ -842,7 +842,7 @@ namespace vmsnet // nud4thp1 // this.nud4thp1.Location = new System.Drawing.Point(224, 432); - this.nud4thp1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud4thp1.Margin = new System.Windows.Forms.Padding(4); this.nud4thp1.Maximum = new decimal(new int[] { 1000, 0, @@ -857,7 +857,7 @@ namespace vmsnet // this.chk_4thData.AutoSize = true; this.chk_4thData.Location = new System.Drawing.Point(28, 434); - this.chk_4thData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_4thData.Margin = new System.Windows.Forms.Padding(4); this.chk_4thData.Name = "chk_4thData"; this.chk_4thData.Size = new System.Drawing.Size(178, 36); this.chk_4thData.TabIndex = 59; @@ -867,7 +867,7 @@ namespace vmsnet // nud3rdp2 // this.nud3rdp2.Location = new System.Drawing.Point(391, 380); - this.nud3rdp2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud3rdp2.Margin = new System.Windows.Forms.Padding(4); this.nud3rdp2.Maximum = new decimal(new int[] { 1000, 0, @@ -881,7 +881,7 @@ namespace vmsnet // nud3rdp1 // this.nud3rdp1.Location = new System.Drawing.Point(224, 380); - this.nud3rdp1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nud3rdp1.Margin = new System.Windows.Forms.Padding(4); this.nud3rdp1.Maximum = new decimal(new int[] { 1000, 0, @@ -896,7 +896,7 @@ namespace vmsnet // this.chk_3rdData.AutoSize = true; this.chk_3rdData.Location = new System.Drawing.Point(28, 382); - this.chk_3rdData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_3rdData.Margin = new System.Windows.Forms.Padding(4); this.chk_3rdData.Name = "chk_3rdData"; this.chk_3rdData.Size = new System.Drawing.Size(178, 36); this.chk_3rdData.TabIndex = 56; @@ -906,7 +906,7 @@ namespace vmsnet // nudPri2 // this.nudPri2.Location = new System.Drawing.Point(391, 274); - this.nudPri2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nudPri2.Margin = new System.Windows.Forms.Padding(4); this.nudPri2.Maximum = new decimal(new int[] { 1000, 0, @@ -920,7 +920,7 @@ namespace vmsnet // nudPri1 // this.nudPri1.Location = new System.Drawing.Point(224, 274); - this.nudPri1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nudPri1.Margin = new System.Windows.Forms.Padding(4); this.nudPri1.Maximum = new decimal(new int[] { 1000, 0, @@ -938,7 +938,7 @@ namespace vmsnet this.chk_1stData.CheckState = System.Windows.Forms.CheckState.Checked; this.chk_1stData.Enabled = false; this.chk_1stData.Location = new System.Drawing.Point(28, 278); - this.chk_1stData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_1stData.Margin = new System.Windows.Forms.Padding(4); this.chk_1stData.Name = "chk_1stData"; this.chk_1stData.Size = new System.Drawing.Size(174, 36); this.chk_1stData.TabIndex = 53; @@ -948,7 +948,7 @@ namespace vmsnet // nudSec2 // this.nudSec2.Location = new System.Drawing.Point(391, 326); - this.nudSec2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nudSec2.Margin = new System.Windows.Forms.Padding(4); this.nudSec2.Maximum = new decimal(new int[] { 1000, 0, @@ -962,7 +962,7 @@ namespace vmsnet // nudSec1 // this.nudSec1.Location = new System.Drawing.Point(224, 326); - this.nudSec1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.nudSec1.Margin = new System.Windows.Forms.Padding(4); this.nudSec1.Maximum = new decimal(new int[] { 1000, 0, @@ -977,7 +977,7 @@ namespace vmsnet // this.chk_2nddata.AutoSize = true; this.chk_2nddata.Location = new System.Drawing.Point(28, 328); - this.chk_2nddata.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_2nddata.Margin = new System.Windows.Forms.Padding(4); this.chk_2nddata.Name = "chk_2nddata"; this.chk_2nddata.Size = new System.Drawing.Size(184, 36); this.chk_2nddata.TabIndex = 50; @@ -988,7 +988,7 @@ namespace vmsnet // this.chkEnableKA.AutoSize = true; this.chkEnableKA.Location = new System.Drawing.Point(346, 214); - this.chkEnableKA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chkEnableKA.Margin = new System.Windows.Forms.Padding(4); this.chkEnableKA.Name = "chkEnableKA"; this.chkEnableKA.Size = new System.Drawing.Size(149, 36); this.chkEnableKA.TabIndex = 45; @@ -1027,7 +1027,7 @@ namespace vmsnet // this.chk_alplc.AutoSize = true; this.chk_alplc.Location = new System.Drawing.Point(31, 152); - this.chk_alplc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_alplc.Margin = new System.Windows.Forms.Padding(4); this.chk_alplc.Name = "chk_alplc"; this.chk_alplc.Size = new System.Drawing.Size(118, 36); this.chk_alplc.TabIndex = 42; @@ -1059,7 +1059,7 @@ namespace vmsnet // tb_plcidx // this.tb_plcidx.Location = new System.Drawing.Point(151, 92); - this.tb_plcidx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_plcidx.Margin = new System.Windows.Forms.Padding(4); this.tb_plcidx.Maximum = new decimal(new int[] { 1000, 0, @@ -1104,7 +1104,7 @@ namespace vmsnet // this.chk_sumab.AutoSize = true; this.chk_sumab.Location = new System.Drawing.Point(28, 546); - this.chk_sumab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_sumab.Margin = new System.Windows.Forms.Padding(4); this.chk_sumab.Name = "chk_sumab"; this.chk_sumab.Size = new System.Drawing.Size(195, 36); this.chk_sumab.TabIndex = 33; @@ -1115,7 +1115,7 @@ namespace vmsnet // this.chk_nb.AutoSize = true; this.chk_nb.Location = new System.Drawing.Point(28, 498); - this.chk_nb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_nb.Margin = new System.Windows.Forms.Padding(4); this.chk_nb.Name = "chk_nb"; this.chk_nb.Size = new System.Drawing.Size(478, 36); this.chk_nb.TabIndex = 29; @@ -1126,7 +1126,7 @@ namespace vmsnet // this.chk_lsb.AutoSize = true; this.chk_lsb.Location = new System.Drawing.Point(28, 214); - this.chk_lsb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_lsb.Margin = new System.Windows.Forms.Padding(4); this.chk_lsb.Name = "chk_lsb"; this.chk_lsb.Size = new System.Drawing.Size(314, 36); this.chk_lsb.TabIndex = 15; @@ -1137,7 +1137,7 @@ namespace vmsnet // this.chk_synctime.AutoSize = true; this.chk_synctime.Location = new System.Drawing.Point(28, 164); - this.chk_synctime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_synctime.Margin = new System.Windows.Forms.Padding(4); this.chk_synctime.Name = "chk_synctime"; this.chk_synctime.Size = new System.Drawing.Size(461, 36); this.chk_synctime.TabIndex = 10; @@ -1148,7 +1148,7 @@ namespace vmsnet // this.chk_savebinary.AutoSize = true; this.chk_savebinary.Location = new System.Drawing.Point(28, 114); - this.chk_savebinary.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.chk_savebinary.Margin = new System.Windows.Forms.Padding(4); this.chk_savebinary.Name = "chk_savebinary"; this.chk_savebinary.Size = new System.Drawing.Size(685, 36); this.chk_savebinary.TabIndex = 9; @@ -1169,7 +1169,7 @@ namespace vmsnet // this.tb_tel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.tb_tel.Location = new System.Drawing.Point(1106, 20); - this.tb_tel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_tel.Margin = new System.Windows.Forms.Padding(4); this.tb_tel.Name = "tb_tel"; this.tb_tel.Size = new System.Drawing.Size(376, 39); this.tb_tel.TabIndex = 5; @@ -1191,7 +1191,7 @@ namespace vmsnet // tb_sangho // this.tb_sangho.Location = new System.Drawing.Point(216, 26); - this.tb_sangho.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tb_sangho.Margin = new System.Windows.Forms.Padding(4); this.tb_sangho.Name = "tb_sangho"; this.tb_sangho.Size = new System.Drawing.Size(295, 39); this.tb_sangho.TabIndex = 3; @@ -1213,9 +1213,9 @@ namespace vmsnet this.TabPage2.Controls.Add(this.label11); this.TabPage2.Controls.Add(this.bn_Device); this.TabPage2.Location = new System.Drawing.Point(4, 28); - this.TabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TabPage2.Margin = new System.Windows.Forms.Padding(4); this.TabPage2.Name = "TabPage2"; - this.TabPage2.Size = new System.Drawing.Size(1510, 891); + this.TabPage2.Size = new System.Drawing.Size(1510, 896); this.TabPage2.TabIndex = 1; this.TabPage2.Text = "장치설정"; this.TabPage2.UseVisualStyleBackColor = true; @@ -1260,7 +1260,7 @@ namespace vmsnet this.dv_device.DefaultCellStyle = dataGridViewCellStyle8; this.dv_device.Dock = System.Windows.Forms.DockStyle.Fill; this.dv_device.Location = new System.Drawing.Point(0, 33); - this.dv_device.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dv_device.Margin = new System.Windows.Forms.Padding(4); this.dv_device.MultiSelect = false; this.dv_device.Name = "dv_device"; dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -1275,7 +1275,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(1510, 812); + this.dv_device.Size = new System.Drawing.Size(1510, 817); this.dv_device.TabIndex = 0; // // M_IDX @@ -1402,7 +1402,7 @@ namespace vmsnet // this.label11.Dock = System.Windows.Forms.DockStyle.Bottom; this.label11.ForeColor = System.Drawing.Color.Blue; - this.label11.Location = new System.Drawing.Point(0, 845); + this.label11.Location = new System.Drawing.Point(0, 850); this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; this.label11.Padding = new System.Windows.Forms.Padding(14, 0, 0, 0); @@ -1561,9 +1561,9 @@ namespace vmsnet this.TabPage5.Controls.Add(this.label13); this.TabPage5.Controls.Add(this.BN_WIN); this.TabPage5.Location = new System.Drawing.Point(4, 28); - this.TabPage5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TabPage5.Margin = new System.Windows.Forms.Padding(4); this.TabPage5.Name = "TabPage5"; - this.TabPage5.Size = new System.Drawing.Size(1510, 891); + this.TabPage5.Size = new System.Drawing.Size(1510, 896); this.TabPage5.TabIndex = 4; this.TabPage5.Text = "윈도우설정"; this.TabPage5.UseVisualStyleBackColor = true; @@ -1601,7 +1601,7 @@ namespace vmsnet this.dv_win.DefaultCellStyle = dataGridViewCellStyle11; this.dv_win.Dock = System.Windows.Forms.DockStyle.Fill; this.dv_win.Location = new System.Drawing.Point(0, 33); - this.dv_win.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dv_win.Margin = new System.Windows.Forms.Padding(4); this.dv_win.Name = "dv_win"; dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; @@ -1614,7 +1614,7 @@ namespace vmsnet this.dv_win.RowHeadersVisible = false; this.dv_win.RowHeadersWidth = 62; this.dv_win.RowTemplate.Height = 23; - this.dv_win.Size = new System.Drawing.Size(1510, 812); + this.dv_win.Size = new System.Drawing.Size(1510, 817); this.dv_win.TabIndex = 3; this.dv_win.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DV_WIN_CellContentClick); this.dv_win.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.DV_WIN_DataError); @@ -1665,7 +1665,7 @@ namespace vmsnet // this.label13.Dock = System.Windows.Forms.DockStyle.Bottom; this.label13.ForeColor = System.Drawing.Color.Blue; - this.label13.Location = new System.Drawing.Point(0, 845); + this.label13.Location = new System.Drawing.Point(0, 850); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; this.label13.Padding = new System.Windows.Forms.Padding(14, 0, 0, 0); @@ -1796,9 +1796,9 @@ namespace vmsnet this.TabPage4.Controls.Add(this.label2); this.TabPage4.Controls.Add(this.bn_group); this.TabPage4.Location = new System.Drawing.Point(4, 28); - this.TabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TabPage4.Margin = new System.Windows.Forms.Padding(4); this.TabPage4.Name = "TabPage4"; - this.TabPage4.Size = new System.Drawing.Size(1510, 891); + this.TabPage4.Size = new System.Drawing.Size(1510, 896); this.TabPage4.TabIndex = 3; this.TabPage4.Text = "그룹설정"; this.TabPage4.UseVisualStyleBackColor = true; @@ -1853,7 +1853,7 @@ namespace vmsnet this.dv_grp.DefaultCellStyle = dataGridViewCellStyle23; this.dv_grp.Dock = System.Windows.Forms.DockStyle.Fill; this.dv_grp.Location = new System.Drawing.Point(0, 33); - this.dv_grp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dv_grp.Margin = new System.Windows.Forms.Padding(4); this.dv_grp.Name = "dv_grp"; dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; @@ -1866,7 +1866,7 @@ namespace vmsnet this.dv_grp.RowHeadersVisible = false; this.dv_grp.RowHeadersWidth = 62; this.dv_grp.RowTemplate.Height = 23; - this.dv_grp.Size = new System.Drawing.Size(1510, 800); + this.dv_grp.Size = new System.Drawing.Size(1510, 805); this.dv_grp.TabIndex = 2; this.dv_grp.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv_grp_DataError); // @@ -2186,7 +2186,7 @@ namespace vmsnet this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; this.label2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label2.ForeColor = System.Drawing.Color.Red; - this.label2.Location = new System.Drawing.Point(0, 833); + this.label2.Location = new System.Drawing.Point(0, 838); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(1510, 58); @@ -2315,9 +2315,9 @@ namespace vmsnet this.TabPage3.Controls.Add(this.dv_channel); this.TabPage3.Controls.Add(this.bn_channel); this.TabPage3.Location = new System.Drawing.Point(4, 28); - this.TabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.TabPage3.Margin = new System.Windows.Forms.Padding(4); this.TabPage3.Name = "TabPage3"; - this.TabPage3.Size = new System.Drawing.Size(1510, 891); + this.TabPage3.Size = new System.Drawing.Size(1510, 896); this.TabPage3.TabIndex = 2; this.TabPage3.Text = "셀설정"; this.TabPage3.UseVisualStyleBackColor = true; @@ -2371,7 +2371,7 @@ namespace vmsnet this.dv_channel.DefaultCellStyle = dataGridViewCellStyle29; this.dv_channel.Dock = System.Windows.Forms.DockStyle.Fill; this.dv_channel.Location = new System.Drawing.Point(0, 34); - this.dv_channel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.dv_channel.Margin = new System.Windows.Forms.Padding(4); this.dv_channel.Name = "dv_channel"; dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control; @@ -2384,7 +2384,7 @@ namespace vmsnet this.dv_channel.RowHeadersVisible = false; this.dv_channel.RowHeadersWidth = 62; this.dv_channel.RowTemplate.Height = 23; - this.dv_channel.Size = new System.Drawing.Size(1510, 857); + this.dv_channel.Size = new System.Drawing.Size(1510, 862); this.dv_channel.TabIndex = 1; this.dv_channel.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv_channel_CellClick); this.dv_channel.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dv_channel_CellFormatting); @@ -2775,7 +2775,7 @@ namespace vmsnet this.Controls.Add(this.StatusStrip1); this.Controls.Add(this.ToolStrip1); this.KeyPreview = true; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "Frm_Config"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "프로그램설정";