Skip to content

Commit bc13819

Browse files
committed
update the widget to add save and load scan coordinates buttons
1 parent e59fb34 commit bc13819

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

software/control/widgets.py

+19-15
Original file line numberDiff line numberDiff line change
@@ -3322,6 +3322,7 @@ def add_components(self):
33223322
self.entry_well_coverage.setRange(1, 999.99)
33233323
self.entry_well_coverage.setValue(100)
33243324
self.entry_well_coverage.setSuffix("%")
3325+
self.entry_well_coverage.setDecimals(0)
33253326
btn_width = self.entry_well_coverage.sizeHint().width()
33263327

33273328
self.btn_setSavingDir = QPushButton("Browse")
@@ -3421,6 +3422,9 @@ def add_components(self):
34213422
self.combobox_shape.setFixedWidth(btn_width)
34223423
# self.combobox_shape.currentTextChanged.connect(self.on_shape_changed)
34233424

3425+
self.btn_save_scan_coordinates = QPushButton("Save Coordinates")
3426+
self.btn_load_scan_coordinates = QPushButton("Load Coordinates")
3427+
34243428
self.checkbox_genAFMap = QCheckBox("Generate Focus Map")
34253429
self.checkbox_genAFMap.setChecked(False)
34263430

@@ -3469,25 +3473,25 @@ def add_components(self):
34693473
saving_path_layout.addWidget(self.btn_setSavingDir)
34703474
main_layout.addLayout(saving_path_layout)
34713475

3472-
# Experiment ID and Scan Shape
3476+
# Experiment ID
34733477
row_1_layout = QHBoxLayout()
34743478
row_1_layout.addWidget(QLabel("Experiment ID"))
34753479
row_1_layout.addWidget(self.lineEdit_experimentID)
3476-
row_1_layout.addWidget(QLabel("Well Shape"))
3477-
row_1_layout.addWidget(self.combobox_shape)
34783480
main_layout.addLayout(row_1_layout)
34793481

3480-
# Well Coverage, Scan Size, and Overlap
3481-
row_4_layout = QHBoxLayout()
3482-
row_4_layout.addWidget(QLabel("Size"))
3483-
row_4_layout.addWidget(self.entry_scan_size)
3484-
# row_4_layout.addStretch(1)
3485-
row_4_layout.addWidget(QLabel("FOV Overlap"))
3486-
row_4_layout.addWidget(self.entry_overlap)
3487-
# row_4_layout.addStretch(1)
3488-
row_4_layout.addWidget(QLabel("Well Coverage"))
3489-
row_4_layout.addWidget(self.entry_well_coverage)
3490-
main_layout.addLayout(row_4_layout)
3482+
# Scan Shape, FOV overlap, and Save / Load Scan Coordinates
3483+
row_2_layout = QGridLayout()
3484+
row_2_layout.addWidget(QLabel("Scan Shape"), 0, 0)
3485+
row_2_layout.addWidget(self.combobox_shape, 0, 1)
3486+
row_2_layout.addWidget(QLabel("Scan Size"), 0, 2)
3487+
row_2_layout.addWidget(self.entry_scan_size, 0, 3)
3488+
row_2_layout.addWidget(QLabel("Coverage"), 0, 4)
3489+
row_2_layout.addWidget(self.entry_well_coverage, 0, 5)
3490+
row_2_layout.addWidget(QLabel("FOV Overlap"), 1, 0)
3491+
row_2_layout.addWidget(self.entry_overlap, 1, 1)
3492+
row_2_layout.addWidget(self.btn_save_scan_coordinates, 1, 2, 1, 2)
3493+
row_2_layout.addWidget(self.btn_load_scan_coordinates, 1, 4, 1, 2)
3494+
main_layout.addLayout(row_2_layout)
34913495

34923496
grid = QGridLayout()
34933497

@@ -3725,7 +3729,7 @@ def set_default_scan_size(self):
37253729
self.set_default_shape()
37263730

37273731
if "glass slide" in self.navigationViewer.sample:
3728-
self.entry_scan_size.setValue(1.0) # init to 1mm when switching to 'glass slide'
3732+
self.entry_scan_size.setValue(0.1) # init to 0.1mm when switching to 'glass slide' (for imaging a single FOV by default)
37293733
self.entry_scan_size.setEnabled(True)
37303734
self.entry_well_coverage.setEnabled(False)
37313735
else:

0 commit comments

Comments
 (0)