Changeset 7747 for trunk/projects

Timestamp:

09/02/11 11:38:54 (8 years ago)

Author:

curtis

Message:

Convert stage coords from microns to pixels.

File:

• trunk/projects/misc-plugins/src/main/java/loci/plugins/StitchPrairieTiff.java (modified) (5 diffs)

trunk/projects/misc-plugins/src/main/java/loci/plugins/StitchPrairieTiff.java

@@ -41 +41 @@
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
@@ -58 +56 @@
 
 import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -329 +326 @@
                 private String filename;
                 private double x, y, z;
+                private double xMicrons, yMicrons;
 
                 PrairieHandler(final List<Pt> coords) {
                         this.coords = coords;
+                        clearState();
                 }
 
@@ -352 +351 @@
                                 else if (key.equals("positionCurrent_ZAxis")) {
                                         z = Double.parseDouble(value);
+                                }
+                                else if (key.equals("micronsPerPixel_XAxis")) {
+                                        xMicrons = Double.parseDouble(value);
+                                }
+                                else if (key.equals("micronsPerPixel_YAxis")) {
+                                        yMicrons = Double.parseDouble(value);
                                 }
                         }
@@ -363 +368 @@
                                 final Pt pt = new Pt();
                                 pt.filename = filename;
-                                pt.x = x;
-                                pt.y = y;
+                                pt.x = x / xMicrons;
+                                pt.y = y / yMicrons;
                                 pt.z = z;
                                 coords.add(pt);
-                        }
-                }
+                                clearState();
+                        }
+                }
+
+                private void clearState() {
+                        filename = null;
+                        x = y = z = Double.NaN;
+                        xMicrons = yMicrons = 1;
+                }
+
         }