From 1f62ba2e4e30bd4a45ddbec2a844cd0d62c97934 Mon Sep 17 00:00:00 2001 From: "li.zhenye" Date: Tue, 9 Aug 2022 16:35:51 +0800 Subject: [PATCH] =?UTF-8?q?[ext]=20=E6=9B=B4=E6=8D=A2=E4=BA=86=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84=E4=BC=A0=E9=80=81?= =?UTF-8?q?=E5=B8=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 2 +- efficient_ui.py | 4 ++-- transmit.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config.py b/config.py index e8fcfd9..e03fadc 100644 --- a/config.py +++ b/config.py @@ -26,7 +26,7 @@ class Config: # rgb模型参数 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_s = 190 rgb_size_threshold = 4 diff --git a/efficient_ui.py b/efficient_ui.py index e770f51..c112137 100644 --- a/efficient_ui.py +++ b/efficient_ui.py @@ -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) # 指令执行与图像流向控制 # 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, 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) # 启动所有线程 diff --git a/transmit.py b/transmit.py index a118a1a..17e91e4 100644 --- a/transmit.py +++ b/transmit.py @@ -295,7 +295,7 @@ class ThreadDetector(Transmitter): class ProcessDetector(Transmitter): - def __init__(self, input_queue: Queue, output_queue: Queue): + def __init__(self, input_queue: ImgQueue, output_queue: ImgQueue): super().__init__() self._input_queue, self._output_queue = input_queue, output_queue self._spec_detector = SpecDetector(blk_model_path=Config.blk_model_path, @@ -305,7 +305,7 @@ class ProcessDetector(Transmitter): self._predict_thread = None self._thread_exit = threading.Event() - def set_source(self, img_queue: Queue): + def set_source(self, img_queue: ImgQueue): self._input_queue = img_queue def stop(self, *args, **kwargs):