Changeset 7129

Timestamp:

10/25/10 18:16:30 (9 years ago)

Author:

melissa

Message:

Fixed stage position indices.

Files:

• branches/4.2/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java (modified) (4 diffs)
• trunk/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java (modified) (4 diffs)

branches/4.2/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java

@@ -103 +103 @@
   private Vector<String> tagsToParse;
   private int nextEmWave = 0, nextExWave = 0, nextChName = 0;
-  private Vector<Double> stageX = new Vector<Double>();
-  private Vector<Double> stageY = new Vector<Double>();
+  private Hashtable<Integer, Double> stageX = new Hashtable<Integer, Double>();
+  private Hashtable<Integer, Double> stageY = new Hashtable<Integer, Double>();
   private int timepoint = 0;
 
@@ -604 +604 @@
 
     for (String name : tagsToParse) {
-      parseTags(-1, name, store);
+      int imageNum = getImageNumber(name, -1);
+      parseTags(imageNum, name, store);
     }
 
@@ -744 +745 @@
         }
 
-        if (plane < stageX.size()) {
+        if (stageX.get(plane) != null) {
           store.setPlanePositionX(stageX.get(plane), 0, plane);
         }
-        if (plane < stageY.size()) {
+        if (stageY.get(plane) != null) {
           store.setPlanePositionY(stageY.get(plane), 0, plane);
         }
@@ -1008 +1009 @@
         }
         else if (key.indexOf("Stage Position X") != -1) {
-          stageX.add(new Double(value));
-          addGlobalMeta("X position for position #1", stageX);
+          stageX.put(image, new Double(value));
+          addGlobalMeta("X position for position #1", value);
         }
         else if (key.indexOf("Stage Position Y") != -1) {
-          stageY.add(new Double(value));
-          addGlobalMeta("Y position for position #1", stageY);
+          stageY.put(image, new Double(value));
+          addGlobalMeta("Y position for position #1", value);
         }
         else if (key.startsWith("Orca Analog Gain")) {

trunk/components/bio-formats/src/loci/formats/in/ZeissZVIReader.java

@@ -103 +103 @@
   private Vector<String> tagsToParse;
   private int nextEmWave = 0, nextExWave = 0, nextChName = 0;
-  private Vector<Double> stageX = new Vector<Double>();
-  private Vector<Double> stageY = new Vector<Double>();
+  private Hashtable<Integer, Double> stageX = new Hashtable<Integer, Double>();
+  private Hashtable<Integer, Double> stageY = new Hashtable<Integer, Double>();
   private int timepoint = 0;
 
@@ -604 +604 @@
 
     for (String name : tagsToParse) {
-      parseTags(-1, name, store);
+      int imageNum = getImageNumber(name, -1);
+      parseTags(imageNum, name, store);
     }
 
@@ -744 +745 @@
         }
 
-        if (plane < stageX.size()) {
+        if (stageX.get(plane) != null) {
           store.setPlanePositionX(stageX.get(plane), 0, plane);
         }
-        if (plane < stageY.size()) {
+        if (stageY.get(plane) != null) {
           store.setPlanePositionY(stageY.get(plane), 0, plane);
         }
@@ -1008 +1009 @@
         }
         else if (key.indexOf("Stage Position X") != -1) {
-          stageX.add(new Double(value));
-          addGlobalMeta("X position for position #1", stageX);
+          stageX.put(image, new Double(value));
+          addGlobalMeta("X position for position #1", value);
         }
         else if (key.indexOf("Stage Position Y") != -1) {
-          stageY.add(new Double(value));
-          addGlobalMeta("Y position for position #1", stageY);
+          stageY.put(image, new Double(value));
+          addGlobalMeta("Y position for position #1", value);
         }
         else if (key.startsWith("Orca Analog Gain")) {