NanjingForestryUniversity/supermachine-tobacco
3
0
Fork 0
mirror of https://github.com/NanjingForestryUniversity/supermachine-tobacco.git synced 2025-11-08 06:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ext] 更换了模型适配新的传送带

Browse Source
This commit is contained in:
li.zhenye 2022-08-09 16:35:51 +08:00
parent 96085c3c49
commit 1f62ba2e4e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@ -26,7 +26,7 @@ class Config:
# rgb模型参数 # rgb模型参数
rgb_tobacco_model_path = r"models/tobacco_dt_2022-08-05_10-38.model" rgb_tobacco_model_path = r"models/tobacco_dt_2022-08-05_10-38.model"
rgb_background_model_path = r"models/background_dt_2022-08-05_10-41.model" rgb_background_model_path = r"models/background_dt_2022-08-09_16-08.model"
threshold_low, threshold_high = 10, 230 threshold_low, threshold_high = 10, 230
threshold_s = 190 threshold_s = 190
rgb_size_threshold = 4 rgb_size_threshold = 4

4
efficient_ui.py
View File

@ -24,11 +24,11 @@ class EfficientUI(object):
rgb_receiver = transmit.FifoReceiver(fifo_path=rgb_fifo_path, output=rgb_img_queue, read_max_num=rgb_len) rgb_receiver = transmit.FifoReceiver(fifo_path=rgb_fifo_path, output=rgb_img_queue, read_max_num=rgb_len)
# 指令执行与图像流向控制 # 指令执行与图像流向控制
# subscribers = {'detector': detector_queue, 'visualize': self.visual_queue, 'save': save_queue} # subscribers = {'detector': detector_queue, 'visualize': self.visual_queue, 'save': save_queue}
subscribers = {"detector": detector_queue} subscribers = {"detector": detector_queue, 'save': save_queue, 'visualize': self.visual_queue}
cmd_img_controller = transmit.CmdImgSplitMidware(rgb_queue=rgb_img_queue, spec_queue=spec_img_queue, cmd_img_controller = transmit.CmdImgSplitMidware(rgb_queue=rgb_img_queue, spec_queue=spec_img_queue,
subscribers=subscribers) subscribers=subscribers)
# 探测器 # 探测器
detector = transmit.ThreadDetector(input_queue=detector_queue, output_queue=mask_queue) detector = transmit.ProcessDetector(input_queue=detector_queue, output_queue=mask_queue)
# 发送 # 发送
sender = transmit.FifoSender(output_fifo_path=mask_fifo_path, source=mask_queue) sender = transmit.FifoSender(output_fifo_path=mask_fifo_path, source=mask_queue)
# 启动所有线程 # 启动所有线程

4
transmit.py
View File

@ -295,7 +295,7 @@ class ThreadDetector(Transmitter):
class ProcessDetector(Transmitter): class ProcessDetector(Transmitter):
def __init__(self, input_queue: Queue, output_queue: Queue): def __init__(self, input_queue: ImgQueue, output_queue: ImgQueue):
super().__init__() super().__init__()
self._input_queue, self._output_queue = input_queue, output_queue self._input_queue, self._output_queue = input_queue, output_queue
self._spec_detector = SpecDetector(blk_model_path=Config.blk_model_path, self._spec_detector = SpecDetector(blk_model_path=Config.blk_model_path,
@ -305,7 +305,7 @@ class ProcessDetector(Transmitter):
self._predict_thread = None self._predict_thread = None
self._thread_exit = threading.Event() self._thread_exit = threading.Event()
def set_source(self, img_queue: Queue): def set_source(self, img_queue: ImgQueue):
self._input_queue = img_queue self._input_queue = img_queue
def stop(self, *args, **kwargs): def stop(self, *args, **kwargs):