From c0d59e233882ad489f45abc8eb0193ffa4fb8988 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期六, 11 七月 2020 11:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
index 103622f..528ef6b 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
@@ -31,11 +31,10 @@
get => Device as MotionCardBase;
}
- public CtrlMotionCardIOStatus(IDevice device, List<IOItem> monitorValues)
+ public CtrlMotionCardIOStatus(IDevice device)
{
InitializeComponent();
Device = device;
- _monitorValues = monitorValues;
InitIOEvent();
}
@@ -51,14 +50,15 @@
}
}
- private void IoOut_DoubleClick(string desc, bool isOn)
+ private void IoOut_DoubleClick(string name, bool isOn)
{
- var index = Convert.ToInt16(desc.Substring(3));
- MotionCard.WriteOutput(index, isOn ? IOValue.FALSE : IOValue.TRUE);
+ var index = Convert.ToInt16(name.Substring(6));
+ MotionCard.WriteOutput(index, isOn ? IOValue.TRUE : IOValue.FALSE);
}
private void RefreshIOStatus(object sender, EventArgs e)
{
+ _monitorValues = MotionCard.MonitorValues;
foreach (var ioItem in _monitorValues)
{
if (ioItem.IOType == Common.Helper.EnumHelper.IOType.INPUT)
@@ -67,7 +67,7 @@
if (ioInArray != null && ioInArray.Length == 1)
{
var ioIn = ioInArray[0] as IOIndicatorCtrl;
- ioIn.IsOn = ioItem.Value == IOValue.TRUE;
+ ioIn.IsOn = ioItem.Value == IOValue.FALSE;
}
}
else
@@ -76,7 +76,7 @@
if (ioOutArray != null && ioOutArray.Length == 1)
{
var ioOut = ioOutArray[0] as IOIndicatorCtrl;
- ioOut.IsOn = ioItem.Value == IOValue.TRUE;
+ ioOut.IsOn = ioItem.Value == IOValue.FALSE;
}
}
}
--
Gitblit v1.8.0