Skip to content

Commit 2da87fc

Browse files
committed
I04_1-150: minor, refactor
1 parent fd2eb73 commit 2da87fc

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

dls_barcode/gui/main_window.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,28 +197,30 @@ def _read_view_queue(self):
197197

198198
try:
199199
image = self._view_queue.get(False)
200-
self._image_frame.display_puck_image(image)
201200
except queue.Empty:
202-
pass
201+
return
202+
203+
self._image_frame.display_puck_image(image)
203204

204205
def _read_message_queue(self):
205206
if self._message_queue.empty():
206207
return
207208

208209
try:
209210
scanner_msg = self._message_queue.get(False)
210-
if self._camera_switch.is_side() and isinstance(scanner_msg, NoNewBarcodeMessage):
211-
if not self._msg_timer_is_running():
212-
# The result queue is read at a slower rate - use a timer to give it time to process a new barcode
213-
self._start_msg_timer()
214-
elif self._has_msg_timer_timeout():
215-
self._message_box.display(MessageFactory.duplicate_barcode_message())
216-
else:
217-
self._reset_msg_timer()
218-
self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
219211
except queue.Empty:
220212
return
221213

214+
if self._camera_switch.is_side() and isinstance(scanner_msg, NoNewBarcodeMessage):
215+
if not self._msg_timer_is_running():
216+
# The result queue is read at a slower rate - use a timer to give it time to process a new barcode
217+
self._start_msg_timer()
218+
elif self._has_msg_timer_timeout():
219+
self._message_box.display(MessageFactory.duplicate_barcode_message())
220+
else:
221+
self._reset_msg_timer()
222+
self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
223+
222224
def _reset_msg_timer(self):
223225
self._duplicate_msg_timer = None
224226

0 commit comments

Comments
 (0)