Skip to content

Commit bd7bd31

Browse files
committed
I04_1-150: minor refactor
1 parent 062cda8 commit bd7bd31

File tree

1 file changed

+24
-19
lines changed

1 file changed

+24
-19
lines changed

dls_barcode/gui/main_window.py

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -192,27 +192,32 @@ def _camera_capture_alive(self):
192192
return self._camera_scanner is not None and self._camera_switch is not None
193193

194194
def _read_view_queue(self):
195-
if not self._view_queue.empty():
196-
try:
197-
image = self._view_queue.get(False)
198-
self._image_frame.display_puck_image(image)
199-
except queue.Empty:
200-
pass
195+
if self._view_queue.empty():
196+
return
197+
198+
try:
199+
image = self._view_queue.get(False)
200+
self._image_frame.display_puck_image(image)
201+
except queue.Empty:
202+
pass
201203

202204
def _read_message_queue(self):
203-
if not self._message_queue.empty():
204-
try:
205-
scanner_msg = self._message_queue.get(False)
206-
if self._camera_switch.is_side() and isinstance(scanner_msg, NoNewBarcodeMessage):
207-
if not self._test_timer_is_running():
208-
self._start_test_timer()
209-
elif self._has_test_timer_timeout():
210-
self._message_box.display(MessageFactory.duplicate_barcode_message())
211-
else:
212-
self._reset_test_timer()
213-
self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
214-
except queue.Empty:
215-
return
205+
if self._message_queue.empty():
206+
return
207+
208+
try:
209+
scanner_msg = self._message_queue.get(False)
210+
if self._camera_switch.is_side() and isinstance(scanner_msg, NoNewBarcodeMessage):
211+
if not self._test_timer_is_running():
212+
# The result queue is read at a slower rate - give it time to process a new barcode
213+
self._start_test_timer()
214+
elif self._has_test_timer_timeout():
215+
self._message_box.display(MessageFactory.duplicate_barcode_message())
216+
else:
217+
self._reset_test_timer()
218+
self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
219+
except queue.Empty:
220+
return
216221

217222
def _reset_test_timer(self):
218223
self._test_timer = None

0 commit comments

Comments
 (0)