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

enable stage scanning panel if available on xystage #260

Merged
merged 1 commit into from
Apr 11, 2024
Merged

enable stage scanning panel if available on xystage #260

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
7 changes: 5 additions & 2 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/DataTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
package org.micromanager.lightsheetmanager.gui.tabs;

import java.awt.*;
import java.awt.Color;
import java.awt.Font;
import java.io.File;
import java.util.EventObject;

import org.micromanager.internal.utils.FileDialogs;
import org.micromanager.lightsheetmanager.api.internal.DefaultAcquisitionSettingsSCAPE;
import org.micromanager.lightsheetmanager.gui.LightSheetManagerFrame;
import org.micromanager.lightsheetmanager.gui.components.*;
import org.micromanager.lightsheetmanager.gui.components.Button;
import org.micromanager.lightsheetmanager.gui.components.CheckBox;
import org.micromanager.lightsheetmanager.gui.components.Label;
import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
import org.micromanager.lightsheetmanager.gui.components.Panel;
import org.micromanager.lightsheetmanager.gui.components.RadioButton;
import org.micromanager.lightsheetmanager.gui.components.TextField;
import org.micromanager.lightsheetmanager.model.DataStorage;
import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
Expand Down
124 changes: 68 additions & 56 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SettingsTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,34 @@
import org.micromanager.lightsheetmanager.gui.components.Panel;
import org.micromanager.lightsheetmanager.gui.components.Spinner;
import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
import org.micromanager.lightsheetmanager.model.devices.XYStage;
import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
import org.micromanager.lightsheetmanager.model.devices.vendor.ASIXYStage;

import javax.swing.JLabel;
import java.util.Objects;

public class SettingsTab extends Panel implements ListeningPanel {

// scan settings

private Spinner spnScanAcceleration_;
private Spinner spnScanOvershootDist_;
private Spinner spnScanRetraceSpeed_;
private Spinner spnScanAngleFirstView_;

private CheckBox cbxScanFromCurrentPosition_;
private CheckBox cbxScanNegativeDirection_;
private CheckBox cbxReturnToOriginalPosition_;

// light sheet scanner settings

private Spinner spnSheetAxisFilterFreq_;
private Spinner spnSliceAxisFilterFreq_;
private Spinner spnLiveScanPeriod_;

// changes the ui setup
private boolean isUsingPLogic_;
private boolean isUsingScanSettings_;

private LightSheetManagerModel model_;
private final LightSheetManagerModel model_;

public SettingsTab(final LightSheetManagerModel model) {
model_ = Objects.requireNonNull(model);
Expand All @@ -44,7 +45,16 @@ private void createUserInterface() {
final DefaultAcquisitionSettingsSCAPE acqSettings =
model_.acquisitions().settings();

// check for devices to set up the tab
isUsingPLogic_ = model_.devices().isUsingPLogic();
if (isUsingPLogic_) {
final ASIXYStage xyStage = model_.devices().getDevice("SampleXY");
if (xyStage != null) {
isUsingScanSettings_ = xyStage.hasProperty(ASIXYStage.Properties.SCAN_NUM_LINES);
} else {
isUsingScanSettings_ = false;
}
}

final Panel pnlScanSettings = new Panel("Stage Scan Settings");
pnlScanSettings.setMigLayout(
Expand All @@ -53,11 +63,11 @@ private void createUserInterface() {
"[]5[]");

final JLabel lblScanAcceleration = new JLabel("Relative acceleration time:");
final JLabel lblScanOvershootDist = new JLabel("Scan overshoot distance [" + "\u00B5"+ "m]:");
final JLabel lblScanOvershootDist = new JLabel("Scan overshoot distance [µm]:");
final JLabel lblScanRetraceSpeed = new JLabel("Scan retrace speed [% of max]:");
final JLabel lblScanAngleFirstView = new JLabel("Path A stage/objective angle [\u00B0]:");
final JLabel lblScanAngleFirstView = new JLabel("Path A stage/objective angle [°]:");

// Spinners
// Scan Spinners
spnScanAcceleration_ = Spinner.createDoubleSpinner(
acqSettings.scanSettings().scanAccelerationFactor(),
0.1, 1000.0, 1.0);
Expand All @@ -74,7 +84,7 @@ private void createUserInterface() {
acqSettings.scanSettings().scanAngleFirstView(),
1.0, 89.0, 1.0);

// CheckBoxes
// Scan CheckBoxes
cbxScanFromCurrentPosition_ = new CheckBox("Scan from current position instead of center",
acqSettings.scanSettings().scanFromCurrentPosition());
cbxScanNegativeDirection_ = new CheckBox("Scan negative direction",
Expand All @@ -99,17 +109,21 @@ private void createUserInterface() {
spnLiveScanPeriod_ = Spinner.createIntegerSpinner(20, 2, 10000, 100);

// scan settings panel
pnlScanSettings.add(lblScanAcceleration, "");
pnlScanSettings.add(spnScanAcceleration_, "wrap");
pnlScanSettings.add(lblScanOvershootDist, "");
pnlScanSettings.add(spnScanOvershootDist_, "wrap");
pnlScanSettings.add(lblScanRetraceSpeed, "");
pnlScanSettings.add(spnScanRetraceSpeed_, "wrap");
pnlScanSettings.add(lblScanAngleFirstView, "");
pnlScanSettings.add(spnScanAngleFirstView_, "wrap");
pnlScanSettings.add(cbxScanFromCurrentPosition_, "wrap");
pnlScanSettings.add(cbxScanNegativeDirection_, "wrap");
pnlScanSettings.add(cbxReturnToOriginalPosition_, "wrap");
if (isUsingScanSettings_) {
pnlScanSettings.add(lblScanAcceleration, "");
pnlScanSettings.add(spnScanAcceleration_, "wrap");
pnlScanSettings.add(lblScanOvershootDist, "");
pnlScanSettings.add(spnScanOvershootDist_, "wrap");
pnlScanSettings.add(lblScanRetraceSpeed, "");
pnlScanSettings.add(spnScanRetraceSpeed_, "wrap");
pnlScanSettings.add(lblScanAngleFirstView, "");
pnlScanSettings.add(spnScanAngleFirstView_, "wrap");
pnlScanSettings.add(cbxScanFromCurrentPosition_, "span 2, wrap");
pnlScanSettings.add(cbxScanNegativeDirection_, "span 2, wrap");
pnlScanSettings.add(cbxReturnToOriginalPosition_, "span 2, wrap");
} else {
pnlScanSettings.add(new JLabel("Stage scanning not supported by your firmware."), "");
}

// light sheet scanner settings panel
if (isUsingPLogic_) {
Expand All @@ -121,55 +135,53 @@ private void createUserInterface() {
pnlLightSheet.add(lblLiveScanPeriod, "");
pnlLightSheet.add(spnLiveScanPeriod_, "");

add(pnlLightSheet, "growx, wrap");
//add(pnlScanSettings, "");
add(pnlScanSettings, "wrap");
add(pnlLightSheet, "growx");
}

private void createEventHandlers() {

// Scan Settings
spnScanAcceleration_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanAccelerationFactor(spnScanAcceleration_.getDouble()));
spnScanOvershootDist_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanOvershootDistance(spnScanOvershootDist_.getInt()));
spnScanRetraceSpeed_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanRetraceSpeed(spnScanRetraceSpeed_.getDouble()));
spnScanAngleFirstView_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanAngleFirstView(spnScanAngleFirstView_.getDouble()));

cbxScanFromCurrentPosition_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanFromCurrentPosition(cbxScanFromCurrentPosition_.isSelected()));
cbxScanNegativeDirection_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanFromNegativeDirection(cbxScanNegativeDirection_.isSelected()));
cbxReturnToOriginalPosition_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanReturnToOriginalPosition(cbxReturnToOriginalPosition_.isSelected()));

// only create event handlers for filter freq if we are using PLogic
if (isUsingScanSettings_) {
spnScanAcceleration_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanAccelerationFactor(spnScanAcceleration_.getDouble()));
spnScanOvershootDist_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanOvershootDistance(spnScanOvershootDist_.getInt()));
spnScanRetraceSpeed_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanRetraceSpeed(spnScanRetraceSpeed_.getDouble()));
spnScanAngleFirstView_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanAngleFirstView(spnScanAngleFirstView_.getDouble()));

cbxScanFromCurrentPosition_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanFromCurrentPosition(cbxScanFromCurrentPosition_.isSelected()));
cbxScanNegativeDirection_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanFromNegativeDirection(cbxScanNegativeDirection_.isSelected()));
cbxReturnToOriginalPosition_.registerListener(e ->
model_.acquisitions().settingsBuilder().scanSettingsBuilder()
.scanReturnToOriginalPosition(cbxReturnToOriginalPosition_.isSelected()));
}

// ASIScanner Filter Freq
if (isUsingPLogic_) {
final ASIScanner scanner = model_.devices()
.getDevice("IllumSlice");

// Light Sheet Scanner
spnSheetAxisFilterFreq_.registerListener(e -> {
scanner.setFilterFreqX(spnSheetAxisFilterFreq_.getDouble());
});
spnSheetAxisFilterFreq_.registerListener(
e -> scanner.setFilterFreqX(spnSheetAxisFilterFreq_.getDouble()));

spnSliceAxisFilterFreq_.registerListener(e -> {
scanner.setFilterFreqY(spnSliceAxisFilterFreq_.getDouble());
});
spnSliceAxisFilterFreq_.registerListener(
e -> scanner.setFilterFreqY(spnSliceAxisFilterFreq_.getDouble()));
}

spnLiveScanPeriod_.registerListener(e -> {
model_.acquisitions().settingsBuilder()
.liveScanPeriod(spnLiveScanPeriod_.getDouble());
});
spnLiveScanPeriod_.registerListener(
e -> model_.acquisitions().settingsBuilder()
.liveScanPeriod(spnLiveScanPeriod_.getDouble()));

}

Expand Down
Loading