From 9a2f369bcee572ba086ca83d76a562a0ecaa587b Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 16 七月 2020 17:22:09 +0800
Subject: [PATCH] 板卡修复回原点bug 主流程注释部分log信息，添加部分图片对象主动释放操作 修复Excel输出Alignment最后一项第一次无数据bug 添加平面补偿
---
src/Bro.Process/ProcessControl.cs | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index ece460d..ca587d2 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -21,7 +21,7 @@
using System.Threading.Tasks;
using static Bro.Common.Helper.EnumHelper;
-namespace Bro.Process
+namespace Bro.Process
{
[Process("", DeviceAttributeType.Device)]
public partial class ProcessControl : IProcess
@@ -520,11 +520,14 @@
return;
}
+ if (!ProcessInvokePreCheck())
+ return;
+
IOperationConfig config = monitorSet.OpConfig;
object res = null;
int reTryTimes = config.ReTryTimes;
IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == deviceId);
- LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}寮�濮�", "");
+ LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}寮�濮�", "");
Stopwatch sw = new Stopwatch();
sw.Start();
@@ -578,6 +581,8 @@
}
LogAsync(DateTime.Now, methodCode + "寮傚父淇℃伅", ex.GetExceptionMessage());
+
+ ExceptionRaisedInMonitor(ex);
}
}
@@ -598,13 +603,30 @@
#endregion
sw.Stop();
- LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
- TimeRecordCSV(DateTime.Now, device.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
+ LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
+ TimeRecordCSV(DateTime.Now, device?.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
+ }
+
+ /// <summary>
+ /// 娴佺▼鎵ц鐨勯妫�鏌�
+ /// </summary>
+ /// <returns></returns>
+ public virtual bool ProcessInvokePreCheck()
+ {
+ return true;
+ }
+
+ /// <summary>
+ /// 鐩戝惉娴佺▼涓紓甯告姏鍑� 鍦ㄥ叿浣撲笟鍔′腑鍏蜂綋澶勭悊
+ /// </summary>
+ /// <param name="ex">鐩戝惉娴佺▼涓紓甯稿璞�</param>
+ public virtual void ExceptionRaisedInMonitor(Exception ex)
+ {
}
#endregion
#region 鍥惧儚澶勭悊
- protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
+ protected IImageSet CollectHImage(CameraBase camera, IOperationConfig opConfig, [CallerMemberName]string methodCode = "")
{
IImageSet set = null;
@@ -653,8 +675,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set?.Id;
- return set.HImage;
+ return set;
}
protected async void CameraUpdateImage(CameraBase camera, Bitmap image, string setId)
@@ -698,6 +719,11 @@
OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null);
}
+
+ public virtual void RaisedAlarm(string alarmMsg)
+ {
+ OnAlarmUpdate?.Invoke(alarmMsg);
+ }
#endregion
#region ILogger
--
Gitblit v1.8.0