From 9cedbf3a4e9cc7c18df0b5424891f77c9dcb2988 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 11:21:43 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Process/ProcessControl.cs | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 1c146c5..35c3af7 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -398,7 +398,7 @@
#endregion
#region Halcon绠楀瓙璁剧疆
- private void InitialHalconTool()
+ protected virtual void InitialHalconTool()
{
foreach (HDevEngineTool tool in _halconToolDict.Values)
{
@@ -413,20 +413,25 @@
{
toolPath.GetHalconToolPathList().ForEach(path =>
{
- if (!string.IsNullOrWhiteSpace(path))
- {
- string directoryPath = Path.GetDirectoryName(path);
- string fileName = Path.GetFileNameWithoutExtension(path);
-
- HDevEngineTool tool = new HDevEngineTool(directoryPath);
- tool.LoadProcedure(fileName);
-
- //浣跨敤鈥渱鈥濅綔涓洪棿闅旂
- _halconToolDict[monitorSet.Id + "|" + path] = tool;
- }
+ LoadHalconTool(path, monitorSet.Id);
});
}
});
+ }
+
+ protected void LoadHalconTool(string algorithemPath, string prefix)
+ {
+ if (!string.IsNullOrWhiteSpace(algorithemPath))
+ {
+ string directoryPath = Path.GetDirectoryName(algorithemPath);
+ string fileName = Path.GetFileNameWithoutExtension(algorithemPath);
+
+ HDevEngineTool tool = new HDevEngineTool(directoryPath);
+ tool.LoadProcedure(fileName);
+
+ //浣跨敤鈥渱鈥濅綔涓洪棿闅旂
+ _halconToolDict[prefix + "|" + algorithemPath] = tool;
+ }
}
/// <summary>
@@ -479,7 +484,7 @@
#endregion
#region IMonitor鐩戝惉
- protected virtual void OnMonitorInvoke(DateTime dt, string deviceId, IDevice sourceDevice, MonitorSet monitorSet)
+ protected virtual void OnMonitorInvoke(DateTime dt, string deviceId, IDevice sourceDevice, IMonitorSet monitorSet)
{
string methodCode = monitorSet.MethodCode;
@@ -576,7 +581,7 @@
#region 鍥惧儚澶勭悊
protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
{
- ImageSet set = null;
+ IImageSet set = null;
if (IConfig.IsImageOffline)
{
@@ -623,7 +628,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set.Id;
+ imgSetId = set?.Id;
return set.HImage;
}
@@ -637,9 +642,9 @@
#endregion
#region 鎶ヨ鍜孌ownTime
- ObservableCollection<WarningSet> _warningRemains = new ObservableCollection<WarningSet>();
+ ObservableCollection<IWarningSet> _warningRemains = new ObservableCollection<IWarningSet>();
- protected virtual void OnMonitorAlarm(DateTime dt, IDevice device, WarningSet warning)
+ protected virtual void OnMonitorAlarm(DateTime dt, IDevice device, IWarningSet warning)
{
if (warning.CurrentStatus)
{
--
Gitblit v1.8.0