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.Device.Winform/CtrlCameraRunBase.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/CtrlCameraRunBase.cs b/src/Bro.UI.Device.Winform/CtrlCameraRunBase.cs
index c990ef1..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,8 +262,13 @@
{
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)
@@ -261,5 +280,10 @@
{
throw new NotImplementedException();
}
+
+ private void tsmiBtnExecuteOpConfig_Click(object sender, EventArgs e)
+ {
+ Camera.Snapshot(OpConfig);
+ }
}
}
--
Gitblit v1.8.0