From 6caa156ba8be9728b4cb67c7c7be326b0316f773 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 09 七月 2020 17:22:44 +0800
Subject: [PATCH] 板卡+数据库保存+excel导出
---
src/Bro.Process/ProcessControl.cs | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 1c146c5..948b3c0 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -342,6 +342,31 @@
}
}
+ public void CreateNewConfig(IProcessConfig config, string newProductionCode)
+ {
+ try
+ {
+ if (config == null)
+ throw new ProcessException("淇濆瓨鐨勯厤缃俊鎭笉鑳戒负绌�");
+ ProductionCode = newProductionCode;
+ //鐢熸垚config.json
+ string newConfig = JsonConvert.SerializeObject(config, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All });
+ using (StreamWriter writer = new StreamWriter(_configPath, false, System.Text.Encoding.UTF8))
+ {
+ writer.Write(newConfig);
+ writer.Flush();
+ writer.Close();
+ }
+
+ //娣诲姞鍒癝etting.json
+ SettingHelper.AddNewProductionCode(ProductionCode);
+ }
+ catch (Exception ex)
+ {
+ throw new ProcessException(ex.Message, null);
+ }
+ }
+
private void SaveBackupConfig()
{
string backPath = Path.GetDirectoryName(_configPath);
@@ -398,7 +423,7 @@
#endregion
#region Halcon绠楀瓙璁剧疆
- private void InitialHalconTool()
+ protected virtual void InitialHalconTool()
{
foreach (HDevEngineTool tool in _halconToolDict.Values)
{
@@ -413,20 +438,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 +509,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;
@@ -489,6 +519,9 @@
monitorSet.Response = new ProcessResponse((int)ReturnValue.UNAUTHORIZATION);
return;
}
+
+ if (!ProcessInvokePreCheck())
+ return;
IOperationConfig config = monitorSet.OpConfig;
object res = null;
@@ -548,6 +581,8 @@
}
LogAsync(DateTime.Now, methodCode + "寮傚父淇℃伅", ex.GetExceptionMessage());
+
+ ExceptionRaisedInMonitor(ex);
}
}
@@ -571,12 +606,29 @@
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 = "")
{
- ImageSet set = null;
+ IImageSet set = null;
if (IConfig.IsImageOffline)
{
@@ -623,7 +675,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set.Id;
+ imgSetId = set?.Id;
return set.HImage;
}
@@ -637,9 +689,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)
{
@@ -668,6 +720,11 @@
OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null);
}
+
+ public virtual void RaisedAlarm(string alarmMsg)
+ {
+ OnAlarmUpdate?.Invoke(alarmMsg);
+ }
#endregion
#region ILogger
--
Gitblit v1.8.0