From 1f2fa3f54d4a7b5a2f601c4c947a06476342e3bd Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 22 一月 2021 09:23:06 +0800
Subject: [PATCH] 1. gocator驱动将system.stop移到system.ReceiveData之后 2. 修改测量完成后状态切换逻辑，避免安全光线等干扰 3. 添加设备异常输出日志记录 4. 产品结果输出时做硬盘文件记录
---
src/Bro.UI.Model.Winform/UI/Canvas.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/Bro.UI.Model.Winform/UI/Canvas.cs b/src/Bro.UI.Model.Winform/UI/Canvas.cs
index 16ae7be..9b7102f 100644
--- a/src/Bro.UI.Model.Winform/UI/Canvas.cs
+++ b/src/Bro.UI.Model.Winform/UI/Canvas.cs
@@ -237,7 +237,7 @@
{
ele.IsEnabled = e.CheckedState;
}
- OnElementChanged();
+ OnElementChanged(null);
}
private void dgElements_SelectionChanged(object sender, EventArgs e)
@@ -270,7 +270,7 @@
private void Elements_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
- OnElementChanged();
+ OnElementChanged(null);
foreach (IShapeElement ele in Elements)
{
@@ -281,14 +281,17 @@
private void Ele_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
- OnElementChanged();
+ OnElementChanged(sender as IShapeElement);
}
- private void OnElementChanged()
+ private void OnElementChanged(IShapeElement ele)
{
+ if (ele != null)
+ OnElementChangedHandle?.Invoke(ele);
+
if (InvokeRequired)
{
- Invoke(new Action(() => OnElementChanged()));
+ Invoke(new Action(() => OnElementChanged(ele)));
}
else
{
@@ -543,5 +546,9 @@
}
}
#endregion
+
+ #region 浜嬩欢
+ public event Action<IShapeElement> OnElementChangedHandle;
+ #endregion
}
}
--
Gitblit v1.8.0