Skip to content

label the beam check box Sheet on SCAPE to match 1.4 #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bls337 merged 1 commit into from
Oct 1, 2026
Merged

label the beam check box Sheet on SCAPE to match 1.4 #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CalibrationPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/ScannerPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading