diff --git a/Viewer/TrendViewer/Dialog/Frm_SelectCH.cs b/Viewer/TrendViewer/Dialog/Frm_SelectCH.cs index 7585c29..e0152f4 100644 --- a/Viewer/TrendViewer/Dialog/Frm_SelectCH.cs +++ b/Viewer/TrendViewer/Dialog/Frm_SelectCH.cs @@ -11,8 +11,8 @@ namespace vmsnet { public partial class Frm_SelectCH { - - public Frm_SelectCH(TrendCtrlII.CChinfo[] lst) + + public Frm_SelectCH(TrendCtrlII.CChinfo[] lst) { // 디자이너에서 이 호출이 필요합니다. diff --git a/Viewer/TrendViewer/Frm_trend.cs b/Viewer/TrendViewer/Frm_trend.cs index 364d1f9..3e66492 100644 --- a/Viewer/TrendViewer/Frm_trend.cs +++ b/Viewer/TrendViewer/Frm_trend.cs @@ -763,16 +763,20 @@ 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(); + //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] */ + var chlistdata = chlist.Where(t => t.ENABLE == 1).Select(t => new { t.IDX, t.TITLE }).ToList(); + var chinfos = chlistdata.Select(t => new CChinfo { Show = false, TITLE = $"{t.TITLE}", Idx = (ushort)t.IDX}).ToList(); List chnolist = new List(); + //using (var f = new Frm_SelectCH(titles)) using (var f = new Frm_SelectCH(chinfos.ToArray())) - if (f.ShowDialog() == DialogResult.OK) - { - foreach (ListViewItem item in f.CheckedListBox1.CheckedItems) - chnolist.Add(int.Parse(item.Tag.ToString())); - } + if (f.ShowDialog() == DialogResult.OK) + { + foreach (ListViewItem item in f.CheckedListBox1.CheckedItems) + chnolist.Add(int.Parse(item.Tag.ToString())); + } //선택된 채널 갯수 확인 if (chnolist.Any() == false || chnolist.Count > PUB.CONFIG.MaxChCount) diff --git a/cVMS.NET_CS/Setting/Frm_Config.cs b/cVMS.NET_CS/Setting/Frm_Config.cs index 11787b6..2d3ff2a 100644 --- a/cVMS.NET_CS/Setting/Frm_Config.cs +++ b/cVMS.NET_CS/Setting/Frm_Config.cs @@ -1026,6 +1026,7 @@ namespace vmsnet var valuebuffer = new ushort[20]; valuebuffer[0] = Convert.ToUInt16(txtValue.Text); for (int i = 1; i < valuebuffer.Length; i++) valuebuffer[i] = 0; + PUB.indicator.SlaveID = (byte)nudSlaveNo.Value; if (PUB.indicator.WriteValue(valuebuffer) == false) UTIL.MsgE(PUB.indicator.ErrorMessage);