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/web/src/org/openmrs/module/gmapsimageviewer/web/servlet/ImageTileServlet.java (modified) (6 diffs)

openmrs-modules/gmapsimageviewer/web/src/org/openmrs/module/gmapsimageviewer/web/servlet/ImageTileServlet.java

@@ -104 +104 @@
-            return;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        Pixel originalSize = new Pixel(image.getWidth(), image.getHeight());
-
@@ -134 +116 @@
-         */
-        int colorFormat = BufferedImage.TYPE_INT_RGB;
-        // if (reader.getImageTypes(0).next().getColorModel().getColorSpace()
-        // .getType() == ColorSpace.TYPE_GRAY)
-        // colorFormat = BufferedImage.TYPE_BYTE_GRAY;
-        if (image.getType() == BufferedImage.TYPE_BYTE_GRAY)
-            colorFormat = BufferedImage.TYPE_BYTE_GRAY;
-
-        // double scaleDivisor = Pixel.getScaleDivisor(originalSize, zoom);
-        double scaleMultiplier = Pixel.getScaleMultiplier(originalSize, zoom);
-
-        // The size of the full image at the requested zoom level
-        // Pixel currentZoomLevelSize = originalSize
-        // .convertFromOriginalSizeToZoomlevel(scaleDivisor);
-
-        // int originalZoomLevelTileSize = (int) (IMAGE_TILE_SIZE *
-        // scaleDivisor);
-        int originalZoomLevelTileSize = (int) (IMAGE_TILE_SIZE / scaleMultiplier);
-
@@ -166 +138 @@
-        }
-
-        // int subsampleLevel = Pixel.getSubsampleLevel(originalSize, zoom);
-        // int subsampleLevel = 1;
-
-        // int tileReadSize = originalZoomLevelTileSize / subsampleLevel;
-
-        // log.info("gmapsimageviewer: Reading " + originalZoomLevelTileSize +
-        // "x"
-        // + originalZoomLevelTileSize + " image, but subsampling by "
-        // + subsampleLevel + " giving a resulting size of "
-        // + tileReadSize + "x" + tileReadSize);
-
-        // Create image tile
-        // BufferedImage bufferedImageTile = new BufferedImage(tileReadSize,
-        // tileReadSize, colorFormat);
-        BufferedImage bufferedImageTile = new BufferedImage(IMAGE_TILE_SIZE,
-                IMAGE_TILE_SIZE, colorFormat);
@@ -196 +154 @@
-        }
-
-        /*
-         * ImageReadParam param = reader.getDefaultReadParam();
-         * param.setSourceRegion(new Rectangle(tilePosition.x, tilePosition.y,
-         * originalZoomLevelTileSize, originalZoomLevelTileSize));
-         * param.setSourceSubsampling(subsampleLevel, subsampleLevel, 0, 0);
-         * param.setDestination(bufferedImageTile); reader.read(0, param);
-         * reader.dispose();
-         */
-
-        int interpolationType = AffineTransformOp.TYPE_NEAREST_NEIGHBOR;
-        String scalingQualityProperty = Context.getAdministrationService()
@@ -214 +163 @@
-            else if (scalingQuality == 2)
-                interpolationType = AffineTransformOp.TYPE_BICUBIC;
-
+
+
-        }
-
@@ -223 +173 @@
-                interpolationType), 0, 0);
-        graphics.dispose();
-
-        // Scale image
-        /*
-         * BufferedImage scaledBufferedImage = new
-         * BufferedImage(IMAGE_TILE_SIZE, IMAGE_TILE_SIZE,
-         * bufferedImageTile.getType()); Graphics2D graphics =
-         * scaledBufferedImage.createGraphics();
-         * graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-         * RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
-         * graphics.drawImage(bufferedImageTile, 0, 0, IMAGE_TILE_SIZE,
-         * IMAGE_TILE_SIZE, null); graphics.dispose();
-         */
-
-        // Write the result to response