mirror of
https://github.com/NanjingForestryUniversity/supermachine--tomato-passion_fruit.git
synced 2025-11-08 22:34:00 +00:00
fix:修复了一些小问题,添加传输图片数据格式为RGB时的转换代码
This commit is contained in:
parent
5d6d53c95d
commit
34dc84bb5a
1
.gitignore
vendored
1
.gitignore
vendored
@ -89,3 +89,4 @@ fabric.properties
|
|||||||
!/20240410RGBtest1/super-tomato/defect_big.bmp
|
!/20240410RGBtest1/super-tomato/defect_big.bmp
|
||||||
!/20240410RGBtest1/super-tomato/defect_mask.bmp
|
!/20240410RGBtest1/super-tomato/defect_mask.bmp
|
||||||
!/20240410RGBtest1/super-tomato/prediction.png
|
!/20240410RGBtest1/super-tomato/prediction.png
|
||||||
|
/20240529RGBtest3/data/
|
||||||
|
|||||||
@ -495,6 +495,7 @@ class Data_processing:
|
|||||||
# 设置 S-L 通道阈值并处理图像
|
# 设置 S-L 通道阈值并处理图像
|
||||||
threshold_s_l = 180
|
threshold_s_l = 180
|
||||||
threshold_fore_g_r_t = 20
|
threshold_fore_g_r_t = 20
|
||||||
|
img = cv2.cvtColor(img,cv2.COLOR_RGB2BGR)
|
||||||
s_l = tomato.extract_s_l(img)
|
s_l = tomato.extract_s_l(img)
|
||||||
thresholded_s_l = tomato.threshold_segmentation(s_l, threshold_s_l)
|
thresholded_s_l = tomato.threshold_segmentation(s_l, threshold_s_l)
|
||||||
new_bin_img = tomato.largest_connected_component(thresholded_s_l)
|
new_bin_img = tomato.largest_connected_component(thresholded_s_l)
|
||||||
@ -526,6 +527,7 @@ class Data_processing:
|
|||||||
# 创建PassionFruit类的实例
|
# 创建PassionFruit类的实例
|
||||||
pf = Passion_fruit(hue_value=hue_value, hue_delta=hue_delta, value_target=value_target, value_delta=value_delta)
|
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)
|
hsv_image = cv2.cvtColor(img, cv2.COLOR_BGR2HSV)
|
||||||
combined_mask = pf.create_mask(hsv_image)
|
combined_mask = pf.create_mask(hsv_image)
|
||||||
combined_mask = pf.apply_morphology(combined_mask)
|
combined_mask = pf.apply_morphology(combined_mask)
|
||||||
|
|||||||
@ -87,8 +87,8 @@ def main(is_debug=False):
|
|||||||
dp = Data_processing()
|
dp = Data_processing()
|
||||||
|
|
||||||
_ = detector.predict(np.ones((30, 30, 224), dtype=np.uint16))
|
_ = 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_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_passion_fruit(cv2.imread(r'D:\project\supermachine--tomato-passion_fruit\20240529RGBtest3\data\passion_fruit_img\38.bmp'))
|
||||||
print('初始化完成')
|
print('初始化完成')
|
||||||
|
|
||||||
rgb_receive_name = r'\\.\pipe\rgb_receive'
|
rgb_receive_name = r'\\.\pipe\rgb_receive'
|
||||||
|
|||||||
@ -6,11 +6,7 @@
|
|||||||
|
|
||||||
|
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import win32file
|
import win32file
|
||||||
import win32pipe
|
import win32pipe
|
||||||
import time
|
import time
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user