Skip to content

Commit 030406a

Browse files
author
Brandon
committed
update version and SaveMode enum
1 parent 982530d commit 030406a

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

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

1717
private Studio studio_;
1818
private LightSheetManager model_;

src/main/java/org/micromanager/lightsheetmanager/api/internal/DefaultAcquisitionSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract static class Builder<T extends Builder<T>> implements Acquisitio
1818
private String saveNamePrefix_ = "";
1919
private boolean saveDuringAcq_ = false;
2020
private boolean demoMode_ = false;
21-
private DataStorage.SaveMode saveMode_ = DataStorage.SaveMode.NDTIFF;
21+
private DataStorage.SaveMode saveMode_ = DataStorage.SaveMode.ND_TIFF;
2222

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

src/main/java/org/micromanager/lightsheetmanager/model/DataStorage.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ public class DataStorage implements DataSink {
2323
public enum SaveMode {
2424
SINGLEPLANE_TIFF_SERIES("Single Plane TIFF"),
2525
MULTIPAGE_TIFF("Multi Page TIFF"),
26-
27-
NDTIFF("NDTiff");
26+
ND_TIFF("NDTiff");
2827

2928
private String text_;
3029

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

4443
public static SaveMode fromString(final String symbol) {
45-
return stringToEnum.getOrDefault(symbol, SaveMode.NDTIFF);
44+
return stringToEnum.getOrDefault(symbol, SaveMode.ND_TIFF);
4645
}
4746

4847
@Override

src/main/java/org/micromanager/lightsheetmanager/model/PluginSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class PluginSettings {
1010

1111
private boolean isPollingPositions_ = true;
1212

13-
private XYZGrid xyzGrid_ = new XYZGrid();
13+
private final XYZGrid xyzGrid_ = new XYZGrid();
1414

1515
public XYZGrid xyzGrid() {
1616
return xyzGrid_;

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineDISPIM.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ boolean run() {
181181

182182
DefaultDatastore result = new DefaultDatastore(studio_);
183183
try {
184-
if (acqSettings_.saveMode() == DataStorage.SaveMode.NDTIFF) {
184+
if (acqSettings_.saveMode() == DataStorage.SaveMode.ND_TIFF) {
185185
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.ND_TIFF);
186186
} else if (acqSettings_.saveMode() == DataStorage.SaveMode.MULTIPAGE_TIFF) {
187187
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.MULTIPAGE_TIFF);

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ boolean run() {
217217

218218
// This sets the preferred save mode for DefaultDatastore, this value
219219
// is used in the MMAcquisition constructor to set the Storage object.
220-
if (acqSettings_.saveMode() == DataStorage.SaveMode.NDTIFF) {
220+
if (acqSettings_.saveMode() == DataStorage.SaveMode.ND_TIFF) {
221221
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.ND_TIFF);
222222
} else if (acqSettings_.saveMode() == DataStorage.SaveMode.MULTIPAGE_TIFF) {
223223
DefaultDatastore.setPreferredSaveMode(studio_, Datastore.SaveMode.MULTIPAGE_TIFF);

0 commit comments

Comments
 (0)