Merge pull request micro-manager#1724 from henrypinkard/main

fix magellan dataset opening
nicost · Jun 20, 2023 · 620a476 · 620a476
2 parents e910bba + caedf6e
commit 620a476
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.../Magellan/src/main/java/org/micromanager/magellan/internal/gui/MagellanMouseListener.java b/.../Magellan/src/main/java/org/micromanager/magellan/internal/gui/MagellanMouseListener.java
@@ -61,7 +61,9 @@ public void accept(String s) {
             Log.log(s);
          }
       };
-      pixelStageTranslator_ = acq_.getPixelStageTranslator();
+      if (acq_ != null) {
+         pixelStageTranslator_ = acq_.getPixelStageTranslator();
+      }
    }
 
 

diff --git a/...src/main/java/org/micromanager/magellan/internal/magellanacq/MagellanAcqUIAndStorage.java b/...src/main/java/org/micromanager/magellan/internal/magellanacq/MagellanAcqUIAndStorage.java
@@ -268,10 +268,12 @@ private void createDisplay() {
             public void accept(HashMap<String, Object> axes) {
 
                // iterate through z devices and update their current z position
-               for (String name : acq_.getZAxes().keySet()) {
-                  if (axes.containsKey(name)) {
-                     Integer i = (Integer) axes.get(name);
-                     exploreControlsPanel_.updateGUIToReflectHardwareZPosition(name, i);
+               if (acq_ != null) {
+                  for (String name : acq_.getZAxes().keySet()) {
+                     if (axes.containsKey(name)) {
+                        Integer i = (Integer) axes.get(name);
+                        exploreControlsPanel_.updateGUIToReflectHardwareZPosition(name, i);
+                     }
                   }
                }
             }