Skip to content
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

minor update #290

Merged
merged 1 commit into from
May 15, 2024
Merged

minor update #290

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
14 changes: 7 additions & 7 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/navigation/NavigationPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.micromanager.Studio;
import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;

import javax.swing.*;
import javax.swing.JLabel;
import javax.swing.border.TitledBorder;
import java.util.ArrayList;
import java.util.Comparator;
Expand Down Expand Up @@ -229,7 +229,7 @@ public void createUserInterface() {
private void createEventHandlers() {

btnRefreshPanel_.registerListener(e -> {
System.out.println("refresh pressed");
//System.out.println("refresh pressed");
removeAll();
createUserInterface();
createEventHandlers();
Expand All @@ -248,7 +248,7 @@ private void createEventHandlers() {
} else {
positionUpdater_.stopPolling();
}
System.out.println("poll positions isSelected: " + cbxPollPositions_.isSelected());
//System.out.println("poll positions isSelected: " + cbxPollPositions_.isSelected());
});

}
Expand All @@ -274,7 +274,6 @@ private boolean containsDigit(final String str) {
*/
public void updatePositions() {
//System.out.println("isEDT: " + SwingUtilities.isEventDispatchThread());
//System.out.println("updating!");
for (ControlPanel panel : controlPanels_) {
panel.updatePosition();
}
Expand All @@ -296,10 +295,11 @@ public PositionUpdater getPositionUpdater() {
return positionUpdater_;
}

public void haltAllDevices() {
//System.out.println("Halt pressed!");
/**
* Halt all 2D and 1D stage devices.
*/
private void haltAllDevices() {
for (ControlPanel controlPanel : controlPanels_) {
// only try to stop XY and 1D stages
DeviceType deviceType = controlPanel.getDeviceType();
if (deviceType == DeviceType.XYStageDevice || deviceType == DeviceType.StageDevice) {
controlPanel.stop();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class DeviceManager {
private Map<String, DeviceBase> deviceMap_;
private Map<String, DeviceBase> devicesAdded_;

private LightSheetManagerModel model_;
private final LightSheetManagerModel model_;

private static String deviceAdapterName_;
public static final String LSM_DEVICE_LIBRARY = "LightSheetManager";
Expand Down
11 changes: 10 additions & 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 @@ -56,10 +56,19 @@ public AcquisitionEngineSCAPE(final LightSheetManagerModel model) {
@Override
boolean setup() {

// // check pixel size
// if (core_.getPixelSizeUm() < 1e-6) {
// studio_.logs().showError(
// "Pixel size not set, navigate to \"Devices > Pixel Size Calibration...\" to set the value.");
// return false;
// }

// this is needed for LSMAcquisitionEvents to work with multiple positions
if (core_.getFocusDevice().isEmpty()
&& acqSettings_.isUsingMultiplePositions()) {
studio_.logs().showError("The default focus device \"Core-Focus\" needs to be set to use multiple positions.");
studio_.logs().showError(
"The default focus device \"Core-Focus\" needs to be set to use multiple positions.");
return false;
}

// make sure that there are positions in the PositionList
Expand Down
Loading