From 3f6e94d7de9694378114773ab48d8a61bcc3a01e Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 01 二月 2021 09:22:20 +0800
Subject: [PATCH] 1. 报警生成前后端异步调用 2. 安全光栅方法单线程调用 3. 复位完成时修改界面显示 4. 机台状态拆分执行状态
---
src/Bro.Process/ProcessControl.cs | 65 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index ece460d..7e900ab 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -45,7 +45,6 @@
#region Event
public event Action<string, Bitmap, string> OnBitmapOutput;
- //public event Action<string, object> OnObjectOutput;
public Action<DateTime, Exception> OnExceptionOccured { get; set; }
public event Action<DeviceState> OnProcessStateChanged;
public event Action<DateTime, string, string> OnLog;
@@ -209,10 +208,17 @@
d.OnLog -= OnDeviceLog;
d.OnLog += OnDeviceLog;
+ d.OnExceptionOccured = OnDeviceExceptionRaised;
+
d.StateChange(DeviceState.DSInit);
d.StateChange(DeviceState.DSOpen);
}
});
+ }
+
+ private void OnDeviceExceptionRaised(DateTime dt, Exception ex)
+ {
+ LogAsync(dt, "璁惧寮傚父", ex.GetExceptionMessage());
}
#endregion
@@ -348,10 +354,16 @@
{
if (config == null)
throw new ProcessException("淇濆瓨鐨勯厤缃俊鎭笉鑳戒负绌�");
- ProductionCode = newProductionCode;
+
+ string newConfigPath = Path.Combine(Path.GetDirectoryName(_configPath), $"Config_{newProductionCode}.json");
+ if (File.Exists(newConfigPath))
+ {
+ throw new ProcessException($"{newProductionCode}閰嶇疆鏂囦欢宸茬粡瀛樺湪");
+ }
+
//鐢熸垚config.json
string newConfig = JsonConvert.SerializeObject(config, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All });
- using (StreamWriter writer = new StreamWriter(_configPath, false, System.Text.Encoding.UTF8))
+ using (StreamWriter writer = new StreamWriter(newConfigPath, false, System.Text.Encoding.UTF8))
{
writer.Write(newConfig);
writer.Flush();
@@ -359,7 +371,7 @@
}
//娣诲姞鍒癝etting.json
- SettingHelper.AddNewProductionCode(ProductionCode);
+ SettingHelper.AddNewProductionCode(newProductionCode);
}
catch (Exception ex)
{
@@ -465,14 +477,14 @@
/// <param name="config">鎿嶄綔閰嶇疆锛岀敤鏉ョ‘璁ょ洃鍚潵婧愬拰绠楁硶璺緞</param>
/// <param name="algorithemPath">绠楁硶璺緞锛岄粯璁ゆ槸閰嶇疆涓殑绗竴涓畻娉曡矾寰�</param>
/// <returns>Halcon绠楁硶</returns>
- protected HDevEngineTool GetHalconTool(IOperationConfig config, string algorithemPath = "")
+ protected HDevEngineTool GetHalconTool(IOperationConfig config, string monitorSetId = "", string algorithemPath = "")
{
if (string.IsNullOrWhiteSpace(algorithemPath))
{
algorithemPath = (config as IHalconToolPath)?.GetHalconToolPathList()[0];
}
- string key = config.MonitorSetId + "|" + algorithemPath;
+ string key = (string.IsNullOrWhiteSpace(monitorSetId) ? config.MonitorSetId : monitorSetId) + "|" + algorithemPath;
if (_halconToolDict.ContainsKey(key))
{
return _halconToolDict[key];
@@ -520,11 +532,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 +593,8 @@
}
LogAsync(DateTime.Now, methodCode + "寮傚父淇℃伅", ex.GetExceptionMessage());
+
+ ExceptionRaisedInMonitor(ex);
}
}
@@ -598,13 +615,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 +687,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 +731,14 @@
OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null);
}
+
+ public async virtual void RaisedAlarm(string alarmMsg)
+ {
+ await Task.Run(() =>
+ {
+ OnAlarmUpdate?.Invoke(alarmMsg);
+ });
+ }
#endregion
#region ILogger
--
Gitblit v1.8.0