From f88ce1e4221e34447deddb26ec826f2ab68606ac Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 25 Jun 2025 16:55:37 +0200 Subject: [PATCH] GUI: Minor fix --- gui/src/aaregui/widgets/camera_image.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gui/src/aaregui/widgets/camera_image.py b/gui/src/aaregui/widgets/camera_image.py index 8aa3d60d..a3d839da 100644 --- a/gui/src/aaregui/widgets/camera_image.py +++ b/gui/src/aaregui/widgets/camera_image.py @@ -420,11 +420,10 @@ class SampleCameraImageLabel(QGraphicsView): super().keyPressEvent(event) def wheelEvent(self, event: QWheelEvent): - match self.__state: - case SampleCameraImageState.BEAM_MARKING: - if not self.wheel_event_timer.isActive(): - delta_y = event.angleDelta().y() - + if not self.wheel_event_timer.isActive(): + delta_y = event.angleDelta().y() + match self.__state: + case SampleCameraImageState.BEAM_MARKING: if event.modifiers() & Qt.KeyboardModifier.AltModifier: new_exp_time = self.__sam_cam.exposure * (1.0 + math.copysign(0.1, delta_y)) new_settings = SampleCameraSettings(exposure=new_exp_time, gain=self.__sam_cam.gain) @@ -433,14 +432,7 @@ class SampleCameraImageLabel(QGraphicsView): new_exp_time = self.__sam_cam.exposure * (1.0 + math.copysign(0.5, delta_y)) new_settings = SampleCameraSettings(exposure=new_exp_time, gain=self.__sam_cam.gain) self.samcam_updated.emit(new_settings) - - # Start the timer to throttle further events - self.wheel_event_timer.start(self.wheel_event_threshold) - case SampleCameraImageState.IDLE: - # Only process the wheel event if the timer is not active or enough time has passed - if not self.wheel_event_timer.isActive(): - delta_y = event.angleDelta().y() - + case SampleCameraImageState.IDLE: if event.modifiers() & Qt.KeyboardModifier.AltModifier: new_exp_time = self.__sam_cam.exposure * (1.0 + math.copysign(0.1, delta_y)) new_settings = SampleCameraSettings(exposure=new_exp_time, gain=self.__sam_cam.gain) @@ -454,5 +446,5 @@ class SampleCameraImageLabel(QGraphicsView): else: self.set_omega.emit(self.__geom.omega_deg + math.copysign(90.0, delta_y)) - # Start the timer to throttle further events - self.wheel_event_timer.start(self.wheel_event_threshold) + # Start the timer to throttle further events + self.wheel_event_timer.start(self.wheel_event_threshold)