Skip to content

update version and SaveMode enum #319

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 15, 2025
Merged

update version and SaveMode enum #319

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
4 changes: 2 additions & 2 deletions src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

@Plugin(type = MenuPlugin.class)
public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin {
public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2024";
public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2025";
public static final String description = "A plugin to control various types of light sheet microscopes.";
public static final String menuName = "Light Sheet Manager";
public static final String version = "0.4.7";
public static final String version = "0.4.9";

private Studio studio_;
private LightSheetManager model_;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/micromanager/lightsheetmanager/api/internal/DefaultAcquisitionSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public abstract static class Builder<T extends Builder<T>> implements Acquisitio
private String saveNamePrefix_ = "";
private boolean saveDuringAcq_ = false;
private boolean demoMode_ = false;
private DataStorage.SaveMode saveMode_ = DataStorage.SaveMode.NDTIFF;
private DataStorage.SaveMode saveMode_ = DataStorage.SaveMode.ND_TIFF;

private DefaultAutofocusSettings.Builder afsb_ = new DefaultAutofocusSettings.Builder();

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/micromanager/lightsheetmanager/model/DataStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ public class DataStorage implements DataSink {
public enum SaveMode {
SINGLEPLANE_TIFF_SERIES("Single Plane TIFF"),
MULTIPAGE_TIFF("Multi Page TIFF"),

NDTIFF("NDTiff");
ND_TIFF("NDTiff");

private String text_;

Expand All @@ -42,7 +41,7 @@ public static String[] toArray() {
}

public static SaveMode fromString(final String symbol) {
return stringToEnum.getOrDefault(symbol, SaveMode.NDTIFF);
return stringToEnum.getOrDefault(symbol, SaveMode.ND_TIFF);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/PluginSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class PluginSettings {

private boolean isPollingPositions_ = true;

private XYZGrid xyzGrid_ = new XYZGrid();
private final XYZGrid xyzGrid_ = new XYZGrid();

public XYZGrid xyzGrid() {
return xyzGrid_;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ boolean run() {

DefaultDatastore result = new DefaultDatastore(studio_);
try {
if (acqSettings_.saveMode() == DataStorage.SaveMode.NDTIFF) {
if (acqSettings_.saveMode() == DataStorage.SaveMode.ND_TIFF) {
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.ND_TIFF);
} else if (acqSettings_.saveMode() == DataStorage.SaveMode.MULTIPAGE_TIFF) {
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.MULTIPAGE_TIFF);
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 @@ -217,7 +217,7 @@ boolean run() {

// This sets the preferred save mode for DefaultDatastore, this value
// is used in the MMAcquisition constructor to set the Storage object.
if (acqSettings_.saveMode() == DataStorage.SaveMode.NDTIFF) {
if (acqSettings_.saveMode() == DataStorage.SaveMode.ND_TIFF) {
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.ND_TIFF);
} else if (acqSettings_.saveMode() == DataStorage.SaveMode.MULTIPAGE_TIFF) {
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.MULTIPAGE_TIFF);
Expand Down
Loading