From 35aa6c5cf7e1c326e32485a3c0c0d550cfd5d859 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 1 Oct 2026 16:17:20 -0700 Subject: [PATCH] label the beam check box Sheet on SCAPE to match 1.4 --- .../lightsheetmanager/gui/tabs/setup/CalibrationPanel.java | 5 ++++- .../lightsheetmanager/gui/tabs/setup/ScannerPanel.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java index 044d28e7..26e46f30 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java @@ -172,7 +172,10 @@ private void createEventHandlers() { model_.studio().logs().logMessage("updated offset for view " + pathNum_ + "; new value is " + newOffset + " (with channel offset of " + channelOffset + ")"); } else { - model_.studio().logs().showError("The beam must be enabled to update the offset.", btnUpdate_); + final String name = (model_.devices().adapter().geometry() == GeometryType.SCAPE) + ? "sheet" : "beam"; + model_.studio().logs().showError( + "The " + name + " must be enabled to update the offset.", btnUpdate_); } }); } diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ScannerPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ScannerPanel.java index 5ec917ec..d44f99e7 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ScannerPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ScannerPanel.java @@ -36,10 +36,10 @@ private void createUserInterface() { isUsingPLogic_ = model_.devices().isUsingPLogic(); - final JLabel lblExcitation = new JLabel("Excitation side:"); + final JLabel lblExcitation = new JLabel("Excitation:"); final JLabel lblEpi = new JLabel("Epi side:"); - cbxBeamExc_ = new CheckBox("Beam", false); + cbxBeamExc_ = new CheckBox(geometryType == GeometryType.SCAPE ? "Sheet" : "Beam", false); cbxSheetExc_ = new CheckBox("Sheet", false); cbxBeamEpi_ = new CheckBox("Beam", false); cbxSheetEpi_ = new CheckBox("Sheet", false);