From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 29 九月 2020 13:27:50 +0800
Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy，原来是为了避免内存泄漏，但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收，怀疑其中也有非托管对象资源，测试确实起到内存回收作用
---
src/Bro.UI.Model.Winform/UI/Canvas.cs | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/Bro.UI.Model.Winform/UI/Canvas.cs b/src/Bro.UI.Model.Winform/UI/Canvas.cs
index 40f2b3c..9b7102f 100644
--- a/src/Bro.UI.Model.Winform/UI/Canvas.cs
+++ b/src/Bro.UI.Model.Winform/UI/Canvas.cs
@@ -77,7 +77,7 @@
set => stsStatus.Visible = value;
}
- private async void OnMouseLocationUpdated(Point screenPoint, Point imagePoint, string colorDesc)
+ private void OnMouseLocationUpdated(Point screenPoint, Point imagePoint, string colorDesc)
{
//await Task.Run(() => tsslLocation.Text = $"灞忓箷鍧愭爣X锛歿screenPoint.X}锛孻锛歿screenPoint.Y} 鍥剧墖鍧愭爣X锛歿imagePoint.X}锛孻锛歿imagePoint.Y} 棰滆壊锛歿colorDesc}");
this.Invoke(new Action(() =>
@@ -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
{
@@ -381,17 +384,17 @@
private void tsmiUnselectElements_Click(object sender, EventArgs e)
{
- if (MouseState == MouseState.SelectedElement)
- {
- MouseState = MouseState.Normal;
+ //if (MouseState == MouseState.SelectedElement)
+ //{
+ // MouseState = MouseState.Normal;
- //Elements.ForEach(ele =>
- foreach (IShapeElement ele in Elements)
- {
- ele.State = ElementState.Normal;
- }
- //);
- }
+ // //Elements.ForEach(ele =>
+ // foreach (IShapeElement ele in Elements)
+ // {
+ // ele.State = ElementState.Normal;
+ // }
+ // //);
+ //}
}
#endregion
@@ -543,5 +546,9 @@
}
}
#endregion
+
+ #region 浜嬩欢
+ public event Action<IShapeElement> OnElementChangedHandle;
+ #endregion
}
}
--
Gitblit v1.8.0