From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.M071.Process/M071Process.cs | 92 +++++++++++++++++++++++++++++++---------------
1 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 300a146..144827a 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -61,7 +61,6 @@
Reset(null, null, null);
FullReset(null);
-
}
private void InitialMotionCardBaseAxisAlarm()
@@ -196,7 +195,7 @@
}
MachineState = MachineState.Running;
- OnMeasureStart?.BeginInvoke(null, null);
+ OnMeasureStart?.Invoke();
var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
measurements.ForEach(m =>
@@ -226,9 +225,12 @@
Config.SnapshotPointCollection.Where(u => u.IsEnabled).ToList().ForEach(s =>
{
- _pauseHandle.WaitHandle.WaitOne();
+ _pausedHandle.Wait();
- if (MachineState != MachineState.Running)
+ if (MachineState == MachineState.Ready)
+ return;
+
+ if (MachineState != MachineState.Running && MachineState != MachineState.Pause)
{
throw new ProcessException("鏈哄彴鐘舵�佷笉鍦ㄨ繍琛屼腑锛岄��鍑烘娴�");
}
@@ -336,10 +338,14 @@
{
if (sender is ProductionMeasurement pMeasure)
{
- lock (pMeasure)
+ var production = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
+ if (production == null)
+ return;
+
+ lock (production)
{
//妫�鏌ユ槸鍚﹀叏閮ㄥ畬鎴�
- pMeasure.Measurements.ForEach(m =>
+ pMeasure.Measurements?.ForEach(m =>
{
if (m.KeyUnitCollection.All(k => k.IsDone != null))
{
@@ -381,7 +387,7 @@
indicator.ResultState = m.Spec.MeasureResult;
pMeasure.ElementList.Add(indicator);
//杈撳嚭鍥惧舰鍩哄厓鍒扮晫闈�
- OnElementUpdated?.BeginInvoke(indicator, null, null);
+ OnElementUpdated?.Invoke(indicator);
SaveKeyImages(pMeasure.Barcode, m);
@@ -414,8 +420,8 @@
{
}
- ////Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
- //ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
+ //Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
+ ExportProductionExcel(measurementUnitResultAndKeyUnitDataSet);
////鏁版嵁搴撲繚瀛�
//SaveProductionData(measurementUnitResultAndKeyUnitDataSet);
@@ -489,18 +495,19 @@
measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord = productionMeasurementRecords;
- foreach (var MeasurementUnitResult in pData.Measurements)//鑾峰彇鍒板崟涓祴閲忛」缁撴灉
+ foreach (var measurementUnit in pData.Measurements)//鑾峰彇鍒板崟涓祴閲忛」缁撴灉
{
MeasurementUnitResult measurementUnitResult = new MeasurementUnitResult();
measurementUnitResult.ProductionMeasurementRecordsId = productionMeasurementRecords.ID;
- measurementUnitResult.MeasurementName = MeasurementUnitResult.Name;
- measurementUnitResult.MeasurementType = MeasurementUnitResult.MeasureType;
- measurementUnitResult.MeasurementValue = MeasurementUnitResult.Spec.ActualValue.ToString();
- measurementUnitResult.MeasurementResult = MeasurementUnitResult.Spec.MeasureResult.Value ? "OK" : "NG";
+ measurementUnitResult.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
+ measurementUnitResult.MeasurementName = measurementUnit.GetDisplayText();
+ measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
+ measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue.ToString();
+ measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";
measurementUnitResults.Add(measurementUnitResult);
- foreach (var keyUnit in MeasurementUnitResult.KeyUnitCollection)//鑾峰彇鍗曚釜閿殑娴嬮噺缁撴灉
+ foreach (var keyUnit in measurementUnit.KeyUnitCollection)//鑾峰彇鍗曚釜閿殑娴嬮噺缁撴灉
{
foreach (var keyValue in keyUnit.MeasureValueDict)//鑾峰彇鍗曚釜閿殑鍗曚釜娴嬮噺item 缁撴灉
{
@@ -508,6 +515,7 @@
if (!isExist)//宸插瓨鍦� 涓嶉噸澶嶆坊鍔犲師濮嬫暟鎹�
{
KeyUnitData keyUnitData = new KeyUnitData();
+ keyUnitData.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
keyUnitData.Key = keyUnit.Key;
keyUnitData.MeasurementItem = keyValue.Key;
keyUnitData.ItemValue = keyValue.Value.ToString();
@@ -544,12 +552,14 @@
excelExportDto.Worksheets = new List<string>() { "鍘熷鏁版嵁", "妫�娴嬬粨鏋�" };
var keyUnitColumns = new Dictionary<string, string>()
{
+ {"ProductionBarcode", "浜у搧鏉＄爜"},
{"Key", "閿�"},
{"MeasurementItem", "妫�娴嬮」"},
{"ItemValue", "妫�娴嬪��"}
};
var measurementUnitResultColumns = new Dictionary<string, string>()
{
+ {"ProductionBarcode", "浜у搧鏉＄爜"},
{"MeasurementName", "妫�娴嬪悕绉�"},
{"MeasurementType", "妫�娴嬬被鍨�"},
{"MeasurementValue", "妫�娴嬪��"},
@@ -561,14 +571,14 @@
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[0]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.KeyUnitDataList, keyUnitColumns);
excelExportDto.WorksheetDataTable[excelExportDto.Worksheets[1]] = ExcelExportHelper.ListToDataTable(measurementUnitResultAndKeyUnitDataSet.MeasurementUnitResultList, measurementUnitResultColumns); ;
- byte[] filecontent = ExcelExportHelper.ExportExcel(excelExportDto, false);
- string dir = Path.Combine(Config.LogPath, DateTime.Now.ToString("yyyyMMdd"));
- if (!Directory.Exists(dir))
+ if (!Directory.Exists(Config.LogPath))
{
- Directory.CreateDirectory(dir);
+ Directory.CreateDirectory(Config.LogPath);
}
+ var fileName = Path.Combine(Config.LogPath, $"ProductionData_{DateTime.Now.ToString("yyyyMMdd")}.xlsx");
- FileStream fs = new FileStream(Path.Combine(dir, $"{measurementUnitResultAndKeyUnitDataSet.ProductionMeasurementRecord.ProductionBarcode}_{DateTime.Now.ToString("HHmmss")}.xlsx"), FileMode.Create, FileAccess.Write);
+ byte[] filecontent = ExcelExportHelper.CreateOrAppendExcel(excelExportDto, fileName);
+ FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
fs.Write(filecontent, 0, filecontent.Length);
fs.Flush();
fs.Close();
@@ -647,8 +657,16 @@
int i = 0;
u.KeyImages?.ForEach(image =>
{
- string fileName = Path.Combine(dir, $"{measureName}_{u.Key}{(i == 0 ? "" : $"-{i}")}_{DateTime.Now.ToString("HHmmss")}.tiff");
- image.WriteImage("tiff", 0, fileName);
+ string fileName = "";
+ try
+ {
+ fileName = Path.Combine(dir, $"{measureName}_{u.Key}{(i == 0 ? "" : $"-{i}")}_{DateTime.Now.ToString("HHmmss")}.tiff");
+ image.WriteImage("tiff", 0, fileName);
+ }
+ catch (Exception)
+ {
+ LogAsync(DateTime.Now, "鍒囧浘淇濆瓨澶辫触", fileName);
+ }
i++;
});
@@ -668,6 +686,7 @@
string toolKey = (opConfig as CameraOprerationConfigBase).AlgorithemPath;
HObject images = imgSet.HImage;
LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
+ LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{imgSet.ImageData}", "");
if (!string.IsNullOrWhiteSpace(toolKey))
{
@@ -691,6 +710,7 @@
}
HOperatorSet.CountObj(images, out HTuple count);
+ LogAsync(DateTime.Now, $"{snapshotName}鍒囧浘{count.I}寮�", "");
if (count == 0)
{
@@ -699,7 +719,7 @@
return;
}
- var excludeKeys = keys.Where(u => u.ImageSeq > count).ToList();
+ var excludeKeys = keys.Where(u => u.ImageSeq > count.I).ToList();
if (excludeKeys.Count > 0)
{
LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
@@ -709,9 +729,19 @@
});
}
- Parallel.For(1, count.I, (i) =>
+ string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{DateTime.Now.ToString("yyyyMMdd")}", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
+ if (!Directory.Exists(dir))
+ {
+ Directory.CreateDirectory(dir);
+ }
+
+ //Parallel.For(1, count.I + 1, (i) =>
+ for (int i = 1; i <= count.I; i++)
{
HOperatorSet.SelectObj(images, out HObject image, i);
+
+ string fileName = Path.Combine(dir, $"{i}.tif");
+ image.ConvertHObjectToHImage().WriteImage("tiff", 0, fileName);
keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
{
@@ -727,8 +757,8 @@
else
{
_halconToolDict[keyToolKey].InputImageDic["INPUT_Image"] = image;
- _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X;
- //_halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z;
+ _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X / 1000000.0;
+ _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z / 1000000.0;
if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
{
LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
@@ -738,10 +768,11 @@
var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
if (results.Count == 0 || results.Any(u => u < 0))
{
- LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬粨鏋滃紓甯�", "");
+ LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁寮傚父", "");
}
else
{
+ LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁", $"{string.Join(" ", results)}");
resultDict = k.KeyResultList.ToDictionary(u => u, u =>
{
int index = k.KeyResultList.IndexOf(u);
@@ -753,13 +784,14 @@
keyBindList.ForEach(kb =>
{
- kb.KeyImages.Add(image.Clone() as HImage);
+ kb.KeyImages.Add(image.ConvertHObjectToHImage());
kb.FillKeyValues(resultDict);
});
});
- image.Dispose();
- });
+ //image.Dispose();
+ }
+ //);
//if (count.I != 1)
//{
--
Gitblit v1.8.0