diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java index eccb386..f6afb64 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java @@ -34,11 +34,13 @@ public class PiezoCalibrationPanel extends Panel { private boolean isUsingPLogic_; + private final PositionPanel panel_; private final LightSheetManager model_; - public PiezoCalibrationPanel(final LightSheetManager model, final int pathNum) { + public PiezoCalibrationPanel(final LightSheetManager model, final PositionPanel panel, final int pathNum) { super("Galvo Piezo Calibration"); model_ = Objects.requireNonNull(model); + panel_ = Objects.requireNonNull(panel); pathNum_ = pathNum; createUserInterface(); createEventHandlers(); @@ -165,6 +167,9 @@ private void createEventHandlers() { final double newOffset = piezoPosition - rate * scannerPosition - channelOffset; //txtOffset_.setText(String.format("%.3f μm", newOffset)); lblOffsetValue_.setText(String.format("%.3f μm", newOffset)); + panel_.setImagingCenterValue(newOffset); + model_.acquisitions().settingsBuilder() + .sheetCalibrationBuilder(pathNum_).imagingCenter(newOffset); model_.acquisitions().settingsBuilder() .sliceCalibrationBuilder(pathNum_).sliceOffset(newOffset); model_.studio().logs().logMessage("updated offset for view " + pathNum_ + "; new value is " + diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java index c824f33..9ff27a0 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PositionPanel.java @@ -224,6 +224,10 @@ private void createEventHandlers() { } } + public void setImagingCenterValue(final double value) { + lblImagingCenterValue_.setText(String.format("%.3f μm", value)); + } + @Override public void update(String topic, Object value) { EventQueue.invokeLater(() -> { diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java index 86a9f03..95878b5 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java @@ -46,9 +46,9 @@ public SetupPanel(final LightSheetManager model, final int pathNum) { leftPanel_ = new Panel(); rightPanel_ = new Panel(); - piezoPanel_ = new PiezoCalibrationPanel(model_, pathNum); beamSheetPanel_ = new BeamSheetControlPanel(model_, pathNum); positionPanel_ = new PositionPanel(model_, pathNum); + piezoPanel_ = new PiezoCalibrationPanel(model_, positionPanel_, pathNum); joystickPanel_ = new JoystickPanel(model_); excitationPanel_ = new ExcitationPanel(model_);