diff --git a/gui/src/aaregui/panels/helical_scan_panel.py b/gui/src/aaregui/panels/helical_scan_panel.py index 3c74d913..735d3f35 100644 --- a/gui/src/aaregui/panels/helical_scan_panel.py +++ b/gui/src/aaregui/panels/helical_scan_panel.py @@ -34,44 +34,62 @@ class HelicalDataCollectionPanel(QWidget): self.__start = SmargonCoordinate() self.__end = SmargonCoordinate() + grid_layout.addWidget(QLabel("High resolution", parent=self), 0, 0) + self.high_res_enter = NumberLineEdit( + 0.5, 10, decimals=2, default=2.0, parent=self + ) + grid_layout.addWidget(self.high_res_enter, 0, 1, 1, 3) + grid_layout.addWidget(QLabel("Å", parent=self), 0, 4) + grid_layout.addWidget(QLabel("Detector distance", parent=self), 1, 0) + self.dtz_enter = NumberLineEdit(60, 1000, decimals=2, default=120, parent=self) + grid_layout.addWidget(self.dtz_enter, 1, 1, 1, 3) + grid_layout.addWidget(QLabel("mm", parent=self), 1, 4) + + grid_layout.addWidget(QLabel("Beam transmission", parent=self), 2, 0) + self.transmission_enter = NumberLineEdit( + 0, 1.0, decimals=4, default=1.0, parent=self + ) + grid_layout.addWidget(self.transmission_enter, 2, 1, 1, 3) + + start_button = QPushButton("Save start point", parent=self) start_button.clicked.connect(self.set_start_point_curr) - grid_layout.addWidget(start_button, 0, 0, 1, 3) + grid_layout.addWidget(start_button, 3, 0, 1, 3) end_button = QPushButton("Save end point", parent=self) end_button.clicked.connect(self.set_end_point_curr) - grid_layout.addWidget(end_button, 1, 0, 1, 3) + grid_layout.addWidget(end_button, 4, 0, 1, 3) - grid_layout.addWidget(QLabel("Start angle", parent=self), 2, 0) + grid_layout.addWidget(QLabel("Start angle", parent=self), 5, 0) self.start_angle = NumberLineEdit(-720, 719.0, 0, decimals=3, parent=self) - grid_layout.addWidget(self.start_angle, 2, 1) - grid_layout.addWidget(QLabel("°", parent=self), 2, 2) + grid_layout.addWidget(self.start_angle, 5, 1) + grid_layout.addWidget(QLabel("°", parent=self), 5, 2) - grid_layout.addWidget(QLabel("Total angle", parent=self), 3, 0) + grid_layout.addWidget(QLabel("Total angle", parent=self), 6, 0) self.total_angle = NumberLineEdit( 0, 999.0, self.__total_angle, decimals=3, parent=self ) - grid_layout.addWidget(self.total_angle, 3, 1) - grid_layout.addWidget(QLabel("°", parent=self), 3, 2) + grid_layout.addWidget(self.total_angle, 6, 1) + grid_layout.addWidget(QLabel("°", parent=self), 6, 2) - grid_layout.addWidget(QLabel("Image angle", parent=self), 4, 0) + grid_layout.addWidget(QLabel("Image angle", parent=self), 7, 0) self.image_angle = NumberLineEdit( 0, 10.0, self.__image_angle, decimals=3, parent=self ) - grid_layout.addWidget(self.image_angle, 4, 1) - grid_layout.addWidget(QLabel("°", parent=self), 4, 2) + grid_layout.addWidget(self.image_angle, 7, 1) + grid_layout.addWidget(QLabel("°", parent=self), 7, 2) - grid_layout.addWidget(QLabel("Image time", parent=self), 5, 0) + grid_layout.addWidget(QLabel("Image time", parent=self), 8, 0) self.image_time_enter = NumberLineEdit( 0.0005, 10.0, self.__image_time, decimals=4, parent=self ) - grid_layout.addWidget(self.image_time_enter, 5, 1) - grid_layout.addWidget(QLabel("s", parent=self), 5, 2) + grid_layout.addWidget(self.image_time_enter, 8, 1) + grid_layout.addWidget(QLabel("s", parent=self), 8, 2) horizontal_spacer = QSpacerItem( 40, 20, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding ) - grid_layout.addItem(horizontal_spacer, 6, 0, 1, 3) + grid_layout.addItem(horizontal_spacer, 9, 0, 1, 3) @Slot(DAQStatusModel) def update_daq_status(self, s: DAQStatusModel): diff --git a/gui/src/aaregui/panels/raster_data_collection.py b/gui/src/aaregui/panels/raster_data_collection.py index f81e2968..2d2fed55 100644 --- a/gui/src/aaregui/panels/raster_data_collection.py +++ b/gui/src/aaregui/panels/raster_data_collection.py @@ -10,31 +10,49 @@ class RasterDataCollectionPanel(QWidget): def __init__(self, parent=None): super().__init__(parent) grid_layout = QGridLayout(self) - grid_layout.addWidget(QLabel("Grid size", parent=self), 0, 0) + + grid_layout.addWidget(QLabel("High resolution", parent=self), 0, 0) + self.high_res_enter = NumberLineEdit( + 0.5, 10, decimals=2, default=2.0, parent=self + ) + grid_layout.addWidget(self.high_res_enter, 0, 1, 1, 3) + grid_layout.addWidget(QLabel("Å", parent=self), 0, 4) + grid_layout.addWidget(QLabel("Detector distance", parent=self), 1, 0) + self.dtz_enter = NumberLineEdit(60, 1000, decimals=2, default=120, parent=self) + grid_layout.addWidget(self.dtz_enter, 1, 1, 1, 3) + grid_layout.addWidget(QLabel("mm", parent=self), 1, 4) + + grid_layout.addWidget(QLabel("Beam transmission", parent=self), 2, 0) + self.transmission_enter = NumberLineEdit( + 0, 1.0, decimals=4, default=1.0, parent=self + ) + grid_layout.addWidget(self.transmission_enter, 2, 1,1,3) + + grid_layout.addWidget(QLabel("Grid size", parent=self), 3, 0) self.width_enter = NumberLineEdit(5, 100, decimals=0, default=20, parent=self) self.width_enter.newValue.connect(self.grid_size) - grid_layout.addWidget(self.width_enter, 0, 1) + grid_layout.addWidget(self.width_enter, 3, 1) - grid_layout.addWidget(QLabel(" x ", parent=self), 0, 2) + grid_layout.addWidget(QLabel(" x ", parent=self), 3, 2) self.height_enter = NumberLineEdit(5, 100, decimals=0, default=20, parent=self) self.height_enter.newValue.connect(self.grid_size) - grid_layout.addWidget(self.height_enter, 0, 3) + grid_layout.addWidget(self.height_enter, 3, 3) - grid_layout.addWidget(QLabel("μm", parent=self), 0, 4) + grid_layout.addWidget(QLabel("μm", parent=self), 3, 4) - grid_layout.addWidget(QLabel("Image time", parent=self), 1, 0) + grid_layout.addWidget(QLabel("Image time", parent=self), 4, 0) self.image_time_enter = NumberLineEdit( 0.0005, 10.0, 0.005, decimals=4, parent=self ) - grid_layout.addWidget(self.image_time_enter, 1, 1, 1, 3) - grid_layout.addWidget(QLabel("s", parent=self), 1, 4) + grid_layout.addWidget(self.image_time_enter, 4, 1, 1, 3) + grid_layout.addWidget(QLabel("s", parent=self), 4, 4) horizontal_spacer = QSpacerItem( 40, 20, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding ) - grid_layout.addItem(horizontal_spacer, 2, 0, 1, 4) + grid_layout.addItem(horizontal_spacer, 5, 0, 1, 4) @Slot(float) def grid_size(self, _: float): diff --git a/gui/src/aaregui/panels/standard_data_collection.py b/gui/src/aaregui/panels/standard_data_collection.py index cdb0609d..255aede7 100644 --- a/gui/src/aaregui/panels/standard_data_collection.py +++ b/gui/src/aaregui/panels/standard_data_collection.py @@ -51,4 +51,4 @@ class StandardDataCollectionPanel(QWidget): horizontal_spacer = QSpacerItem( 40, 20, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding ) - grid_layout.addItem(horizontal_spacer, 6, 0, 1, 3) + grid_layout.addItem(horizontal_spacer, 7, 0, 1, 3)