Skip to content

Small fixes: Andor binning, diSPIM slope units, button reset, SCAPE hook guard #530

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 5 commits into from
Oct 11, 2026
Merged

Small fixes: Andor binning, diSPIM slope units, button reset, SCAPE hook guard #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5ab04b
read the Andor binning with its own property name
Oct 11, 2026
f4a3123
show the diSPIM sheet width slope in m°/px
Oct 11, 2026
2b67f33
remove a duplicate add of the slope label in the calibration panel
Oct 11, 2026
af5709f
reset the acquisition buttons with invokeLater
Oct 11, 2026
bb649f4
skip the controller trigger in the SCAPE camera hook when there is no…
Oct 11, 2026
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
19 changes: 6 additions & 13 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.micromanager.lightsheetmanager.gui.tabs;

import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.Future;
import javax.swing.SwingUtilities;
import org.micromanager.lightsheetmanager.LightSheetManagerFrame;
Expand Down Expand Up @@ -321,18 +320,12 @@ public PositionPanel getMultiPositionPanel() {
}

private void acqFinishedCallback() {
try {
SwingUtilities.invokeAndWait(() -> {
btnRunAcquisition_.setState(false);
btnPauseAcquisition_.setEnabled(false);
btnSpeedTest_.setEnabled(true);
btnTestAcquisition_.setEnabled(true);
});
} catch (InterruptedException e) {
model_.studio().logs().logError("Acquisition was interrupted!");
} catch (InvocationTargetException e) {
model_.studio().logs().logError("Could not update UI components.");
}
SwingUtilities.invokeLater(() -> {
btnRunAcquisition_.setState(false);
btnPauseAcquisition_.setEnabled(false);
btnSpeedTest_.setEnabled(true);
btnTestAcquisition_.setEnabled(true);
});
}

private void runAcquisition(boolean speedTest) {
Expand Down
1 change: 0 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 @@ -107,7 +107,6 @@ private void createUserInterface() {
pnlText.setMinimumSize(new Dimension(100, 30));
pnlText.add(lblSlope, "");
pnlText.add(lblSlopeValue_, "");
pnlText.add(lblSlopeValue_, "");
pnlText.add(txtSlope_, "wrap");
pnlText.add(lblOffset, "");
pnlText.add(lblOffsetValue_, "");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/LightSheetPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private void createUserInterface() {
final JLabel lblSheetWidth = new JLabel("Sheet width:");
//final JLabel lblSheetOffset = new JLabel("Sheet offset:");
final JLabel lblSheetOffset = new JLabel("Galvo offset * 1000:");
lblSlopeUnits2_ = new JLabel("μ°/px"); // TODO: reuse labels like this?
lblSlopeUnits2_ = new JLabel("m°/px");

cbxAutoSheetWidth_ = new CheckBox("Automatic", false);
txtSheetWidth_ = new TextField();
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ public AcquisitionEvent run(AcquisitionEvent event) {
return event;
}

if (isUsingPLC) {
if (isUsingPLC && controllerInstance != null) {
if (settings.stageScan().enabled() && settings.isUsingMultiplePositions()) {
final ASIXYStage xyStage = model_.devices().device("SampleXY");
// Scan from the coordinate this event was generated for instead of reading
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/devices/cameras/AndorCamera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void setBinning() {

@Override
public int getBinning() {
final String binning = getProperty(PcoCamera.Properties.BINNING);
final String binning = getProperty(Properties.BINNING);
final int factor = Integer.parseInt(binning.substring(0, 1));
if (factor < 1) {
studio_.logs().showError("Was not able to get camera binning factor");
Expand Down
Loading