GUI: On new sample set data collection tab to raster
This commit is contained in:
1 parent
b6a91aa952
commit
053daa24ff
1 file changed
+8
-4
@@ -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)
|
||||
Reference in new issue
Block a user