From 78584911d0457ad9fc26d9dfc6f374b7ef531c0f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期日, 22 十一月 2020 13:45:09 +0800
Subject: [PATCH] 1. 添加操作员输入和界面显示 2. 添加通过输入窗体 3. 添加webservice调用帮助类 4. M071添加MES数据检查和数据上传功能，添加相关界面显示和流程控制
---
src/Bro.M071.Process/M071Process.cs | 369 +++++++++++++++++++++++++++++++---------------------
1 files changed, 221 insertions(+), 148 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 7847649..1de633a 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -48,6 +48,8 @@
public event Action OnFullResetDone;
#endregion
+ string _precision = "f3";
+
public override void Open()
{
InitialSetting();
@@ -63,6 +65,14 @@
Reset(null, null, null);
FullReset(null);
+
+ if (Config.Precision > 0)
+ {
+ _precision = "f" + Config.Precision;
+ }
+
+ IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
+ DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
}
private void InitialMotionCardBaseAxisAlarm()
@@ -175,8 +185,6 @@
}
#endregion
- public string BarCode { get; set; }
-
List<ProductionMeasurement> productionList = new List<ProductionMeasurement>();
[ProcessMethod("", "StartJob", "寮�濮嬫壂鎻�", InvokeType.TestInvoke)]
@@ -187,22 +195,39 @@
throw new ProcessException(SafetyMsg, null, ExceptionLevel.Fatal);
}
+ string hint = "";
if (MachineState != MachineState.Ready)
- throw new ProcessException("鏈哄彴鏈氨缁紝璇峰嬁寮�濮嬫祴閲�", null, ExceptionLevel.Fatal);
+ {
+ hint = "鏈哄彴鏈氨缁紝璇峰嬁寮�濮嬫祴閲�";
+ OnCheckHintUpload?.Invoke(hint, true);
+ throw new ProcessException(hint, null, ExceptionLevel.Fatal);
+ }
if (string.IsNullOrWhiteSpace(BarCode))
{
+ hint = "鏈緭鍏ヤ骇鍝佹潯鐮侊紝璇峰嬁寮�濮嬫祴閲�";
OnClearBarcode?.Invoke();
- throw new ProcessException("鏈緭鍏ヤ骇鍝佹潯鐮侊紝璇峰嬁寮�濮嬫祴閲�");
+ OnCheckHintUpload?.Invoke(hint, true);
+ throw new ProcessException(hint);
}
MachineState = MachineState.Running;
+
+ OnCheckHintUpload?.Invoke(hint, true);
OnMeasureStart?.Invoke();
- var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
- measurements.ForEach(m =>
+ //var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
+ //measurements.ForEach(m =>
+ //{
+ // m.InitialKeyUnitMeasureChanged();
+ //});
+
+ List<MeasurementUnit> measurements = new List<MeasurementUnit>();
+ Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().ForEach(u =>
{
+ var m = u.Copy();
m.InitialKeyUnitMeasureChanged();
+ measurements.Add(m);
});
var pMeasure = new ProductionMeasurement()
@@ -211,6 +236,8 @@
Measurements = measurements,
StartTime = DateTime.Now,
};
+
+ BarCode = "";
var existedProduction = productionList.FirstOrDefault(u => u.Barcode == pMeasure.Barcode);
if (existedProduction != null)
@@ -275,8 +302,9 @@
RunImageHandle(s.CameraOp.OpConfig, set, s.Id, s.Name, pMeasure.Measurements);
});
- BarCode = "";
LogAsync(DateTime.Now, $"{pMeasure.Barcode}娴嬮噺鍔ㄤ綔瀹屾垚", "");
+
+ GC.Collect(0, GCCollectionMode.Optimized);
return new ProcessResponse(true);
}
@@ -355,7 +383,8 @@
{
if (m.KeyUnitCollection.Any(k => k.IsDone == false))
{
- m.Spec.ActualValue = -999;
+ //m.Spec.ActualValue = -999;
+ m.Spec.ActualValue = null;
}
else
{
@@ -363,21 +392,35 @@
if (!_halconToolDict.ContainsKey(toolKey))
{
LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}绠楁硶鏈垵濮嬪寲", "");
- m.Spec.ActualValue = -999;
+ //m.Spec.ActualValue = -999;
+ m.Spec.ActualValue = null;
}
else
{
- var array = m.KeyUnitCollection.SelectMany(u => u.MeasureValueDict.Values.ToList().ConvertAll(v => v ?? -999)).ToArray();
- _halconToolDict[toolKey].InputTupleDic["INPUT_Params"] = new HTuple(array);
- if (!_halconToolDict[toolKey].RunProcedure(out string error))
+ //var array = m.KeyUnitCollection.SelectMany(u => u.MeasureValueDict.Values.ToList().ConvertAll(v => v ?? -999)).ToArray();
+ var array = m.KeyUnitCollection.SelectMany(u => u.MeasureValueDict.Values.Select(v => v ?? -999)).ToArray();
+
+ if (array == null || array.Length == 0)
{
- LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}绠楁硶寮傚父,{error}", "");
- m.Spec.ActualValue = -999;
+ LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}鏈兘鑾峰彇瀵瑰簲妫�娴嬪��", "");
+ //m.Spec.ActualValue = -999;
+ m.Spec.ActualValue = null;
}
else
{
- m.Spec.ActualValue = double.Parse(_halconToolDict[toolKey].GetResultTuple("OUTPUT_Result").D.ToString("f2"));
- //LogAsync(DateTime.Now, $"{m.GetDisplayText()}鏁版嵁{m.Spec.ActualValue}锛岀粨鏋渰(m.Spec.MeasureResult == null ? "TBD" : (m.Spec.MeasureResult == true ? "OK" : "NG"))}", "");
+
+ _halconToolDict[toolKey].InputTupleDic["INPUT_Params"] = new HTuple(array);
+ if (!_halconToolDict[toolKey].RunProcedure(out string error))
+ {
+ LogAsync(DateTime.Now, $"{m.GetDisplayText()}{m.Spec.Code}绠楁硶寮傚父,{error}", "");
+ //m.Spec.ActualValue = -999;
+ m.Spec.ActualValue = null;
+ }
+ else
+ {
+ m.Spec.ActualValue = double.Parse(_halconToolDict[toolKey].GetResultTuple("OUTPUT_Result").D.ToString(_precision));
+ //LogAsync(DateTime.Now, $"{m.GetDisplayText()}鏁版嵁{m.Spec.ActualValue}锛岀粨鏋渰(m.Spec.MeasureResult == null ? "TBD" : (m.Spec.MeasureResult == true ? "OK" : "NG"))}", "");
+ }
}
}
}
@@ -385,7 +428,8 @@
//LogAsync(DateTime.Now, $"{m.GetDisplayText()}妫�娴嬬粨鏋�", $"{((m.Spec.MeasureResult ?? false) ? "OK" : "NG")}");
KeyIndicator indicator = new KeyIndicator(m.Id, m.DisplayLocation);
- indicator.Text = (m.Spec.ActualValue == null || m.Spec.ActualValue == -999) ? "NA" : m.Spec.ActualValue.Value.ToString("f2");
+ //indicator.Text = (m.Spec.ActualValue == null || m.Spec.ActualValue == -999) ? "NA" : m.Spec.ActualValue.Value.ToString(_precision);
+ indicator.Text = m.Spec.ActualValue == null ? "NA" : m.Spec.ActualValue.Value.ToString(_precision);
indicator.ResultState = m.Spec.MeasureResult;
pMeasure.ElementList.Add(indicator);
//杈撳嚭鍥惧舰鍩哄厓鍒扮晫闈�
@@ -405,9 +449,27 @@
}
pMeasure.EndTime = DateTime.Now;
- bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
- pMeasure.PResult = pResult ? "OK" : "NG";
- OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
+ //bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
+ //pMeasure.PResult = pResult ? "OK" : "NG";
+ //OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
+ //OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
+
+ int result = -1;
+ if (pMeasure.Measurements.Any(u => u.Spec.MeasureResult == null))
+ {
+ pMeasure.PResult = "NA";
+ }
+ else if (pMeasure.Measurements.Any(u => u.Spec.MeasureResult == false))
+ {
+ pMeasure.PResult = "NG";
+ result = 0;
+ }
+ else
+ {
+ pMeasure.PResult = "OK";
+ result = 1;
+ }
+ OnUpdateResult?.Invoke(DateTime.Now, result);
OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
LogAsync(DateTime.Now, $"{pMeasure.Barcode} 妫�娴嬪畬鎴愶紝缁撴灉 {pMeasure.PResult}", "");
@@ -417,9 +479,10 @@
var measurementUnitResultAndKeyUnitDataSet = GetMeasurementUnitResultAndKeyUnitData(pMeasure);
- //MES杈撳嚭 todo
- if (Config.IsEnableMESUpload)
+ if (pMeasure.PResult != "NA")
{
+ //MES杈撳嚭
+ MESCheckDataUpload(pMeasure);
}
//Excel鎶ヨ〃杈撳嚭 锛堝崟涓骇鍝佺殑excel瀵煎嚭锛�
@@ -433,6 +496,7 @@
productionList.RemoveAll(p => p.Barcode == pMeasure.Barcode);
pMeasure.Dispose();
+ //LogAsync(DateTime.Now, $"{pMeasure.Barcode}浜у搧淇℃伅閲婃斁瀹屾垚", JsonConvert.SerializeObject(pMeasure));
}
}
@@ -517,7 +581,7 @@
measurementUnitResult.Keys = measurementUnit.KeyUnitCollection[0].KeyResultId + "~" + measurementUnit.KeyUnitCollection[measurementUnit.KeyUnitCollection.Count() - 1].KeyResultId;
}
measurementUnitResult.MeasurementType = measurementUnit.MeasureType;
- measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue == null ? "NA" : measurementUnit.Spec.ActualValue.Value.ToString("f2");
+ measurementUnitResult.MeasurementValue = measurementUnit.Spec.ActualValue == null ? "NA" : measurementUnit.Spec.ActualValue.Value.ToString(_precision);
measurementUnitResult.MeasurementResult = measurementUnit.Spec.MeasureResult.Value ? "OK" : "NG";
measurementUnitResults.Add(measurementUnitResult);
@@ -533,7 +597,7 @@
keyUnitData.ProductionBarcode = productionMeasurementRecords.ProductionBarcode;
keyUnitData.Key = keyUnit.Key;
keyUnitData.MeasurementItem = keyValue.Key;
- keyUnitData.ItemValue = keyValue.Value == null ? "NA" : keyValue.Value.Value.ToString("f2");
+ keyUnitData.ItemValue = keyValue.Value == null ? "NA" : keyValue.Value.Value.ToString(_precision);
keyUnitDatas.Add(keyUnitData);
MeasurementAndKeyDataRelation measurementAndKeyDataRelation = new MeasurementAndKeyDataRelation();
@@ -710,8 +774,6 @@
#region RawData
{
- //rawDataSheet = package.Workbook.Worksheets["RawData"];
-
int rowDataStartCol = rawDataSheet.Dimension.Columns;
var barcodeCell = rawDataSheet.Cells[1, rowDataStartCol + 1, 1, rowDataStartCol + 4];
barcodeCell.Merge = true;
@@ -758,11 +820,6 @@
{
int slantStartCol = slantSheet.Dimension.Columns;
- //var barcodeCell = slantSheet.Cells[1, slantStartCol + 1, 1, slantStartCol + 2];
- //barcodeCell.Merge = true;
- //barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
- //SetTitleCell(barcodeCell);
-
var barcodeCell = slantSheet.Cells[1, slantStartCol + 1];
barcodeCell.Value = exportData.ProductionMeasurementRecord.ProductionBarcode;
SetTitleCell(barcodeCell);
@@ -770,10 +827,6 @@
var valueCell = slantSheet.Cells[2, slantStartCol + 1];
valueCell.Value = "Value";
SetTitleCell(valueCell);
-
- //var resultCell = slantSheet.Cells[2, slantStartCol + 2];
- //resultCell.Value = "Result";
- //SetTitleCell(resultCell);
slantMeasures.ForEach(m =>
{
@@ -918,6 +971,11 @@
#endregion
package.Save();
+
+ rawDataSheet.Dispose();
+ slantSheet.Dispose();
+ alignmentSheet.Dispose();
+ rowAlignmentSheet.Dispose();
};
}
});
@@ -1042,138 +1100,153 @@
private async void RunImageHandle(IOperationConfig opConfig, IImageSet imgSet, string snapshotId, string snapshotName, List<MeasurementUnit> measureList)
{
await Task.Run(() =>
- {
- var keys = Config.KeyUnitCollection.Where(u => u.IsEnabled && u.SnapshotPointId == snapshotId);
- var keyBindCollection = measureList.SelectMany(u => u.KeyUnitCollection).Where(u => keys.Any(k => k.Key == u.Key)).ToList();
+ {
+ var keys = Config.KeyUnitCollection.Where(u => u.IsEnabled && u.SnapshotPointId == snapshotId);
+ var keyBindCollection = measureList.SelectMany(u => u.KeyUnitCollection).Where(u => keys.Any(k => k.Key == u.Key)).ToList();
- string toolKey = (opConfig as CameraOprerationConfigBase).AlgorithemPath;
- //HObject images = imgSet.HImage;
+ string toolKey = (opConfig as CameraOprerationConfigBase).AlgorithemPath;
+ //HObject images = imgSet.HImage;
- HObject images = new HObject();
- LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
- LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{imgSet.ImageData}", "");
+ HObject images = new HObject();
+ LaserScanParam scanParam = JsonConvert.DeserializeObject<LaserScanParam>(imgSet.ImageData);
+ LogAsync(DateTime.Now, $"鎵弿鍙傛暟:{imgSet.ImageData}", "");
- if (!string.IsNullOrWhiteSpace(toolKey))
- {
- toolKey = snapshotId + "|" + toolKey;
- if (!_halconToolDict.ContainsKey(toolKey))
- {
- LogAsync(DateTime.Now, $"{snapshotName}鏈垵濮嬪寲鍙栧浘绠楁硶閰嶇疆", "");
- keyBindCollection.ForEach(k => k.FillKeyValues(null));
- return;
- }
+ if (!string.IsNullOrWhiteSpace(toolKey))
+ {
+ toolKey = snapshotId + "|" + toolKey;
+ if (!_halconToolDict.ContainsKey(toolKey))
+ {
+ LogAsync(DateTime.Now, $"{snapshotName}鏈垵濮嬪寲鍙栧浘绠楁硶閰嶇疆", "");
+ keyBindCollection.ForEach(k => k.FillKeyValues(null));
+ return;
+ }
- //string fileName = Path.Combine(Config.ImageSaveFolder, "BeforeRun", $"{DateTime.Now.ToString("yyyyMMddHHmmssfff")}.tif");
- //imgSet.HImage.WriteImage("tiff", 0, fileName);
+ //string fileName = Path.Combine(Config.ImageSaveFolder, "BeforeRun", $"{DateTime.Now.ToString("yyyyMMddHHmmssfff")}.tif");
+ //imgSet.HImage.WriteImage("tiff", 0, fileName);
- _halconToolDict[toolKey].InputImageDic["INPUT_Image"] = imgSet.HImage;
- if (!_halconToolDict[toolKey].RunProcedure(out string error))
- {
- LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶寮傚父锛寋error}", "");
- keyBindCollection.ForEach(k => k.FillKeyValues(null));
- return;
- }
+ if (imgSet.HImage == null)
+ {
+ LogAsync(DateTime.Now, $"{snapshotName}鍥剧墖涓虹┖瀵硅薄", "");
+ keyBindCollection.ForEach(k => k.FillKeyValues(null));
+ return;
+ }
- images = _halconToolDict[toolKey].GetResultObject("OUTPUT_Images");
- }
+ _halconToolDict[toolKey].InputImageDic["INPUT_Image"] = imgSet.HImage;
+ if (!_halconToolDict[toolKey].RunProcedure(out string error))
+ {
+ LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶寮傚父锛寋error}", "");
+ keyBindCollection.ForEach(k => k.FillKeyValues(null));
+ return;
+ }
- HOperatorSet.CountObj(images, out HTuple count);
- LogAsync(DateTime.Now, $"{snapshotName}鍒囧浘{count.I}寮�", "");
+ images = _halconToolDict[toolKey].GetResultObject("OUTPUT_Images");
+ }
- if (count == 0)
- {
- LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶鏈緭鍑哄浘鍍�", "");
- keyBindCollection.ForEach(k => k.FillKeyValues(null));
- return;
- }
+ HOperatorSet.CountObj(images, out HTuple count);
+ LogAsync(DateTime.Now, $"{snapshotName}鍒囧浘{count.I}寮�", "");
- var excludeKeys = keys.Where(u => u.ImageSeq > count.I).ToList();
- if (excludeKeys.Count > 0)
- {
- LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
- keyBindCollection.Where(k => excludeKeys.Any(u => u.Key == k.Key)).ToList().ForEach(k =>
- {
- k.FillKeyValues(null);
- });
- }
+ if (count == 0)
+ {
+ LogAsync(DateTime.Now, $"{snapshotName}鍙栧浘绠楁硶鏈緭鍑哄浘鍍�", "");
+ keyBindCollection.ForEach(k => k.FillKeyValues(null));
+ return;
+ }
- //string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{DateTime.Now.ToString("yyyyMMdd")}", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
- //if (!Directory.Exists(dir))
- //{
- // Directory.CreateDirectory(dir);
- //}
+ var excludeKeys = keys.Where(u => u.ImageSeq > count.I).ToList();
+ if (excludeKeys.Count > 0)
+ {
+ LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
+ keyBindCollection.Where(k => excludeKeys.Any(u => u.Key == k.Key)).ToList().ForEach(k =>
+ {
+ k.FillKeyValues(null);
+ });
+ }
- //Parallel.For(1, count.I + 1, (i) =>
- for (int i = 1; i <= count.I; i++)
- {
- HOperatorSet.SelectObj(images, out HObject image, i);
+ //string dir = Path.Combine(Config.ImageSaveFolder, "Clips", $"{DateTime.Now.ToString("yyyyMMdd")}", $"{snapshotName}_{DateTime.Now.ToString("HHmmss")}");
+ //if (!Directory.Exists(dir))
+ //{
+ // Directory.CreateDirectory(dir);
+ //}
- //string fileName = Path.Combine(dir, $"{i}.tif");
- //using (HImage temp = image.ConvertHObjectToHImage())
- //{
- // temp.WriteImage("tiff", 0, fileName);
- //}
+ //Parallel.For(1, count.I + 1, (i) =>
+ for (int i = 1; i <= count.I; i++)
+ {
+ HOperatorSet.SelectObj(images, out HObject image, i);
- keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
- {
- Dictionary<string, double> resultDict = null;
+ //string fileName = Path.Combine(dir, $"{i}.tif");
+ //using (HImage temp = image.ConvertHObjectToHImage())
+ //{
+ // temp.WriteImage("tiff", 0, fileName);
+ //}
- var keyBindList = keyBindCollection.Where(u => u.Key == k.Key).ToList();
+ keys.Where(u => u.ImageSeq == i).ToList().ForEach(k =>
+ {
+ Dictionary<string, double> resultDict = null;
- string keyToolKey = k.AliasName + "|" + k.KeyAlgorithemPath;
- if (!_halconToolDict.ContainsKey(keyToolKey))
- {
- LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
- }
- else
- {
- _halconToolDict[keyToolKey].InputImageDic["INPUT_Image"] = image;
- _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X / 1000000.0;
- _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z / 1000000.0;
- _halconToolDict[keyToolKey].InputTupleDic["INPUT_ImageId"] = $"{k.AliasName}_{DateTime.Now.ToString("HHmmssfff")}.tif";
- if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
- {
- LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
- }
- else
- {
- var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").DArr.ToList();
- if (results.Count == 0 || results.Any(u => u < 0))
- {
- LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁寮傚父", "");
- }
- else
- {
- //LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁", $"{string.Join(" ", results)}");
+ var keyBindList = keyBindCollection.Where(u => u.Key == k.Key).ToList();
- results = results.Select(u => u - Config.PlanCompensation).ToList();
- resultDict = k.KeyResultList.ToDictionary(u => u, u =>
- {
- int index = k.KeyResultList.IndexOf(u);
- return results[index];
- });
- }
- }
- }
+ string keyToolKey = k.AliasName + "|" + k.KeyAlgorithemPath;
+ if (!_halconToolDict.ContainsKey(keyToolKey))
+ {
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
+ }
+ else
+ {
+ _halconToolDict[keyToolKey].InputImageDic["INPUT_Image"] = image;
+ _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_X"] = scanParam.Resolution_X / 1000000.0;
+ _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Y"] = scanParam.Resolution_Y / 1000000.0;
+ _halconToolDict[keyToolKey].InputTupleDic["INPUT_Resolution_Z"] = scanParam.Resolution_Z / 1000000.0;
+ _halconToolDict[keyToolKey].InputTupleDic["INPUT_ImageId"] = $"{k.AliasName}_{DateTime.Now.ToString("HHmmssfff")}.tif";
+ if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
+ {
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
+ }
+ else
+ {
+ var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").DArr.ToList();
+ if (results.Count == 0 || results.Any(u => u < 0))
+ {
+ LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁寮傚父", "");
+ }
+ else
+ {
+ //LogAsync(DateTime.Now, $"{k.AliasName}鍘熷鏁版嵁", $"{string.Join(" ", results)}");
- keyBindList.ForEach(kb =>
- {
- kb.KeyImages.Add(image.ConvertHObjectToHImage());
- kb.FillKeyValues(resultDict);
- });
- });
+ results = results.Select(u => u - Config.PlanCompensation).ToList();
+ resultDict = k.KeyResultList.ToDictionary(u => u, u =>
+ {
+ int index = k.KeyResultList.IndexOf(u);
+ return results[index];
+ });
+ }
+ }
+ }
- image.Dispose();
- }
- //);
+ keyBindList.ForEach(kb =>
+ {
+ kb.KeyImages.Add(image.ConvertHObjectToHImage());
+ kb.FillKeyValues(resultDict);
+ });
+ });
- images.Dispose();
- //if (count.I != 1)
- //{
- // hImage?.Dispose();
- // hImage = null;
- //}
- });
+ image.Dispose();
+ image = null;
+ }
+ //);
+
+ imgSet.HImage.Dispose();
+ imgSet.HImage = null;
+ imgSet.Dispose();
+
+ images.Dispose();
+ images = null;
+
+ //if (count.I != 1)
+ //{
+ // hImage?.Dispose();
+ // hImage = null;
+ //}
+ });
}
#endregion
}
--
Gitblit v1.8.0