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_Calibration.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Bro.Process/ProcessControl_Calibration.cs b/src/Bro.Process/ProcessControl_Calibration.cs
index 9463056..1d7a0e4 100644
--- a/src/Bro.Process/ProcessControl_Calibration.cs
+++ b/src/Bro.Process/ProcessControl_Calibration.cs
@@ -107,7 +107,12 @@
         {
             //string imgSetId = "";
             List<IShapeElement> pointList = new List<IShapeElement>();
-            using (HObject hImage = CollectHImage(camera, config.CameraOpConfig, out string imgSetId))
+
+            IImageSet set = CollectHImage(camera, config.CameraOpConfig);
+            if (set == null)
+                return;
+
+            using (HObject hImage = set.HImage)
             {
                 var tool = GetHalconTool(config.CameraOpConfig);
 
@@ -125,7 +130,7 @@
                     pointList.Add(new PointIndicator((float)xList[i], (float)yList[i]));
                 }
 
-                camera.SaveFitImage(pointList, imgSetId);
+                camera.SaveFitImage(pointList, set.Id);
             }
 
             config.Results[sequence - 1].ImageMarkPoint = new CustomizedPoint((pointList[0] as PointIndicator).Center);

--
Gitblit v1.8.0