From cfea7df27c90ee63986ca4aff0ec64808554237b Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Thu, 16 Oct 2025 11:04:49 +0200 Subject: [PATCH] GUI: added reference tool panel to tell samples dock as a tab --- gui/src/aaregui/main_window.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gui/src/aaregui/main_window.py b/gui/src/aaregui/main_window.py index eb261c3a..3d3c67f6 100644 --- a/gui/src/aaregui/main_window.py +++ b/gui/src/aaregui/main_window.py @@ -123,21 +123,22 @@ class MainWindow(QMainWindow): ) beamline_controls_scroll.setFixedWidth(self.beamline.set_width + 10) - self.ref_tools_panel = ReferenceToolsPanel() - # add dock or add to left column as you prefer; e.g. dock: - ref_dock = QDockWidget("Reference Tools", self) - ref_dock.setWidget(self.ref_tools_panel) - self.addDockWidget(Qt.LeftDockWidgetArea, ref_dock) - self.tell_samples = TellSamplePanel(samples=SampleShortInfoList(s = [])) - self.ref_tools = ReferenceToolsPanel(samples=SampleShortInfoList(s = [])) + self.ref_tools_panel = ReferenceToolsPanel(samples=SampleShortInfoList(s = [])) self.job_list_panel = SampleQueuePanel() self.tell_samples_dock = QDockWidget("Sample List", self) + self.tell_samples_dock.setObjectName("tell_samples_dock") self.tell_samples_dock.setWidget(self.tell_samples) self.tell_samples_dock.setAllowedAreas(Qt.DockWidgetArea.BottomDockWidgetArea) self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.tell_samples_dock) + self.ref_tools_dock = QDockWidget("Reference Tools", self) + self.ref_tools_dock.setWidget(self.ref_tools_panel) + self.ref_tools_dock.setAllowedAreas(Qt.DockWidgetArea.BottomDockWidgetArea) + self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.ref_tools_dock) + self.tabifyDockWidget(self.ref_tools_dock, self.tell_samples_dock) + self.sample_logic = SampleMountLogic() self.job_list_dock = QDockWidget("Automation list", self) @@ -224,8 +225,8 @@ class MainWindow(QMainWindow): self.tell_samples.mount.connect(self.daq.mount) self.tell_samples.unmount.connect(self.daq.unmount) - self.ref_tools.mount.connect(self.daq.mount) - self.ref_tools.unmount.connect(self.daq.unmount) + self.ref_tools_panel.mount.connect(self.daq.mount) + self.ref_tools_panel.unmount.connect(self.daq.unmount) self.data_collection.raster.grid_size_updated.connect(self.raster.update_grid_size) self.data_collection.raster.exp_time_updated.connect(self.raster.update_exposure_time)