OpenMRS

Timestamp:

08/18/08 18:57:52 (5 months ago)

Author:

TorLye

Message:

gmapsimageviewer: Some cleaning up and removal of commented out code.

Files:

• openmrs-modules/gmapsimageviewer/src/org/openmrs/module/gmapsimageviewer/Pixel.java (modified) (3 diffs)

openmrs-modules/gmapsimageviewer/src/org/openmrs/module/gmapsimageviewer/Pixel.java

@@ -45 +45 @@
-        this.y = pixel.y;
-    }
-
-//    /**
-//     * Calculates the scale divisor. This is the number you must divide the
-//     * original image size by to obtain the image size at the given zoom level.
-//     * In other words, a number so that: (original width)/(scale divisor) =
-//     * width at the given zoom level.
-//     * <p>
-//     * Multiply an image size or pixel coordinate with this number to convert to
-//     * get an image size or pixel coordinate at the original zoom level. Divide
-//     * by this number to get the image size or pixel coordinate at the given
-//     * zoom level.
-//     * <p>
-//     * Because each zoom level shows the image at double the width and double
-//     * the height of the previous zoom level, the scale divisor is always a
-//     * power of two, i.e. 0.125, 0.25, 0.5, 1.0, 2.0, 4.0, 8.0 and so on.
-//     * 
-//     * @param originalSize the original size of the image
-//     * @param zoom the zoom level that the image is being displayed at
-//     * @return the scale exponent
-//     */
-//    public static double getScaleDivisor(Pixel originalSize, int zoom) {
-//        float scaledWidth = originalSize.x;
-//        float scaledHeight = originalSize.y;
-//        int scaleExponent = 0;
-//        while (scaledWidth > LEVEL_0_MAX_SIZE.x
-//                || scaledHeight > LEVEL_0_MAX_SIZE.y) {
-//            scaledWidth /= 2.0f;
-//            scaledHeight /= 2.0f;
-//            scaleExponent++;
-//        }
-//
-//        return Math.pow(2, scaleExponent - zoom);
-//    }
-    
+    /**
+     * Returns the zoom level where the image is displayed at 100%, or 1:1.
+     * @param originalSize
+     * @return
+     */
-    public static int getNullScaleZoomLevel(Pixel originalSize) {
-        float scaledWidth = originalSize.x;
@@ -95 +67 @@
-        return Math.pow(2, -(getNullScaleZoomLevel(originalSize) - zoom));
-    }
-
-//    /**
-//     * Calculates the level of subsampling that should be applied to the image
-//     * when decoding. This number can be given as a parameter to
-//     * IIOParam.setSourceSubsampling().
-//     * 
-//     * @param originalSize the original size of the image
-//     * @param zoom the zoom level that the image will be displayed at
-//     * @return the scale divisor
-//     */
-//    public static int getSubsampleLevel(Pixel originalSize, int zoom) {
-//
-//        double scaleDivisor = getScaleDivisor(originalSize, zoom);
-//
-//        if (scaleDivisor > 2)
-//            // scaleDivisor is always an integer when >= 1.
-//            return (int) scaleDivisor - 1;
-//        else
-//            return 1;
-//    }
-
-    /**
@@ -133 +85 @@
-        }
-    }
-
-//    /**
-//     * Converts pixel coordinates at the given zoom level so that they indicate
-//     * the same spot on the image, when the image is being displayed at its
-//     * original size.
-//     * 
-//     * @param zoom the zoom level
-//     * @param originalSize the original size of the image
-//     * @return the recomputed coordinates, or null if the parameters are invalid
-//     */
-//    public Pixel convertFromZoomlevelToOriginalSize(int zoom, Pixel originalSize) {
-//        if (zoom < 0 || originalSize == null)
-//            return null;
-//        double scaleDivisor = getScaleDivisor(originalSize, zoom);
-//        return convertFromZoomlevelToOriginalSize(scaleDivisor);
-//    }
-//
-//    /**
-//     * Converts pixel coordinates at the given zoom level so that they indicate
-//     * the same spot on the image, when the image is being displayed at its
-//     * original size.
-//     * 
-//     * @param scaleDivisor the scale divisor 
-//     * @return the recomputed coordinates
-//     */
-//    public Pixel convertFromZoomlevelToOriginalSize(double scaleDivisor) {
-//        return new Pixel((int) Math.round(x * scaleDivisor), (int) Math.round(y
-//                * scaleDivisor));
-//    }
-
-//    /**
-//     * Converts pixel coordinates relative to the original image size so that
-//     * they indicate the same spot on the image, when the image is being
-//     * displayed at the given zoom level.
-//     * 
-//     * @param zoom the zoom level
-//     * @param originalSize the original size of the image
-//     * @return the recomputed coordinates, or null if the parameters are invalid
-//     */
-//    public Pixel convertFromOriginalSizeToZoomlevel(int zoom, Pixel originalSize) {
-//        if (zoom < 0 || originalSize == null)
-//            return null;
-//        double scaleDivisor = getScaleDivisor(originalSize, zoom);
-//        return convertFromOriginalSizeToZoomlevel(scaleDivisor);
-//    }
-//
-//    /**
-//     * Converts pixel coordinates relative to the original image size so that
-//     * they indicate the same spot on the image, when the image is being
-//     * displayed at the given zoom level.
-//     * 
-//     * @param scaleDivisor the scale divisor 
-//     * @return the recomputed coordinates
-//     */
-//    public Pixel convertFromOriginalSizeToZoomlevel(double scaleDivisor) {
-//        return new Pixel((int) Math.round(x / scaleDivisor), (int) Math.round(y
-//                / scaleDivisor));
-//    }
-}