Changeset 7054

Timestamp:

10/08/10 16:23:17 (9 years ago)

Author:

melissa

Message:

Reverted r7018, see #570.

File:

• trunk/components/loci-plugins/src/loci/plugins/in/Calibrator.java (modified) (3 diffs)

trunk/components/loci-plugins/src/loci/plugins/in/Calibrator.java

@@ -74 +74 @@
     if (td != null) tcal = td.floatValue();
 
-    double xPosition = Double.NaN;
-    double yPosition = Double.NaN;
-    double zPosition = Double.NaN;
-    if (meta.getPlaneCount(series) > 0) {
-      Double posX = meta.getPlanePositionX(series, 0);
-      Double posY = meta.getPlanePositionY(series, 0);
-      Double posZ = meta.getPlanePositionZ(series, 0);
-      if (posX != null) xPosition = posX.doubleValue();
-      if (posY != null) yPosition = posY.doubleValue();
-      if (posZ != null) zPosition = posZ.doubleValue();
-    }
-
     boolean xcalPresent = !Double.isNaN(xcal);
     boolean ycalPresent = !Double.isNaN(ycal);
@@ -105 +93 @@
     tcalPresent = !Double.isNaN(tcal);
     final boolean hasSpatial = xcalPresent || ycalPresent || zcalPresent;
-    final boolean hasStageData =
-      !Double.isNaN(xPosition) || !Double.isNaN(yPosition);
-    final boolean hasCalibration = hasSpatial || ycalPresent || hasStageData;
+    final boolean hasCalibration = hasSpatial || ycalPresent;
 
     if (hasCalibration) {
@@ -117 +103 @@
       if (zcalPresent) cal.pixelDepth = zcal;
       if (tcalPresent) cal.frameInterval = tcal;
-      if (!Double.isNaN(xPosition) && xcalPresent) {
-        cal.xOrigin = xPosition * (1 / xcal);
-      }
-      if (!Double.isNaN(yPosition) && ycalPresent) {
-        cal.yOrigin = yPosition * (1 / ycal);
-      }
-      if (!Double.isNaN(zPosition) && zcalPresent) {
-        cal.zOrigin = zPosition * (1 / zcal);
-      }
       imp.setCalibration(cal);
     }