Skip to content

Commit ee84e3f

Browse files
committed
add more logs
1 parent b72b419 commit ee84e3f

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

dls_barcode/gui/main_window.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from dls_barcode.camera.scanner_message import ScanErrorMessage
12
from dls_barcode.frame_grabber_controller import FrameGrabberController
23
from dls_util.beeper import Beeper
34

@@ -46,7 +47,8 @@ def __init__(self, config, version, flags, *args, **kwargs):
4647

4748
self._frame_grabber_controller = FrameGrabberController(config, self.displayPuckScanCompleteMessage,
4849
self.displayScanTimeoutMessage, self.is_latest_holder_barcode,
49-
self.startCountdown, self.addRecordFrame, self.clear_frame, self.scanCompleted)
50+
self.startCountdown, self.addRecordFrame, self.clear_frame, self.scanCompleted,
51+
self.displayScanErrorMessage)
5052

5153

5254
def _init_ui(self):
@@ -138,13 +140,14 @@ def _on_about_action_clicked(self):
138140
QtWidgets.QMessageBox.about(self, 'About', "Version: " + self._version)
139141

140142
def _on_scan_action_clicked(self):
141-
self._log.debug("MAIN: Scan menu clicked")
143+
self._log.debug("Scan menu clicked")
142144
if self._scan_button.is_running():
143145
self._stop_frame_grabber()
144146
else:
145147
self._start_frame_grabber()
146148

147149
def _on_options_action_clicked(self):
150+
self._log.debug("Options menu clicked")
148151
self._frame_grabber_controller.kill_grabber_thread()
149152
dialog = BarcodeConfigDialog(self._config)
150153
self._stop_frame_grabber()
@@ -157,6 +160,7 @@ def closeEvent(self, event):
157160
event.accept()
158161

159162
def displayCameraErrorMessage(self):
163+
self._log.debug("Camera Error")
160164
message_box = QMessageBox(self)
161165
message_box.setIcon(QMessageBox.Critical)
162166
message_box.setWindowTitle("Camera Error")
@@ -173,6 +177,7 @@ def displayCameraErrorMessage(self):
173177

174178
def displayPuckScanCompleteMessage(self):
175179
self._message_box.display(MessageFactory.puck_scan_completed_message())
180+
self._log.debug("Puck scan complete")
176181

177182
def clear_frame(self):
178183
self._result_frame.clear_frame()
@@ -181,6 +186,7 @@ def displayScanTimeoutMessage(self):
181186
if self._config.get_scan_beep():
182187
Beeper.beep()
183188
self._message_box.display(MessageFactory.scan_timeout_message())
189+
self._log.debug("Scan timeout")
184190

185191
@pyqtSlot(Frame)
186192
def displayPuckFrame(self, frame):
@@ -195,6 +201,7 @@ def displayHolderFrame(self, frame):
195201
self._holder_frame.display_image(frame.frame_to_image())
196202

197203
def _load_store_records(self):
204+
self._log.debug("Stored records loaded")
198205
self._record_table._load_store_records()
199206

200207
def addRecordFrame(self, top_result, side_result):
@@ -206,12 +213,14 @@ def addRecordFrame(self, top_result, side_result):
206213
self._plate_beep(plate, self._config.get_scan_beep())
207214

208215
def startCountdown(self, duration):
216+
self._log.debug("Countdown started")
209217
self._countdown_box.start_countdown(duration)
210218

211219
def resetCountdown(self):
212220
self._countdown_box.reset_countdown()
213221

214222
def scanCompleted(self):
223+
self._log.debug("Countdown completed")
215224
self._countdown_box.scan_completed()
216225

217226
def is_latest_holder_barcode(self, result_barcode):
@@ -226,10 +235,12 @@ def _plate_beep(self, plate, do_beep):
226235
duration = 200
227236
Beeper.beep(frequency, duration)
228237

229-
#@pyqtSlot(ScanErrorMessage)
238+
@pyqtSlot(ScanErrorMessage)
230239
#def displayScanErrorMessage(self, scanner_msg):
231-
# self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
240+
#self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
241+
#self._log.debug("Scan Error message", scanner_msg.content())
232242

233-
#@pyqtSlot(ScanErrorMessage)
243+
#pyqtSlot(ScanErrorMessage)
234244
#def clear_frame_display_message(self, scanner_msg):
235245
# self._result_frame.clear_frame_and_set_text(scanner_msg.content())
246+

0 commit comments

Comments
 (0)