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.Device.Winform/CtrlCameraRunBase.cs | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/CtrlCameraRunBase.cs b/src/Bro.UI.Device.Winform/CtrlCameraRunBase.cs
index 624da37..84f45c6 100644
--- a/src/Bro.UI.Device.Winform/CtrlCameraRunBase.cs
+++ b/src/Bro.UI.Device.Winform/CtrlCameraRunBase.cs
@@ -1,8 +1,11 @@
-锘縰sing Bro.Common.Interface;
+锘縰sing Bro.Common.Factory;
+using Bro.Common.Helper;
+using Bro.Common.Interface;
using Bro.UI.Model.Winform;
using System;
using System.Collections.Generic;
using System.Drawing;
+using System.Reflection;
using System.Windows.Forms;
namespace Bro.Common.Base.UI
@@ -46,6 +49,17 @@
Camera.OnCameraOpModeChanged += Camera_OnCameraOpModeChanged;
InitialToolBarVisible();
+
+ string typeCode = Camera.GetType().GetCustomAttribute<DeviceAttribute>()?.TypeCode;
+
+ if (string.IsNullOrWhiteSpace(typeCode))
+ {
+ propGridOpConfig.SelectedObject = OpConfig = new CameraOprerationConfigBase();
+ }
+ else
+ {
+ propGridOpConfig.SelectedObject = OpConfig = ConfigFactory.GetOperationConfig(typeCode);
+ }
}
private readonly Dictionary<string, List<IShapeElement>> _eleBufferDict = new Dictionary<string, List<IShapeElement>>();
@@ -248,6 +262,28 @@
{
IsShowStatusBar = tsmiShowStatusBar.Checked;
}
+
+ private void tsmiShowOpConfig_CheckedChanged(object sender, EventArgs e)
+ {
+ tscOpConfig.Visible = tsmiShowOpConfig.Checked;
+ }
#endregion
+
+ public IOperationConfig OpConfig { get; set; }
+
+ public void UploadOperationConfig(IOperationConfig opConfig)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IOperationConfig GetOperationConfig()
+ {
+ throw new NotImplementedException();
+ }
+
+ private void tsmiBtnExecuteOpConfig_Click(object sender, EventArgs e)
+ {
+ Camera.Snapshot(OpConfig);
+ }
}
}
--
Gitblit v1.8.0