Changeset 7054
- Timestamp:
- 10/08/10 16:23:17 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/components/loci-plugins/src/loci/plugins/in/Calibrator.java
r7018 r7054 74 74 if (td != null) tcal = td.floatValue(); 75 75 76 double xPosition = Double.NaN;77 double yPosition = Double.NaN;78 double zPosition = Double.NaN;79 if (meta.getPlaneCount(series) > 0) {80 Double posX = meta.getPlanePositionX(series, 0);81 Double posY = meta.getPlanePositionY(series, 0);82 Double posZ = meta.getPlanePositionZ(series, 0);83 if (posX != null) xPosition = posX.doubleValue();84 if (posY != null) yPosition = posY.doubleValue();85 if (posZ != null) zPosition = posZ.doubleValue();86 }87 88 76 boolean xcalPresent = !Double.isNaN(xcal); 89 77 boolean ycalPresent = !Double.isNaN(ycal); … … 105 93 tcalPresent = !Double.isNaN(tcal); 106 94 final boolean hasSpatial = xcalPresent || ycalPresent || zcalPresent; 107 final boolean hasStageData = 108 !Double.isNaN(xPosition) || !Double.isNaN(yPosition); 109 final boolean hasCalibration = hasSpatial || ycalPresent || hasStageData; 95 final boolean hasCalibration = hasSpatial || ycalPresent; 110 96 111 97 if (hasCalibration) { … … 117 103 if (zcalPresent) cal.pixelDepth = zcal; 118 104 if (tcalPresent) cal.frameInterval = tcal; 119 if (!Double.isNaN(xPosition) && xcalPresent) {120 cal.xOrigin = xPosition * (1 / xcal);121 }122 if (!Double.isNaN(yPosition) && ycalPresent) {123 cal.yOrigin = yPosition * (1 / ycal);124 }125 if (!Double.isNaN(zPosition) && zcalPresent) {126 cal.zOrigin = zPosition * (1 / zcal);127 }128 105 imp.setCalibration(cal); 129 106 }
Note: See TracChangeset
for help on using the changeset viewer.