From 34dc84bb5a3b5de99592299ced73663c8508c42f Mon Sep 17 00:00:00 2001
From: TG <905865530@qq.com>
Date: Tue, 18 Jun 2024 10:47:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=E5=9B=BE=E7=89=87=E6=95=B0=E6=8D=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=BARGB=E6=97=B6=E7=9A=84=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                    | 1 +
 20240529RGBtest3/classifer.py | 2 ++
 20240529RGBtest3/main.py      | 4 ++--
 20240529RGBtest3/utils.py     | 4 ----
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18249b7..d698033 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,4 @@ fabric.properties
 !/20240410RGBtest1/super-tomato/defect_big.bmp
 !/20240410RGBtest1/super-tomato/defect_mask.bmp
 !/20240410RGBtest1/super-tomato/prediction.png
+/20240529RGBtest3/data/
diff --git a/20240529RGBtest3/classifer.py b/20240529RGBtest3/classifer.py
index eb5e656..1eb0f64 100644
--- a/20240529RGBtest3/classifer.py
+++ b/20240529RGBtest3/classifer.py
@@ -495,6 +495,7 @@ class Data_processing:
         # 设置 S-L 通道阈值并处理图像
         threshold_s_l = 180
         threshold_fore_g_r_t = 20
+        img = cv2.cvtColor(img,cv2.COLOR_RGB2BGR)
         s_l = tomato.extract_s_l(img)
         thresholded_s_l = tomato.threshold_segmentation(s_l, threshold_s_l)
         new_bin_img = tomato.largest_connected_component(thresholded_s_l)
@@ -526,6 +527,7 @@ class Data_processing:
         # 创建PassionFruit类的实例
         pf = Passion_fruit(hue_value=hue_value, hue_delta=hue_delta, value_target=value_target, value_delta=value_delta)
 
+        img = cv2.cvtColor(img,cv2.COLOR_RGB2BGR)
         hsv_image = cv2.cvtColor(img, cv2.COLOR_BGR2HSV)
         combined_mask = pf.create_mask(hsv_image)
         combined_mask = pf.apply_morphology(combined_mask)
diff --git a/20240529RGBtest3/main.py b/20240529RGBtest3/main.py
index f76ec83..fe7d28f 100644
--- a/20240529RGBtest3/main.py
+++ b/20240529RGBtest3/main.py
@@ -87,8 +87,8 @@ def main(is_debug=False):
     dp = Data_processing()
 
     _ = detector.predict(np.ones((30, 30, 224), dtype=np.uint16))
-    _, _, _, _, _ =dp.analyze_tomato(cv2.imread(r'D:\project\supermachine--tomato-passion_fruit\20240529RGBtest3\data\tomato_img\bad\71.bmp'))
-    _, _, _, _, _ = dp.analyze_passion_fruit(cv2.imread(r'D:\project\supermachine--tomato-passion_fruit\20240529RGBtest3\data\passion_fruit_img\38.bmp'))
+    # _, _, _, _, _ =dp.analyze_tomato(cv2.imread(r'D:\project\supermachine--tomato-passion_fruit\20240529RGBtest3\data\tomato_img\bad\71.bmp'))
+    # _, _, _, _, _ = dp.analyze_passion_fruit(cv2.imread(r'D:\project\supermachine--tomato-passion_fruit\20240529RGBtest3\data\passion_fruit_img\38.bmp'))
     print('初始化完成')
 
     rgb_receive_name = r'\\.\pipe\rgb_receive'
diff --git a/20240529RGBtest3/utils.py b/20240529RGBtest3/utils.py
index 97f63ae..a682376 100644
--- a/20240529RGBtest3/utils.py
+++ b/20240529RGBtest3/utils.py
@@ -6,11 +6,7 @@
 
 
 import shutil
-
 import os
-
-
-
 import win32file
 import win32pipe
 import time