From 68a4b459eeb18effb8b3096add3d88c15629ab69 Mon Sep 17 00:00:00 2001
From: C3032 <1057644574@qq.com>
Date: 星期一, 23 三月 2026 11:01:16 +0800
Subject: [PATCH] 修复了 master 分支中的编译错误

---
 LB_VisionProcesses/Alogrithms/BaseAlgorithm/TAlgorithm.cs |  106 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TAlgorithm.cs b/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TAlgorithm.cs
index 79f6ebe..dd8e2e6 100644
--- a/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TAlgorithm.cs
+++ b/LB_VisionProcesses/Alogrithms/BaseAlgorithm/TAlgorithm.cs
@@ -3836,57 +3836,89 @@
         /// 鍥惧儚澧炲己绠楁硶-杈圭紭澧炲己
         /// </summary>
         /// <param name="ho_Image">寰呮祴鍥剧墖</param>
+        /// <param name="hv_ImageEnhancementType">婊ゆ尝鍣ㄧ被鍨�(mean/gauss/median)</param>
         /// <param name="hv_Wid">鎺╄啘瀹�</param>
         /// <param name="hv_High">鎺╄啘楂�</param>
         /// <param name="hv_Fac">澧炲己鍥犲瓙</param>
-        /// <param name="hv_Row1">璧峰绾靛潗鏍�</param>
-        /// <param name="hv_Column1">璧峰妯潗鏍�</param>
-        /// <param name="hv_Row2">缁撴潫绾靛潗鏍�</param>
-        /// <param name="hv_Column2">缁撴潫妯潗鏍�</param>
-        public static void ImageEnhancement(HObject ho_Image, out HObject ho_OutImage, HTuple hv_ImageEnhancementType, HTuple hv_Wid, HTuple hv_High, HTuple hv_Fac)
+
+        public static void ImageEnhancement(HObject ho_Image, out HObject ho_OutImage, string hv_ImageEnhancementType, int hv_Wid, int hv_High, double hv_Fac)
         {
             HOperatorSet.GenEmptyObj(out ho_OutImage);
+            
             try
             {
-                HTuple hv_ImageEnhancementTypeOut = new HTuple();
-                hv_ImageEnhancementTypeOut.Dispose();
-                hv_ImageEnhancementTypeOut = new HTuple(hv_ImageEnhancementType);
+                // 鏍规嵁婊ゆ尝鍣ㄧ被鍨嬫墽琛岀浉搴旀搷浣�
+                switch (hv_ImageEnhancementType.ToLower())
+                {
+                    case "emphasize":
+                        HOperatorSet.Emphasize(ho_Image, out ho_OutImage, hv_Wid, hv_High, hv_Fac);
+                        break;
 
-                hv_Wid.Dispose();
-                hv_High.Dispose();
-                ho_OutImage.Dispose();
+                    case "scaleimagemax":  
+                        HOperatorSet.ScaleImageMax(ho_Image, out ho_OutImage);
+                        break;
 
-                //璁剧疆鍥惧儚澧炲己绠楁硶
-                if ((int)(new HTuple(hv_ImageEnhancementTypeOut.TupleEqual("emphasize"))) != 0)
-                {
-                    hv_ImageEnhancementTypeOut.Dispose();
-                    hv_ImageEnhancementTypeOut = "emphasize";
-                    HOperatorSet.Emphasize(ho_Image, out ho_OutImage, hv_Wid, hv_High, hv_Fac);
+                    case "equhisto":
+                        HOperatorSet.EquHistoImage(ho_Image, out ho_OutImage);
+                        break;
+
+                    default:
+                        throw new ArgumentException($"涓嶆敮鎸佺殑婊ゆ尝鍣ㄧ被鍨�: {hv_ImageEnhancementType}");
                 }
-                else if ((int)(new HTuple(hv_ImageEnhancementTypeOut.TupleEqual("equHisto"))) != 0)
-                {
-                    hv_ImageEnhancementTypeOut.Dispose();
-                    hv_ImageEnhancementTypeOut = "equHisto";
-                    HOperatorSet.ScaleImageMax(ho_Image, out ho_OutImage);
-                }
-                else
-                {
-                    hv_ImageEnhancementTypeOut.Dispose();
-                    hv_ImageEnhancementTypeOut = "scaleMax";
-                    HOperatorSet.EquHistoImage(ho_Image, out ho_OutImage);
-                }
-                return;
             }
-            catch (HalconException HDevExpDefaultException)
+            catch (Exception ex)
             {
-
-                hv_Wid.Dispose();
-                hv_High.Dispose();
-
-                throw HDevExpDefaultException;
+                // 纭繚寮傚父鏃堕噴鏀捐祫婧�
+                ho_OutImage?.Dispose();
+                throw new Exception($"鍥惧儚婊ゆ尝澶辫触: {ex.Message}", ex);
             }
         }
-       
+
+        /// <summary>
+        /// 鍥惧儚婊ゆ尝
+        /// </summary>
+        /// <param name="ho_Image">寰呮祴鍥剧墖</param>
+        /// <param name="ho_OutImage">杈撳嚭鍥剧墖</param>
+        /// <param name="hv_FilterType">婊ゆ尝鍣ㄧ被鍨�(mean/gauss/median)</param>
+        /// <param name="hv_Wid">鎺╄啘瀹�</param>
+        /// <param name="hv_High">鎺╄啘楂�</param>
+        /// <param name="hv_Size">楂樻柉鏍稿昂瀵�</param>
+        public static void Filter(HObject ho_Image, out HObject ho_OutImage, string hv_FilterType, int hv_Wid, int hv_High, int hv_Size)
+        {
+            // 鍒濆鍖栬緭鍑哄璞�
+            HOperatorSet.GenEmptyObj(out ho_OutImage);
+
+            try
+            {
+                // 鏍规嵁婊ゆ尝鍣ㄧ被鍨嬫墽琛岀浉搴旀搷浣�
+                switch (hv_FilterType.ToLower())
+                {
+                    case "mean":
+                        HOperatorSet.MeanImage(ho_Image, out ho_OutImage, hv_Wid, hv_High);
+                        break;
+
+                    case "gauss":
+                    case "guass":  // 鍏煎鎷煎啓閿欒
+                        HOperatorSet.GaussFilter(ho_Image, out ho_OutImage, hv_Size);
+                        break;
+
+                    case "median":
+                        HOperatorSet.MedianRect(ho_Image, out ho_OutImage, hv_Wid, hv_High);
+                        break;
+
+                    default:
+                        throw new ArgumentException($"涓嶆敮鎸佺殑婊ゆ尝鍣ㄧ被鍨�: {hv_FilterType}");
+                }
+            }
+            catch (Exception ex)
+            {
+                // 纭繚寮傚父鏃堕噴鏀捐祫婧�
+                ho_OutImage?.Dispose();
+                throw new Exception($"鍥惧儚婊ゆ尝澶辫触: {ex.Message}", ex);
+            }
+        }
+
+
         /// <summary>
         /// 鍗″昂绠楁硶
         /// </summary>

--
Gitblit v1.9.3