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 4473ef7..e7f7640 100644 --- a/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.Designer.cs +++ b/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.Designer.cs @@ -34,17 +34,18 @@ namespace vmsnet [System.Diagnostics.DebuggerStepThrough()] private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_trend_Real)); - this.ToolTip1 = new System.Windows.Forms.ToolTip(); + this.ToolTip1 = new System.Windows.Forms.ToolTip(this.components); this.Panel1 = new System.Windows.Forms.Panel(); this.cmb_tanks = new System.Windows.Forms.ComboBox(); this.btSelectCH = new System.Windows.Forms.Button(); this.Label4 = new System.Windows.Forms.Label(); this.TableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.Panel2 = new System.Windows.Forms.Panel(); - this.bsCHList = new System.Windows.Forms.BindingSource(); + this.bsCHList = new System.Windows.Forms.BindingSource(this.components); this.documentElement1 = new vmsnet.DocumentElement(); - this.Timer1 = new System.Windows.Forms.Timer(); + this.Timer1 = new System.Windows.Forms.Timer(this.components); this.ds1 = new vmsnet.DS1(); this.ToolStrip2 = new System.Windows.Forms.ToolStrip(); this.ToolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); @@ -86,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, 32); + 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); // @@ -123,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, 864); + this.TableLayoutPanel1.Size = new System.Drawing.Size(1247, 860); this.TableLayoutPanel1.TabIndex = 9; // // Panel2 @@ -131,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, 819); + this.Panel2.Size = new System.Drawing.Size(1241, 815); this.Panel2.TabIndex = 8; // // bsCHList @@ -158,6 +159,7 @@ namespace vmsnet // ToolStrip2 // this.ToolStrip2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.ToolStrip2.ImageScalingSize = new System.Drawing.Size(24, 24); this.ToolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ToolStripLabel1, this.cmb_volt, @@ -165,16 +167,16 @@ namespace vmsnet this.cmb_time, this.prb1, this.btConfig}); - this.ToolStrip2.Location = new System.Drawing.Point(0, 864); + this.ToolStrip2.Location = new System.Drawing.Point(0, 860); this.ToolStrip2.Name = "ToolStrip2"; - this.ToolStrip2.Size = new System.Drawing.Size(1247, 29); + 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(55, 26); + this.ToolStripLabel1.Size = new System.Drawing.Size(84, 28); this.ToolStripLabel1.Text = "전압범위"; // // cmb_volt @@ -192,13 +194,13 @@ namespace vmsnet "17v", "20v"}); this.cmb_volt.Name = "cmb_volt"; - this.cmb_volt.Size = new System.Drawing.Size(75, 29); + 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(55, 26); + this.ToolStripLabel2.Size = new System.Drawing.Size(84, 28); this.ToolStripLabel2.Text = "시간범위"; // // cmb_time @@ -212,14 +214,14 @@ namespace vmsnet "30분", "60분"}); this.cmb_time.Name = "cmb_time"; - this.cmb_time.Size = new System.Drawing.Size(75, 29); + this.cmb_time.Size = new System.Drawing.Size(75, 33); this.cmb_time.SelectedIndexChanged += new System.EventHandler(this.cmb_time_SelectedIndexChanged_1); // // prb1 // this.prb1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.prb1.Name = "prb1"; - this.prb1.Size = new System.Drawing.Size(100, 26); + this.prb1.Size = new System.Drawing.Size(100, 28); // // btConfig // @@ -228,7 +230,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(23, 26); + 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 a1e2be0..d55ac17 100644 --- a/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.cs +++ b/cVMS.NET_CS/Dialog/TrendView/Frm_trend_real.cs @@ -318,6 +318,13 @@ namespace vmsnet if (cmb_tanks.SelectedIndex < 0) return; if (System.Diagnostics.Debugger.IsAttached) Console.WriteLine($"grp selectedindex val={cmb_tanks.SelectedIndex}"); + /* 작성자: 이재웅, 작성일: 2024-11-22, 내용: 차트/Scatter/Volt/Time 초기화 */ + this.formsPlot1.Plot.Clear(); + this.Streamer1 = new ScottPlot.Plottables.Scatter[0]; + this.dataVolt = new List[0]; + this.dataTime = new List[0]; + /**********************************************************************/ + //현재등록된 목록을 모두 삭제 this.ds1.channel.Clear(); this.formsPlot1.Plot.Remove(); //데이터스트림삭제 @@ -460,7 +467,8 @@ namespace vmsnet Streamer1[idx - 1] = this.formsPlot1.Plot.Add.ScatterPoints(dataTime[idx - 1], dataVolt[idx - 1]); Streamer1[idx - 1].LineWidth = 1; Streamer1[idx - 1].MarkerSize = 0; - Streamer1[idx - 1].LegendText = $"CH{idx}"; + /* 작성자: 이재웅, 작성일: 2024-11-27, 내용: 변경한 셀이름으로 차트범례 표시 */ + Streamer1[idx - 1].LegendText = item.Text; //$"CH{idx}"; Streamer1[idx - 1].IsVisible = item.Checked; var dr = ds1.channel.Where(t => t.idx == idx).FirstOrDefault(); diff --git a/cVMS.NET_CS/FMain.cs b/cVMS.NET_CS/FMain.cs index 3c37bdc..653d405 100644 --- a/cVMS.NET_CS/FMain.cs +++ b/cVMS.NET_CS/FMain.cs @@ -1828,7 +1828,7 @@ namespace vmsnet } public void bt_fullscreen_Click(object sender, EventArgs e) - { + { // 전체보기/개별보기 DispCtrl1.FullScreen = !DispCtrl1.FullScreen; DispCtrl1.bMakeRect = true; @@ -1892,7 +1892,8 @@ namespace vmsnet Streamer1[idx - 1].LineWidth = 1; Streamer1[idx - 1].MarkerSize = 0; - Streamer1[idx - 1].LegendText = $"CH{idx}"; + /* 작성자: 이재웅, 작성일: 2024-11-27, 내용: 변경한 셀이름으로 차트범례 표시 */ + Streamer1[idx - 1].LegendText = item.cname; //$"CH{idx}"; Streamer1[idx - 1].IsVisible = true; selectchlist.Add(idx); //선택채널에 추가한다. } @@ -2280,7 +2281,8 @@ namespace vmsnet Streamer1[idx - 1].LineWidth = 1; Streamer1[idx - 1].MarkerSize = 0; - Streamer1[idx - 1].LegendText = $"CH{idx}"; + /* 작성자: 이재웅, 작성일: 2024-11-27, 내용: 변경한 셀이름으로 차트범례 표시 */ + Streamer1[idx - 1].LegendText = item.Text; //$"CH{idx}"; Streamer1[idx - 1].IsVisible = item.Checked; var dr = ds1.channel.Where(t => t.idx == idx).FirstOrDefault(); @@ -2325,7 +2327,7 @@ namespace vmsnet } public void ToolStripButton3_Click(object sender, EventArgs e) - { + { // 실시간트렌드뷰 UTIL.ShowForm(fTrendview, typeof(Frm_trend_Real), DispCtrl1); } #endregion diff --git a/cVMS.NET_CS/Frm_Sub.cs b/cVMS.NET_CS/Frm_Sub.cs index 0bf1996..1b02b92 100644 --- a/cVMS.NET_CS/Frm_Sub.cs +++ b/cVMS.NET_CS/Frm_Sub.cs @@ -1081,7 +1081,7 @@ namespace vmsnet } private void bt_fullscreen_Click(object sender, EventArgs e) - { + { // 전체보기/개별보기 DispCtrl1.FullScreen = !DispCtrl1.FullScreen; DispCtrl1.bMakeRect = true; @@ -1145,7 +1145,8 @@ namespace vmsnet Streamer1[idx - 1].LineWidth = 1; Streamer1[idx - 1].MarkerSize = 0; - Streamer1[idx - 1].LegendText = $"CH{idx}"; + /* 작성자: 이재웅, 작성일: 2024-11-27, 내용: 변경한 셀이름으로 차트범례 표시 */ + Streamer1[idx - 1].LegendText = item.cname; //$"CH{idx}"; Streamer1[idx - 1].IsVisible = true; selectchlist.Add(idx); //선택채널에 추가한다. } @@ -1351,7 +1352,8 @@ namespace vmsnet Streamer1[idx - 1].LineWidth = 1; Streamer1[idx - 1].MarkerSize = 0; - Streamer1[idx - 1].LegendText = $"CH{idx}"; + /* 작성자: 이재웅, 작성일: 2024-11-27, 내용: 변경한 셀이름으로 차트범례 표시 */ + Streamer1[idx - 1].LegendText = item.Text; //$"CH{idx}"; Streamer1[idx - 1].IsVisible = item.Checked; var dr = ds1.channel.Where(t => t.idx == idx).FirstOrDefault();