Skip to content

latest improvements #402

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 16 commits into from
Apr 24, 2026
Merged

latest improvements #402

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
11735c2
change file name
Apr 23, 2026
db86c50
rename setup path panel file name
Apr 23, 2026
7381e7e
rename file
Apr 23, 2026
94cd410
rename excitations panel to scanner panel
Apr 23, 2026
e0cbcb1
rename files
Apr 23, 2026
9456353
make combo boxes bigger
Apr 23, 2026
9364b48
add check for timepoint interval < volume duration
Apr 23, 2026
de78978
use correct combo items for js panel
Apr 23, 2026
2e1edbb
add joytick methods to js class
Apr 24, 2026
7c0f3b8
fix joystick input enum
Apr 24, 2026
6961fb0
add more to js panel
Apr 24, 2026
32a92f5
improvements to js panel
Apr 24, 2026
2aee7e2
prevent errors if not using asi hardware
Apr 24, 2026
db9c47f
add logging to camera reset and readout time
Apr 24, 2026
531e5ca
start of camera roi implemetnation
Apr 24, 2026
91fe337
add checks to verify scape pre-init setup
Apr 24, 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
Prev Previous commit
Next Next commit
fix joystick input enum
  • Loading branch information
Brandon committed Apr 24, 2026
commit 7c0f3b8271f0d042191a1926a5cf7ded46c43942
7 changes: 3 additions & 4 deletions src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/JoystickPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import org.micromanager.lightsheetmanager.gui.components.ComboBox;
import org.micromanager.lightsheetmanager.gui.components.Panel;
import org.micromanager.lightsheetmanager.LightSheetManager;
import org.micromanager.lightsheetmanager.model.devices.DeviceBase;
import org.micromanager.lightsheetmanager.model.devices.vendor.ASIScanner;
import org.micromanager.lightsheetmanager.model.devices.vendor.ASIXYStage;
import org.micromanager.lightsheetmanager.model.devices.vendor.Joystick;
Expand Down Expand Up @@ -67,9 +66,9 @@ private void createUserInterface() {
final String[] joystickLabels = {"None", "Scanner", "XYStage"};
final String[] wheelLabels = {"None", "Imaging Piezo", "Imaging Slice", "Light Sheet Tilt", "Sample Height"};

cmbJoystick_ = new ComboBox<>(joystickLabels, "XYStage", 100, 24);
cmbLeftWheel_ = new ComboBox<>(wheelLabels, "Imaging Piezo", 100, 24);
cmbRightWheel_ = new ComboBox<>(wheelLabels, "Imaging Slice", 100, 24);
cmbJoystick_ = new ComboBox<>(joystickLabels, "None", 100, 24);
cmbLeftWheel_ = new ComboBox<>(wheelLabels, "None", 100, 24);
cmbRightWheel_ = new ComboBox<>(wheelLabels, "None", 100, 24);

add(lblJoystick, "");
add(cmbJoystick_, "wrap");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/devices/vendor/Joystick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public static class Values {
}

public enum Input {
NONE("0 - None"),
NONE("0 - none"),
JOYSTICK_X("2 - joystick X"),
JOYSTICK_Y("3 - joystick Y"),
RIGHT_WHEEL("22 - right wheel"),
Expand Down