JDTek/vms2016_kadisp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

전해조그룹 선택시 채널순으로 Sorting 되도록 형식 변경 [ex. 0001~1600]

Browse Source
This commit is contained in:
shark219-hub
2024-12-06 09:59:24 +09:00
parent 9f48a5e452
commit 3c2d31e44a
3 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Viewer/TrendViewer/Frm_trend.Designer.cs generated
View File

@@ -128,16 +128,16 @@ namespace vmsnet
this.TabControl1.Location = new System.Drawing.Point(987, 3);
this.TabControl1.Name = "TabControl1";
this.TabControl1.SelectedIndex = 0;
this.TabControl1.Size = new System.Drawing.Size(194, 764);
this.TabControl1.Size = new System.Drawing.Size(194, 762);
this.TabControl1.TabIndex = 5;
//
// TabPage1
//
this.TabPage1.Controls.Add(this.dv_chlist);
this.TabPage1.Location = new System.Drawing.Point(4, 29);
this.TabPage1.Location = new System.Drawing.Point(4, 34);
this.TabPage1.Name = "TabPage1";
this.TabPage1.Padding = new System.Windows.Forms.Padding(3);
this.TabPage1.Size = new System.Drawing.Size(186, 731);
this.TabPage1.Size = new System.Drawing.Size(186, 724);
this.TabPage1.TabIndex = 0;
this.TabPage1.Text = "셀";
this.TabPage1.UseVisualStyleBackColor = true;
@@ -171,7 +171,7 @@ namespace vmsnet
this.dv_chlist.RowHeadersWidth = 62;
this.dv_chlist.RowTemplate.Height = 23;
this.dv_chlist.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dv_chlist.Size = new System.Drawing.Size(180, 725);
this.dv_chlist.Size = new System.Drawing.Size(180, 718);
this.dv_chlist.TabIndex = 6;
this.dv_chlist.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv_chlist_CellContentClick);
this.dv_chlist.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.DataGridView1_CellFormatting);
@@ -185,7 +185,7 @@ namespace vmsnet
this.useDataGridViewCheckBoxColumn.MinimumWidth = 10;
this.useDataGridViewCheckBoxColumn.Name = "useDataGridViewCheckBoxColumn";
this.useDataGridViewCheckBoxColumn.ReadOnly = true;
this.useDataGridViewCheckBoxColumn.Width = 24;
this.useDataGridViewCheckBoxColumn.Width = 29;
//
// cnameDataGridViewTextBoxColumn1
//
@@ -193,7 +193,7 @@ namespace vmsnet
this.cnameDataGridViewTextBoxColumn1.HeaderText = "채널";
this.cnameDataGridViewTextBoxColumn1.MinimumWidth = 8;
this.cnameDataGridViewTextBoxColumn1.Name = "cnameDataGridViewTextBoxColumn1";
this.cnameDataGridViewTextBoxColumn1.Width = 62;
this.cnameDataGridViewTextBoxColumn1.Width = 78;
//
// c1DataGridViewTextBoxColumn
//
@@ -201,7 +201,7 @@ namespace vmsnet
this.c1DataGridViewTextBoxColumn.HeaderText = "C1";
this.c1DataGridViewTextBoxColumn.MinimumWidth = 8;
this.c1DataGridViewTextBoxColumn.Name = "c1DataGridViewTextBoxColumn";
this.c1DataGridViewTextBoxColumn.Width = 59;
this.c1DataGridViewTextBoxColumn.Width = 74;
//
// c2DataGridViewTextBoxColumn
//
@@ -209,7 +209,7 @@ namespace vmsnet
this.c2DataGridViewTextBoxColumn.HeaderText = "C2";
this.c2DataGridViewTextBoxColumn.MinimumWidth = 8;
this.c2DataGridViewTextBoxColumn.Name = "c2DataGridViewTextBoxColumn";
this.c2DataGridViewTextBoxColumn.Width = 59;
this.c2DataGridViewTextBoxColumn.Width = 74;
//
// ccDataGridViewTextBoxColumn
//
@@ -251,10 +251,10 @@ namespace vmsnet
// TabPage2
//
this.TabPage2.Controls.Add(this.PropertyGrid1);
this.TabPage2.Location = new System.Drawing.Point(4, 29);
this.TabPage2.Location = new System.Drawing.Point(4, 34);
this.TabPage2.Name = "TabPage2";
this.TabPage2.Padding = new System.Windows.Forms.Padding(3);
this.TabPage2.Size = new System.Drawing.Size(186, 729);
this.TabPage2.Size = new System.Drawing.Size(186, 726);
this.TabPage2.TabIndex = 1;
this.TabPage2.Text = "기타";
this.TabPage2.UseVisualStyleBackColor = true;
@@ -264,7 +264,7 @@ namespace vmsnet
this.PropertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.PropertyGrid1.Location = new System.Drawing.Point(3, 3);
this.PropertyGrid1.Name = "PropertyGrid1";
this.PropertyGrid1.Size = new System.Drawing.Size(180, 723);
this.PropertyGrid1.Size = new System.Drawing.Size(180, 720);
this.PropertyGrid1.TabIndex = 0;
//
// bt_cursor2
@@ -311,12 +311,12 @@ namespace vmsnet
this.cm_grpmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem3});
this.cm_grpmenu.Name = "ContextMenuStrip1";
this.cm_grpmenu.Size = new System.Drawing.Size(220, 28);
this.cm_grpmenu.Size = new System.Drawing.Size(248, 36);
//
// ToolStripMenuItem3
//
this.ToolStripMenuItem3.Name = "ToolStripMenuItem3";
this.ToolStripMenuItem3.Size = new System.Drawing.Size(219, 24);
this.ToolStripMenuItem3.Size = new System.Drawing.Size(247, 32);
this.ToolStripMenuItem3.Text = "Channel Index(TEST)";
this.ToolStripMenuItem3.Click += new System.EventHandler(this.ToolStripMenuItem3_Click);
//
@@ -338,7 +338,7 @@ namespace vmsnet
this.Panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.Panel1.Location = new System.Drawing.Point(3, 3);
this.Panel1.Name = "Panel1";
this.Panel1.Size = new System.Drawing.Size(215, 764);
this.Panel1.Size = new System.Drawing.Size(215, 762);
this.Panel1.TabIndex = 7;
//
// dv_grp
@@ -376,7 +376,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(213, 535);
this.dv_grp.Size = new System.Drawing.Size(213, 533);
this.dv_grp.TabIndex = 0;
this.dv_grp.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView2_CellDoubleClick);
//
@@ -432,7 +432,7 @@ namespace vmsnet
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Location = new System.Drawing.Point(0, 568);
this.label1.Location = new System.Drawing.Point(0, 566);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(213, 30);
this.label1.TabIndex = 23;
@@ -445,7 +445,7 @@ namespace vmsnet
this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs_grp, "value", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.textBox1.Location = new System.Drawing.Point(0, 598);
this.textBox1.Location = new System.Drawing.Point(0, 596);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
@@ -458,7 +458,7 @@ namespace vmsnet
this.panel7.Controls.Add(this.bt_delgroup);
this.panel7.Controls.Add(this.LinkLabel5);
this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel7.Location = new System.Drawing.Point(0, 644);
this.panel7.Location = new System.Drawing.Point(0, 642);
this.panel7.Name = "panel7";
this.panel7.Padding = new System.Windows.Forms.Padding(5, 8, 0, 0);
this.panel7.Size = new System.Drawing.Size(213, 31);
@@ -470,9 +470,9 @@ namespace vmsnet
this.bt_delgroup.Dock = System.Windows.Forms.DockStyle.Left;
this.bt_delgroup.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.999999F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.bt_delgroup.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.bt_delgroup.Location = new System.Drawing.Point(91, 8);
this.bt_delgroup.Location = new System.Drawing.Point(93, 8);
this.bt_delgroup.Name = "bt_delgroup";
this.bt_delgroup.Size = new System.Drawing.Size(86, 18);
this.bt_delgroup.Size = new System.Drawing.Size(88, 22);
this.bt_delgroup.TabIndex = 11;
this.bt_delgroup.TabStop = true;
this.bt_delgroup.Text = "선택그룹삭제";
@@ -485,7 +485,7 @@ namespace vmsnet
this.LinkLabel5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.999999F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.LinkLabel5.Location = new System.Drawing.Point(5, 8);
this.LinkLabel5.Name = "LinkLabel5";
this.LinkLabel5.Size = new System.Drawing.Size(86, 18);
this.LinkLabel5.Size = new System.Drawing.Size(88, 22);
this.LinkLabel5.TabIndex = 10;
this.LinkLabel5.TabStop = true;
this.LinkLabel5.Text = "신규그룹생성";
@@ -501,7 +501,7 @@ namespace vmsnet
this.tableLayoutPanel2.Controls.Add(this.Button1, 1, 1);
this.tableLayoutPanel2.Controls.Add(this.bt_print, 0, 1);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 675);
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 673);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
@@ -577,7 +577,7 @@ namespace vmsnet
this.cmb_group.FormattingEnabled = true;
this.cmb_group.Location = new System.Drawing.Point(43, 5);
this.cmb_group.Name = "cmb_group";
this.cmb_group.Size = new System.Drawing.Size(170, 26);
this.cmb_group.Size = new System.Drawing.Size(170, 30);
this.cmb_group.TabIndex = 16;
this.cmb_group.SelectedIndexChanged += new System.EventHandler(this.cmb_group_SelectedIndexChanged);
//
@@ -598,19 +598,19 @@ namespace vmsnet
this.ToolStripMenuItem1,
this.ToolStripMenuItem2});
this.ContextMenuStrip2.Name = "ContextMenuStrip1";
this.ContextMenuStrip2.Size = new System.Drawing.Size(139, 52);
this.ContextMenuStrip2.Size = new System.Drawing.Size(157, 68);
//
// ToolStripMenuItem1
//
this.ToolStripMenuItem1.Name = "ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(138, 24);
this.ToolStripMenuItem1.Size = new System.Drawing.Size(156, 32);
this.ToolStripMenuItem1.Text = "신규생성";
this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// ToolStripMenuItem2
//
this.ToolStripMenuItem2.Name = "ToolStripMenuItem2";
this.ToolStripMenuItem2.Size = new System.Drawing.Size(138, 24);
this.ToolStripMenuItem2.Size = new System.Drawing.Size(156, 32);
this.ToolStripMenuItem2.Text = "선택삭제";
this.ToolStripMenuItem2.Click += new System.EventHandler(this.ToolStripMenuItem2_Click);
//
@@ -648,40 +648,40 @@ namespace vmsnet
this.toolStripLabel2,
this.toolStripLabel3,
this.btConfig});
this.ToolStrip1.Location = new System.Drawing.Point(0, 770);
this.ToolStrip1.Location = new System.Drawing.Point(0, 768);
this.ToolStrip1.Name = "ToolStrip1";
this.ToolStrip1.Size = new System.Drawing.Size(1184, 31);
this.ToolStrip1.Size = new System.Drawing.Size(1184, 33);
this.ToolStrip1.TabIndex = 7;
this.ToolStrip1.Text = "ToolStrip1";
//
// lb_datatcnt
//
this.lb_datatcnt.Name = "lb_datatcnt";
this.lb_datatcnt.Size = new System.Drawing.Size(103, 28);
this.lb_datatcnt.Size = new System.Drawing.Size(121, 28);
this.lb_datatcnt.Text = "<dataCount>";
//
// lb_Area
//
this.lb_Area.Name = "lb_Area";
this.lb_Area.Size = new System.Drawing.Size(60, 28);
this.lb_Area.Size = new System.Drawing.Size(72, 28);
this.lb_Area.Text = "<area>";
//
// lb_selgroup
//
this.lb_selgroup.Name = "lb_selgroup";
this.lb_selgroup.Size = new System.Drawing.Size(74, 28);
this.lb_selgroup.Size = new System.Drawing.Size(89, 28);
this.lb_selgroup.Text = "<Group>";
//
// lb_filesearchtime
//
this.lb_filesearchtime.Name = "lb_filesearchtime";
this.lb_filesearchtime.Size = new System.Drawing.Size(95, 28);
this.lb_filesearchtime.Size = new System.Drawing.Size(114, 28);
this.lb_filesearchtime.Text = "<filesearch>";
//
// lb_querytime
//
this.lb_querytime.Name = "lb_querytime";
this.lb_querytime.Size = new System.Drawing.Size(99, 28);
this.lb_querytime.Size = new System.Drawing.Size(120, 28);
this.lb_querytime.Text = "<querytime>";
//
// ToolStripButton1
@@ -691,38 +691,38 @@ 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(29, 28);
this.ToolStripButton1.Size = new System.Drawing.Size(34, 28);
this.ToolStripButton1.Text = "ToolStripButton1";
this.ToolStripButton1.Click += new System.EventHandler(this.ToolStripButton1_Click_1);
//
// lb_charttime
//
this.lb_charttime.Name = "lb_charttime";
this.lb_charttime.Size = new System.Drawing.Size(77, 28);
this.lb_charttime.Size = new System.Drawing.Size(94, 28);
this.lb_charttime.Text = "<refresh>";
//
// lb_totaltime
//
this.lb_totaltime.Name = "lb_totaltime";
this.lb_totaltime.Size = new System.Drawing.Size(62, 28);
this.lb_totaltime.Size = new System.Drawing.Size(74, 28);
this.lb_totaltime.Text = "<total>";
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(99, 28);
this.toolStripLabel1.Size = new System.Drawing.Size(117, 28);
this.toolStripLabel1.Text = "<value info>";
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
this.toolStripLabel2.Size = new System.Drawing.Size(93, 28);
this.toolStripLabel2.Size = new System.Drawing.Size(111, 28);
this.toolStripLabel2.Text = "<time info>";
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
this.toolStripLabel3.Size = new System.Drawing.Size(74, 28);
this.toolStripLabel3.Size = new System.Drawing.Size(89, 28);
this.toolStripLabel3.Text = "<config>";
//
// btConfig
@@ -732,7 +732,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);
//
@@ -750,7 +750,7 @@ namespace vmsnet
this.TableLayoutPanel1.Name = "TableLayoutPanel1";
this.TableLayoutPanel1.RowCount = 1;
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.TableLayoutPanel1.Size = new System.Drawing.Size(1184, 770);
this.TableLayoutPanel1.Size = new System.Drawing.Size(1184, 768);
this.TableLayoutPanel1.TabIndex = 9;
//
// Panel2
@@ -761,7 +761,7 @@ namespace vmsnet
this.Panel2.Location = new System.Drawing.Point(224, 3);
this.Panel2.Name = "Panel2";
this.Panel2.Padding = new System.Windows.Forms.Padding(5);
this.Panel2.Size = new System.Drawing.Size(757, 764);
this.Panel2.Size = new System.Drawing.Size(757, 762);
this.Panel2.TabIndex = 8;
//
// panel8
@@ -769,7 +769,7 @@ namespace vmsnet
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(5, 5);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(747, 697);
this.panel8.Size = new System.Drawing.Size(747, 695);
this.panel8.TabIndex = 2;
//
// Panel4
@@ -779,7 +779,7 @@ namespace vmsnet
this.Panel4.Controls.Add(this.bt_cursor1);
this.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom;
this.Panel4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.Panel4.Location = new System.Drawing.Point(5, 702);
this.Panel4.Location = new System.Drawing.Point(5, 700);
this.Panel4.Name = "Panel4";
this.Panel4.Padding = new System.Windows.Forms.Padding(5);
this.Panel4.Size = new System.Drawing.Size(747, 57);

11
Viewer/TrendViewer/Frm_trend.cs
View File

@@ -739,7 +739,7 @@ namespace vmsnet
}
public void LinkLabel5_LinkClicked(System.Object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
{
{ // 신규그룹생성
addnewGroup();
}
private void SaveViewGroup()
@@ -763,6 +763,7 @@ namespace vmsnet
//그룹에 속한 채널 데이터
var chlist = PUB.DS.CHANNEL.Where(t => t.GIDX == drGRP.IDX).OrderBy(t => t.IDX);
//var chlistdata = chlist.Where(t => t.ENABLE == 1).Select(t => t.IDX).ToList();
//var chinfos = chlistdata.Select(t => new CChinfo { Show = false, TITLE = $"#{t:0000}", Idx = (ushort)t }).ToList();
/* 작성자: 이재웅, 작성일: 2024-12-04, 작성내용: 채널선택 화면에 변경된 형식의 채널명 표시를 위해 [ex. #A001] */
@@ -770,7 +771,6 @@ namespace vmsnet
var chinfos = chlistdata.Select(t => new CChinfo { Show = false, TITLE = $"{t.TITLE}", Idx = (ushort)t.IDX}).ToList();
List<int> chnolist = new List<int>();
//using (var f = new Frm_SelectCH(titles))
using (var f = new Frm_SelectCH(chinfos.ToArray()))
if (f.ShowDialog() == DialogResult.OK)
{
@@ -786,9 +786,10 @@ namespace vmsnet
}
//최종저장 그룹명
var name = UTIL.InputBox($"그룹명을 입력하세요\n\n그룹생성({chnolist.Count}건)", $"GRP({chnolist.Min()}...{chnolist.Max()})");
/* 작성자: 이재웅, 작성일: 2024-12-04, 작성내용: 전해조그룹 선택시 채널순으로 Sorting 되도록 형식 변경 [ex. 0001~1600] */
var name = UTIL.InputBox($"그룹명을 입력하세요\n\n그룹생성({chnolist.Count}건)", $"GRP({chnolist.Min().ToString("D4")}...{chnolist.Max().ToString("D4")})");
if (name.Item1 == false || name.Item2.isEmpty()) return;
group_name = name.Item2.Replace("'", "");
var value = string.Join(",", chnolist);
short rlt_maxid = PUBC.AddviewGroup(group_name, value, this.cmb_group.Text);
@@ -799,7 +800,7 @@ namespace vmsnet
}
}
public void LinkLabel4_LinkClicked(System.Object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
{
{ // 선택그룹삭제
DelteGroup();
}
private void DelteGroup()

2
Viewer/TrendViewer/Frm_trend.resx
View File

@@ -321,7 +321,7 @@
<data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAJySURBVDhPpZFLTNNwHMd78O7NuwcvIhJFpjcOJiYmHjwZ
YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAJySURBVDhPpZFLTNNwHMd78O7NuwcvIhJFpjcOJiYmHjwZ
Eg8mGi9gosGEgwcqMSBqguGhJkgwCvIWlCFhM2TBwDZAGLKKZWyzG2PSCXS062Nd16//jSpqYuLjm37T
R/6f7+9R6r+1NFK8EBk+o0d/8croiVDwxeF9ob7ivT/5TfFel6t0j4VTlLfDpplmFoBJrpx3njNqAjFX
eXrVc1775vjcVTXiqYywr46es3CKYoZKkqahQos1QA43QuaeQIkMwMwIJCsF05CIt3feM1vgeT7NDtoY