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

채널선택 화면에 변경된 형식의 채널명 표시를 위해 [ex. #A001]

Browse Source
This commit is contained in:
shark219
2024-12-05 11:20:12 +09:00
parent 4bb7dda9aa
commit 9f48a5e452
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Viewer/TrendViewer/Dialog/Frm_SelectCH.cs
View File

@@ -11,8 +11,8 @@ namespace vmsnet
{ {
public partial class Frm_SelectCH public partial class Frm_SelectCH
{ {
public Frm_SelectCH(TrendCtrlII.CChinfo[] lst) public Frm_SelectCH(TrendCtrlII.CChinfo[] lst)
{ {
// 디자이너에서 이 호출이 필요합니다. // 디자이너에서 이 호출이 필요합니다.

18
Viewer/TrendViewer/Frm_trend.cs
View File

@@ -763,16 +763,20 @@ namespace vmsnet
//그룹에 속한 채널 데이터 //그룹에 속한 채널 데이터
var chlist = PUB.DS.CHANNEL.Where(t => t.GIDX == drGRP.IDX).OrderBy(t => t.IDX); 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 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 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<int> chnolist = new List<int>(); List<int> chnolist = new List<int>();
//using (var f = new Frm_SelectCH(titles))
using (var f = new Frm_SelectCH(chinfos.ToArray())) using (var f = new Frm_SelectCH(chinfos.ToArray()))
if (f.ShowDialog() == DialogResult.OK) if (f.ShowDialog() == DialogResult.OK)
{ {
foreach (ListViewItem item in f.CheckedListBox1.CheckedItems) foreach (ListViewItem item in f.CheckedListBox1.CheckedItems)
chnolist.Add(int.Parse(item.Tag.ToString())); chnolist.Add(int.Parse(item.Tag.ToString()));
} }
//선택된 채널 갯수 확인 //선택된 채널 갯수 확인
if (chnolist.Any() == false || chnolist.Count > PUB.CONFIG.MaxChCount) if (chnolist.Any() == false || chnolist.Count > PUB.CONFIG.MaxChCount)

1
cVMS.NET_CS/Setting/Frm_Config.cs
View File

@@ -1026,6 +1026,7 @@ namespace vmsnet
var valuebuffer = new ushort[20]; var valuebuffer = new ushort[20];
valuebuffer[0] = Convert.ToUInt16(txtValue.Text); valuebuffer[0] = Convert.ToUInt16(txtValue.Text);
for (int i = 1; i < valuebuffer.Length; i++) valuebuffer[i] = 0; for (int i = 1; i < valuebuffer.Length; i++) valuebuffer[i] = 0;
PUB.indicator.SlaveID = (byte)nudSlaveNo.Value; PUB.indicator.SlaveID = (byte)nudSlaveNo.Value;
if (PUB.indicator.WriteValue(valuebuffer) == false) if (PUB.indicator.WriteValue(valuebuffer) == false)
UTIL.MsgE(PUB.indicator.ErrorMessage); UTIL.MsgE(PUB.indicator.ErrorMessage);