From 6f92829951f3ec228b18df8c157239573edd9cb4 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 09 九月 2020 15:20:53 +0800
Subject: [PATCH] 1. 取消ImageSet中的HImage释放动作,转移到业务流程中 2. 拆分板卡的IO监听和轴状态,轴位置监听

---
 src/Bro.Common.Device/DeviceBase/HDevEngineTool.cs |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/Bro.Common.Device/DeviceBase/HDevEngineTool.cs b/src/Bro.Common.Device/DeviceBase/HDevEngineTool.cs
index c235581..ceb3068 100644
--- a/src/Bro.Common.Device/DeviceBase/HDevEngineTool.cs
+++ b/src/Bro.Common.Device/DeviceBase/HDevEngineTool.cs
@@ -136,9 +136,15 @@
             catch (HDevEngineException ex)
             {
                 IsSuccessful = false;
+                errorMsg = $"HDevProgram {ex.ProcedureName} Run fail , Line number: {ex.LineNumber}, Halcon error number : {ex.HalconError},ex:{ex.Message}";
+                return false;
+            }
+            catch (Exception ex)
+            {
+                IsSuccessful = false;
                 //Trace.TraceInformation("HDevProgram {0} Run fail , Line number: {1}, Halcon error number : {2},ex:{3}", ex.ProcedureName, ex.LineNumber, ex.HalconError, ex.Message);
                 //return;
-                errorMsg = $"HDevProgram {ex.ProcedureName} Run fail , Line number: {ex.LineNumber}, Halcon error number : {ex.HalconError},ex:{ex.Message}";
+                errorMsg = $"{ex.Message}";
                 return false;
             }
         }
@@ -250,10 +256,21 @@
 
             for (int i = 0; i < tuple.Length; i++)
             {
-                list.Add(tuple[i]);
+                list.Add(tuple[i].D);
             }
 
             return list;
         }
+
+        public static HImage ConvertHObjectToHImage(this HObject obj)
+        {
+            HTuple pointer, type, width, heght;
+            HOperatorSet.GetImagePointer1(obj, out pointer, out type, out width, out heght);
+
+            HImage img = new HImage();
+            img.GenImage1(type, width, heght, pointer);
+
+            return img;
+        }
     }
 }

--
Gitblit v1.8.0