From 4e156240367f4ab90d0430347717440415e95e7c Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 17 Jun 2025 11:00:29 +0200 Subject: [PATCH] GUI: Move sample in Smargon Z with shift+click --- common/src/aaredaqlib/sample_geometry.py | 1 - gui/src/aaregui/panels/status_panel.py | 5 +++++ gui/src/aaregui/widgets/camera_image.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/aaredaqlib/sample_geometry.py b/common/src/aaredaqlib/sample_geometry.py index 30b1927e..e733c6e2 100644 --- a/common/src/aaredaqlib/sample_geometry.py +++ b/common/src/aaredaqlib/sample_geometry.py @@ -31,7 +31,6 @@ class SampleGeometryModel(BaseModel): def smargon_z(self, pic_y: float) -> Coordinate: y_mm = (pic_y - self.beam_location_pxl.y) * self.pixel_in_mm - print("Moving by ", y_mm, "mm in z direction.") return self.smargon.sh_mm + self.smargon_nudge(Coordinate(z=y_mm)) # This goes from image coordinates to relative beam coordinates in image plane diff --git a/gui/src/aaregui/panels/status_panel.py b/gui/src/aaregui/panels/status_panel.py index 13c232ab..a00c4358 100644 --- a/gui/src/aaregui/panels/status_panel.py +++ b/gui/src/aaregui/panels/status_panel.py @@ -64,3 +64,8 @@ class StatusPanel(QFrame): ) self.ring_current.setText(f"{s.bl.ring_current_mA:.1f}") self.flux.setText(f"{(s.bl.flux_ph_s / 1e9):.2f}") + + if s.diffraction.wavelength_angstrom is None: + self.wavelength.setText("N/A") + else: + self.wavelength.setText(f"{s.diffraction.wavelength_angstrom:.3f}") \ No newline at end of file diff --git a/gui/src/aaregui/widgets/camera_image.py b/gui/src/aaregui/widgets/camera_image.py index 9a42e712..aacf5cbd 100644 --- a/gui/src/aaregui/widgets/camera_image.py +++ b/gui/src/aaregui/widgets/camera_image.py @@ -309,7 +309,8 @@ class SampleCameraImageLabel(QGraphicsView): case SampleCameraImageState.IDLE: point = self.mapToScene(event.pos()) if event.modifiers() & Qt.KeyboardModifier.ShiftModifier: - self.smargon.emit(self.__geom.smargon_z(point.y())) + sc = SmargonCoordinate(sh_mm=self.__geom.smargon_z(point.y())) + self.smargon.emit(sc) else: sample_coord = self.__geom.picture_to_sample(Coordinate(x=point.x(), y=point.y())) smargon_coord = SmargonCoordinate(