From 053daa24ffa30999a93f75d5aab06b1251acff02 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 30 Jun 2025 22:37:36 +0200 Subject: [PATCH] GUI: On new sample set data collection tab to raster --- gui/src/aaregui/panels/data_collection_settings.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gui/src/aaregui/panels/data_collection_settings.py b/gui/src/aaregui/panels/data_collection_settings.py index 5c999008..93588838 100644 --- a/gui/src/aaregui/panels/data_collection_settings.py +++ b/gui/src/aaregui/panels/data_collection_settings.py @@ -38,14 +38,14 @@ class DataCollectionSettings(QFrame): self.file_path_panel = FilePathPanel(self) v_layout.addWidget(self.file_path_panel) - tab_widget = QTabWidget() + self.__tab_widget = QTabWidget() self.raster = RasterDataCollectionPanel(parent=self, raster_mgr=raster_mgr, diffraction=diffraction) - tab_widget.addTab(self.raster, "Raster scan") + self.__tab_widget.addTab(self.raster, "Raster scan") self.screening = RotationDataCollectionPanel(parent=self, diffraction=diffraction) - tab_widget.addTab(self.screening, "Rotation") - v_layout.addWidget(tab_widget) + self.__tab_widget.addTab(self.screening, "Rotation") + v_layout.addWidget(self.__tab_widget) v_layout.addStretch() @@ -58,6 +58,7 @@ class DataCollectionSettings(QFrame): self.screening.update_filename(self.file_path_panel.filename) self.file_path_panel.path_updated.connect(raster_mgr.update_filename) self.file_path_panel.path_updated.connect(self.screening.update_filename) + self.__sample_id = None @Slot() def cancel_button_clicked(self): @@ -67,3 +68,6 @@ class DataCollectionSettings(QFrame): def update_daq_status(self, s: DAQStatusModel): self.raster.update_daq_status(s) self.screening.update_daq_status(s) + if s.sample is not None and s.sample.db_id != self.__sample_id: + self.__sample_id = s.sample.db_id + self.__tab_widget.setCurrentIndex(0)