From 773369500892dcb5347e4a0059f8089960073030 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 15 七月 2020 22:08:34 +0800
Subject: [PATCH] 板卡回原点配置迁移到初始配置轴配置中 板卡回原点配置区分运动方向和捕捉方向,限制捕捉原点方向

---
 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