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

[fix] 优化transmit

Browse Source
This commit is contained in:
li.zhenye 2022-08-23 10:44:36 +08:00
parent bbdfe9b679
commit c6d544334c
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_transmit.py
View File

@ -35,7 +35,7 @@ class TransmitterTest(unittest.TestCase):
logging.info('测试子进程文件接收器') logging.info('测试子进程文件接收器')
image_queue = multiprocessing.Queue() image_queue = multiprocessing.Queue()
file_receiver = FileReceiver(job_name='rgb img receive', input_dir='../data', output_queue=image_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) virtual_data = np.random.randint(0, 255, (1024, 4096, 3), dtype=np.uint8)
file_receiver.start(need_time=True, virtual_data=virtual_data) file_receiver.start(need_time=True, virtual_data=virtual_data)
for i in range(5): for i in range(5):

6
transmit.py
View File

@ -141,7 +141,7 @@ class BeforeAfterMethods:
class FileReceiver(Transmitter): 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): job_name: str = 'file_receiver', run_process: bool = False):
super(FileReceiver, self).__init__(job_name=job_name, run_process=run_process) super(FileReceiver, self).__init__(job_name=job_name, run_process=run_process)
self.input_dir = input_dir 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)] file_names = [file_name for file_name in file_names if (self.name_pattern in file_name)]
else: else:
file_names = file_names file_names = file_names
# with self._io_lock:
self.file_names = file_names self.file_names = file_names
self.file_idx = 0 self.file_idx = 0
@ -176,7 +174,7 @@ class FileReceiver(Transmitter):
@Transmitter.job_decorator @Transmitter.job_decorator
def job_func(self, need_time=False, *args, **kwargs): def job_func(self, need_time=False, *args, **kwargs):
""" """
发送文件 发送文件.
:param need_time: 是否需要发送时间戳 :param need_time: 是否需要发送时间戳
:param kwargs: output_queue: 以进程模式运行时需要, virtual_data: 虚拟的数据，用于测试 :param kwargs: output_queue: 以进程模式运行时需要, virtual_data: 虚拟的数据，用于测试