From c6d544334cd480352c452a0d3e9c9c4ce6869a1b Mon Sep 17 00:00:00 2001
From: "li.zhenye"
Date: Tue, 23 Aug 2022 10:44:36 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BC=98=E5=8C=96transmit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tests/test_transmit.py | 2 +-
transmit.py | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tests/test_transmit.py b/tests/test_transmit.py
index 5e4c414..fb79e0a 100644
--- a/tests/test_transmit.py
+++ b/tests/test_transmit.py
@@ -35,7 +35,7 @@ class TransmitterTest(unittest.TestCase):
logging.info('测试子进程文件接收器')
image_queue = multiprocessing.Queue()
file_receiver = FileReceiver(job_name='rgb img receive', input_dir='../data', output_queue=image_queue,
- speed=0.5, name_pattern=None, run_process=True)
+ speed=1, name_pattern=None, run_process=True)
virtual_data = np.random.randint(0, 255, (1024, 4096, 3), dtype=np.uint8)
file_receiver.start(need_time=True, virtual_data=virtual_data)
for i in range(5):
diff --git a/transmit.py b/transmit.py
index 9430d8f..40da713 100644
--- a/transmit.py
+++ b/transmit.py
@@ -141,7 +141,7 @@ class BeforeAfterMethods:
class FileReceiver(Transmitter):
- def __init__(self, input_dir: str, output_queue: ImgQueue, speed: float = 3.0, name_pattern: str = None,
+ def __init__(self, input_dir: str, output_queue, speed: float = 3.0, name_pattern: str = None,
job_name: str = 'file_receiver', run_process: bool = False):
super(FileReceiver, self).__init__(job_name=job_name, run_process=run_process)
self.input_dir = input_dir
@@ -164,8 +164,6 @@ class FileReceiver(Transmitter):
file_names = [file_name for file_name in file_names if (self.name_pattern in file_name)]
else:
file_names = file_names
-
- # with self._io_lock:
self.file_names = file_names
self.file_idx = 0
@@ -176,7 +174,7 @@ class FileReceiver(Transmitter):
@Transmitter.job_decorator
def job_func(self, need_time=False, *args, **kwargs):
"""
- 发送文件
+ 发送文件.
:param need_time: 是否需要发送时间戳
:param kwargs: output_queue: 以进程模式运行时需要, virtual_data: 虚拟的数据,用于测试