Merge pull request #319 from bls337/main

update version and SaveMode enum

Author: bls337

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

@@ -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_;

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

@@ -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();
 

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

@@ -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_;
 
@@ -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

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

@@ -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_;

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

@@ -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);

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

@@ -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);