remove not implemented tab "point and shoot"

This commit is contained in:
2022-07-18 11:22:16 +02:00
parent af8a887f2f
commit c056f3f329
4 changed files with 13 additions and 56 deletions

View File

@@ -70,7 +70,6 @@ TASK_SETUP_CAMERA = "setup_camera"
TASK_SETUP_ROI = "setup_rois"
TASK_SAMPLE_SELECTION = "task_sample_selection"
TASK_SCREENING = "screening"
TASK_POINT_SHOOT = "point_shoot"
TASK_GRID = "grid"
TASK_PRELOCATED = "prelocated"
TASK_HELICAL = "helical"
@@ -977,10 +976,10 @@ class Main(QMainWindow, Ui_MainWindow):
self.ppm_fitter = np.poly1d(bx_coefs)
def getFastX(self):
return self.tweakers["fast_x"].motor.get_position()
return self.tweakers["fast_x"].get_position()
def getFastY(self):
return self.tweakers["fast_y"].motor.get_position()
return self.tweakers["fast_y"].get_position()
def zoom_changed_cb(self, value):
self.zoomChanged.emit(value)
@@ -1195,8 +1194,6 @@ class Main(QMainWindow, Ui_MainWindow):
self.append_to_beam_markers(x, y, zoom_level)
else:
_log.warning("click combination not available")
elif task == TASK_POINT_SHOOT:
pass
elif task == TASK_GRID:
if shft and not (ctrl or alt):
self.addGridRequest.emit(fx, fy)
@@ -2506,15 +2503,7 @@ class Main(QMainWindow, Ui_MainWindow):
self._is_aborted = False
method = self._tabs_daq_methods.currentWidget().accessibleName()
if task == TASK_POINT_SHOOT:
QMessageBox.information("not implemented", "not implemented")
self.re_connect_collect_button(
callback=self.collect_abort_grid,
accessibleName="grid_abort",
label="Abort",
)
elif task == TASK_GRID:
if task == TASK_GRID:
self.re_connect_collect_button(
callback=self.collect_abort_grid,
accessibleName="grid_abort",