Changeset 1636 for branches/3.0-Beta2/components/rendering/src/omeis/providers/re/data/Plane2D.java

Timestamp:

06/13/07 10:20:37 (18 months ago)

Author:

callan

Message:

Merging trunk I/O fixes into the milestone:3.0-Beta2 branch:

• r1586:1587
  
• r1591:1592
  
• r1593:1594
  
• Manual merge of GreyScaleStrategy
  

Files:

• branches/3.0-Beta2/components/rendering/src/omeis/providers/re/data/Plane2D.java (modified) (2 diffs)

branches/3.0-Beta2/components/rendering/src/omeis/providers/re/data/Plane2D.java

@@ -132 +132 @@
      */
     public double getPixelValue(int x1, int x2) {
-        int offset = calculateOffset(x1, x2);
-
+        return getPixelValueDirect(calculateOffset(x1, x2));
+    }
+    
+    
+    /**
+     * Returns the pixel intensity value of the pixel at a given offset within
+     * the backing buffer. This method takes into account bytes per pixel. So
+     * the number of offsets is equal to the buffer size / 
+     * <code>bytesPerPixel</code>.
+     * 
+     * @param offset The relative offset (taking into account the number of 
+     * bytes per pixel) within the backing buffer.
+     * @return The intensity value.
+     */
+    public double getPixelValue(int offset)
+    {
+        return getPixelValueDirect(offset * bytesPerPixel);
+    }
+    
+    /**
+     * Returns the pixel intensity value of the pixel at a given offset within
+     * the backing buffer. This method does not take into account bytes per
+     * pixel.
+     * 
+     * @param offset The absolute offset within the backing buffer.
+     * @return The intensity value.
+     */
+    private double getPixelValueDirect(int offset)
+    {
         if (signed) {
             switch (javaType) {
@@ -160 +187 @@
     }
 
+    /**
+     * Returns <code>true</code> if the plane is an <code>XY-plane</code>,
+     * <code>false</code> otherwise.
+     * 
+     * @return See above.
+     */
+    public boolean isXYPlanar()
+    {
+        return (planeDef.getSlice() == PlaneDef.XY);
+    }
 }