List saved object calibrations immediately
This commit is contained in:
@@ -49,11 +49,11 @@ class ObjectCalibrationController(QObject):
|
||||
"""Own one modeless editor, acquisition job and cancellable calculation."""
|
||||
|
||||
def __init__(self, parent: QWidget, store: NpzStore, build_config: Callable[[], RunConfigModel],
|
||||
capture: Callable[[ObjectCalibrationDialog], ObjectSweepCapture], select_saved: Callable[[str], None],
|
||||
capture: Callable[[ObjectCalibrationDialog], ObjectSweepCapture], saved: Callable[[str, bool], None],
|
||||
error: Callable[[str, Exception], None]) -> None:
|
||||
super().__init__(parent)
|
||||
self._parent, self._store, self._build_config = parent, store, build_config
|
||||
self._start_capture, self._select_saved, self._error = capture, select_saved, error
|
||||
self._start_capture, self._saved, self._error = capture, saved, error
|
||||
self.dialog: ObjectCalibrationDialog | None = None
|
||||
self.capture: ObjectSweepCapture | None = None
|
||||
self._closed = False
|
||||
@@ -157,8 +157,9 @@ class ObjectCalibrationController(QObject):
|
||||
validate_object_set(collection, metadata, current.to_dict(), current_key, through)
|
||||
except Exception as exc:
|
||||
status += f" Not selected for the current configuration: {exc}"
|
||||
self._saved(self._save_name, False)
|
||||
else:
|
||||
self._select_saved(self._save_name)
|
||||
self._saved(self._save_name, True)
|
||||
status += " Applies on the next Start."
|
||||
self.dialog.set_status(status)
|
||||
logger.info("%s", status)
|
||||
|
||||
@@ -58,7 +58,7 @@ class PreprocessController:
|
||||
self._capture_pause: PipelinePause | None = None
|
||||
self._radar_variants: list[RadarConfigVariant] = []
|
||||
self.object_calibration = ObjectCalibrationController(
|
||||
parent, store, build_config, self._capture_object, self._select_object, error,
|
||||
parent, store, build_config, self._capture_object, self._object_saved, error,
|
||||
)
|
||||
|
||||
def bind_actions(self, primary: PrimaryView, data: DataView) -> None:
|
||||
@@ -529,12 +529,13 @@ class PreprocessController:
|
||||
provenance = capture_provenance(config.to_dict(), radar_key, through)
|
||||
return ObjectSweepCapture(self._pipeline, dialog, config, self.settings().median_sweep_count, provenance)
|
||||
|
||||
def _select_object(self, name: str) -> None:
|
||||
self.selected_sets["s21_object_calibration"] = name
|
||||
self.ensure_dialog().set_set_name(name)
|
||||
self._summary(self.selected_sets)
|
||||
def _object_saved(self, name: str, applicable: bool) -> None:
|
||||
"""List a new object calibration at once; select it only when it fits the current setup."""
|
||||
if applicable:
|
||||
self.selected_sets["s21_object_calibration"] = name
|
||||
self.ensure_dialog().set_set_name(name)
|
||||
logger.info("Selected object calibration: %s", name)
|
||||
self._refresh_requested()
|
||||
logger.info("Selected object calibration: %s", name)
|
||||
|
||||
def invalidate_object_calibration_after_geometry_change(self) -> None:
|
||||
selected = self.selected_sets.get("s21_object_calibration", "")
|
||||
|
||||
Reference in New Issue
Block a user