/ - Diff - gvSIG raster - gvSIG

Revision 6315

     import java.awt.Graphics;
     import java.awt.Image;
     import java.awt.color.ColorSpace;
     import java.awt.color.ICC_ColorSpace;
     import java.awt.color.ICC_Profile;
     import java.awt.geom.AffineTransform;
     import java.awt.geom.NoninvertibleTransformException;
     import java.awt.image.BufferedImage;
     import org.apache.log4j.spi.AppenderAttachable;
     import org.cresques.cts.ICoordTrans;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.GeometryLocator;
-...
             Image image = null;
             if (this.colorInterpretation.isGray()){
                  // Draw buffer with gray scale
                 image = drawBuffer(graphics, bufferToDraw, filters);
                 image = drawGrayBuffer(graphics, bufferToDraw, transparency, filters);
             }else if ( this.colorInterpretation.isPalette() && this.colorTable != null ) {
                 // Draw buffer with table color
                 image = drawBuffer(graphics, bufferToDraw, colorTable, transparency, filters);
                 image = drawPaletteBuffer(graphics, bufferToDraw, colorTable, transparency, filters);
             } else if (this.colorInterpretation.isRGBA() || this.colorInterpretation.isRGB()
                 || this.colorInterpretation.isBGR()) {
                 // Draw RGB, RGBA or BGR buffer without color table
                 image = drawBuffer(graphics, bufferToDraw, colorInterpretation, transparency, filters);
                 image = drawRGBBuffer(graphics, bufferToDraw, colorInterpretation, transparency, filters);
             }else if (this.colorInterpretation.isHSL()) {
                 // Draw HSL buffer without color table
                 image = drawHSLBuffer(graphics, bufferToDraw, colorInterpretation, transparency, filters);
             }else if (this.colorInterpretation.isCMYK()) {
                 // Draw CMYK buffer without color table
                 image = drawCMYKBuffer(graphics, bufferToDraw, colorInterpretation, transparency, filters);
             }else if (this.colorInterpretation.isYCBCR()) {
                 // Draw YCBCR buffer without color table
                 image = drawYCBCRBuffer(graphics, bufferToDraw, colorInterpretation, transparency, filters);
+            }
             // Calculate where image has to be drawn
-...
             return heightEnvelope / dist1pixel;
+        }
         private Image drawBuffer(Graphics graphics, Buffer buffer,
         private Image drawRGBBuffer(Graphics graphics, Buffer buffer,
             ColorInterpretation colorInterpretation, Transparency transparency, FilterList filters) {
             BufferedImage image = null;
-...
                         alphaValue = alphaValue.byteValue() & 0xFF;
                         int newAlpha =
                             transparency.getTransparencyRangeAlpha(redValue.byteValue(),
                                 blueValue.byteValue(), greenValue.byteValue());
                                 greenValue.byteValue(), blueValue.byteValue());
                         alphaValue = getNewAlpha(alphaValue.intValue(), newAlpha);
                         // Apply general transparency
-...
             return image;
+        }
         private Image drawHSLBuffer(Graphics graphics, Buffer buffer,
             ColorInterpretation colorInterpretation,Transparency transparency,
             FilterList filters) {
             BufferedImage image = null;
             image =
                 new BufferedImage(buffer.getColumns(), buffer.getRows(),
                     BufferedImage.TYPE_INT_ARGB);
             int hueBandIndex = colorInterpretation.getBand(ColorInterpretation.HUE_BAND);
             int saturationBandIndex = colorInterpretation.getBand(ColorInterpretation.SATURATION_BAND);
             int lightBandIndex = colorInterpretation.getBand(ColorInterpretation.LIGHTNESS_BAND);
             Band hueBand = buffer.getBand(hueBandIndex);
             Band saturationBand = buffer.getBand(saturationBandIndex);
             Band lightBand = buffer.getBand(lightBandIndex);
             for (int i = 0; i < buffer.getRows(); i++) {
                 for (int j = 0; j < buffer.getColumns(); j++) {
                     Number hueValue = (Number) hueBand.get(i, j);
                     Number saturationValue = (Number) saturationBand.get(i, j);
                     Number lightValue = (Number) lightBand.get(i, j);
                     Number[] rgbaValues=ColorUtils.fromHSLtoRGBA(hueValue.floatValue(), saturationValue.floatValue(), lightValue.floatValue());
                     Integer alphaValue =rgbaValues[3].intValue();
                     if (transparency != null) {
                         // Apply defined transparency ranges
                         alphaValue = alphaValue.byteValue() & 0xFF;
                         int newAlpha =
                             transparency.getTransparencyRangeAlpha(rgbaValues[0].byteValue(),
                                 rgbaValues[1].byteValue(), rgbaValues[2].byteValue());
                         alphaValue = getNewAlpha(alphaValue.intValue(), newAlpha);
                         // Apply general transparency
                         int transparencyValue = transparency.getAlpha();
                         alphaValue = getNewAlpha(alphaValue.intValue(), transparencyValue);
+                    }
                     if (filters != null) {
                         // TODO Apply filters
+                    }
                     int intRGB = 0;
                     intRGB = ((alphaValue.byteValue() & 0xFF) << 24) | // alpha
                         ((rgbaValues[0].byteValue() & 0xFF) << 16) | // red
                         ((rgbaValues[1].byteValue() & 0xFF) << 8) | // green
                         ((rgbaValues[2].byteValue() & 0xFF) << 0); // blue
                     image.setRGB(j, i, intRGB);
+                }
+            }
             return image;
+        }
         private Image drawCMYKBuffer(Graphics graphics, Buffer buffer,
             ColorInterpretation colorInterpretation,Transparency transparency,
             FilterList filters) {
             BufferedImage image = null;
             image =
                 new BufferedImage(buffer.getColumns(), buffer.getRows(),
                     BufferedImage.TYPE_INT_ARGB);
             int cyanBandIndex = colorInterpretation.getBand(ColorInterpretation.CYAN_BAND);
             int magentaBandIndex = colorInterpretation.getBand(ColorInterpretation.MAGENTA_BAND);
             int yellowBandIndex = colorInterpretation.getBand(ColorInterpretation.YELLOW_BAND);
             int blackBandIndex = colorInterpretation.getBand(ColorInterpretation.BLACK_BAND);
             Band cyanBand = buffer.getBand(cyanBandIndex);
             Band magentaBand = buffer.getBand(magentaBandIndex);
             Band yellowBand = buffer.getBand(yellowBandIndex);
             Band blackBand = buffer.getBand(blackBandIndex);
             for (int i = 0; i < buffer.getRows(); i++) {
                 for (int j = 0; j < buffer.getColumns(); j++) {
                     Number cyanValue = (Number) cyanBand.get(i, j);
                     Number magentaValue = (Number) magentaBand.get(i, j);
                     Number yellowValue = (Number) yellowBand.get(i, j);
                     Number blackValue = (Number) blackBand.get(i, j);
                     Number[] rgbValues=ColorUtils.fromCMYKtoRGB(
                         cyanValue.floatValue(),
                         magentaValue.floatValue(),
                         yellowValue.floatValue(),
                         blackValue.floatValue()
                         );
                     Integer alphaValue =255;
                     if (transparency != null) {
                         // Apply defined transparency ranges
                         alphaValue = alphaValue.byteValue() & 0xFF;
                         int newAlpha =
                             transparency.getTransparencyRangeAlpha(rgbValues[0].byteValue(),
                                 rgbValues[1].byteValue(), rgbValues[2].byteValue());
                         alphaValue = getNewAlpha(alphaValue.intValue(), newAlpha);
                         // Apply general transparency
                         int transparencyValue = transparency.getAlpha();
                         alphaValue = getNewAlpha(alphaValue.intValue(), transparencyValue);
+                    }
                     if (filters != null) {
                         // TODO Apply filters
+                    }
                     int intRGB = 0;
                     intRGB = ((alphaValue.byteValue() & 0xFF) << 24) | // alpha
                         ((rgbValues[0].byteValue() & 0xFF) << 16) | // red
                         ((rgbValues[1].byteValue() & 0xFF) << 8) | // green
                         ((rgbValues[2].byteValue() & 0xFF) << 0); // blue
                     image.setRGB(j, i, intRGB);
+                }
+            }
             return image;
+        }
         private Image drawYCBCRBuffer(Graphics graphics, Buffer buffer,
             ColorInterpretation colorInterpretation,Transparency transparency,
             FilterList filters) {
             BufferedImage image = null;
             image =
                 new BufferedImage(buffer.getColumns(), buffer.getRows(),
                     BufferedImage.TYPE_INT_ARGB);
             int yIndex = colorInterpretation.getBand(ColorInterpretation.YCBCR_Y_BAND);
             int cbBandIndex = colorInterpretation.getBand(ColorInterpretation.YCBCR_CB_BAND);
             int crBandIndex = colorInterpretation.getBand(ColorInterpretation.YCBCR_CR_BAND);
             Band yBand = buffer.getBand(yIndex);
             Band cbBand = buffer.getBand(cbBandIndex);
             Band crBand = buffer.getBand(crBandIndex);
             for (int i = 0; i < buffer.getRows(); i++) {
                 for (int j = 0; j < buffer.getColumns(); j++) {
                     Number yValue = (Number) yBand.get(i, j);
                     Number cbValue = (Number) cbBand.get(i, j);
                     Number crValue = (Number) crBand.get(i, j);
                     Number[] rgbValues=ColorUtils.fromYCBCRtoRGB(
                         yValue.floatValue(),
                         cbValue.floatValue(),
                         crValue.floatValue()
                         );
                     Integer alphaValue =255;
                     if (transparency != null) {
                         // Apply defined transparency ranges
                         alphaValue = alphaValue.byteValue() & 0xFF;
                         int newAlpha =
                             transparency.getTransparencyRangeAlpha(rgbValues[0].byteValue(),
                                 rgbValues[1].byteValue(), rgbValues[2].byteValue());
                         alphaValue = getNewAlpha(alphaValue.intValue(), newAlpha);
                         // Apply general transparency
                         int transparencyValue = transparency.getAlpha();
                         alphaValue = getNewAlpha(alphaValue.intValue(), transparencyValue);
+                    }
                     if (filters != null) {
                         // TODO Apply filters
+                    }
                     int intRGB = 0;
                     intRGB = ((alphaValue.byteValue() & 0xFF) << 24) | // alpha
                         ((rgbValues[0].byteValue() & 0xFF) << 16) | // red
                         ((rgbValues[1].byteValue() & 0xFF) << 8) | // green
                         ((rgbValues[2].byteValue() & 0xFF) << 0); // blue
                     image.setRGB(j, i, intRGB);
+                }
+            }
             return image;
+        }
         /**
          * Method to draw gray buffers
          * @param graphics
-...
          * @param filters
          * @return
          */
         private Image drawBuffer(Graphics graphics, Buffer buffer, FilterList filters) {
         private Image drawGrayBuffer(Graphics graphics, Buffer buffer, Transparency transparency, FilterList filters) {
             BufferedImage image = null;
             image =
                 new BufferedImage(buffer.getColumns(), buffer.getRows(), BufferedImage.TYPE_INT_BGR);
                 new BufferedImage(buffer.getColumns(), buffer.getRows(), BufferedImage.TYPE_INT_ARGB);
             Band greyBand = buffer.getBand(0);
-...
                 for (int j = 0; j < buffer.getColumns(); j++) {
                     Number greyValue = (Number) greyBand.get(i, j);
                     Integer alphaValue =255;
                     if (transparency != null) {
                         // Apply defined transparency ranges
                         alphaValue = alphaValue.byteValue() & 0xFF;
                         int newAlpha =
                             transparency.getTransparencyRangeAlpha(greyValue.byteValue(),
                                 greyValue.byteValue(), greyValue.byteValue());
                         alphaValue = getNewAlpha(alphaValue.intValue(), newAlpha);
                         // Apply general transparency
                         int transparencyValue = transparency.getAlpha();
                         alphaValue = getNewAlpha(alphaValue.intValue(), transparencyValue);
+                    }
                     if (filters != null) {
                         // TODO Apply filters
+                    }
                     int intRGB =((greyValue.byteValue() & 0xFF) << 16 | // blue
                     int intARGB = ((alphaValue.byteValue()  & 0xFF) << 24) | // alpha
                         ((greyValue.byteValue() & 0xFF) << 16) | // red
                         ((greyValue.byteValue() & 0xFF) << 8) | // green
                         ((greyValue.byteValue() & 0xFF) << 0)); // red
                         ((greyValue.byteValue() & 0xFF) << 0); // blue
                     image.setRGB(j, i, intRGB);
                     image.setRGB(j, i, intARGB);
+                }
+            }
             return image;
+        }
         private Image drawBuffer(Graphics graphics, Buffer buffer, ColorTable colorTable,
         private Image drawPaletteBuffer(Graphics graphics, Buffer buffer, ColorTable colorTable,
             Transparency transparency, FilterList filters) {
             BufferedImage image =

     package org.gvsig.raster.lib.legend.impl;
     import java.awt.Color;
     /**
      * Utility class to color conversions
      * @author dmartinezizquierdo
+     *
      */
     public class ColorUtils {
         /**
+         *
          * @param y
          * @param cb
          * @param cr
          * @return the RGB values
          */
         public static Number[] fromYCBCRtoRGB(float y, float cb, float cr){
             Number[] rgbValues = new Number[3];
             int r = (int) (y + 1.40200 * (cr - 0x80));
             int g = (int) (y - 0.34414 * (cb - 0x80) - 0.71414 * (cr - 0x80));
             int b = (int) (y + 1.77200 * (cb - 0x80));
             rgbValues[0] = Math.max(0, Math.min(255, r));
             rgbValues[1] = Math.max(0, Math.min(255, g));
             rgbValues[2] = Math.max(0, Math.min(255, b));
             return rgbValues;
+        }
         /**
          * Convert CMYK values to RGB values
          * NOTE: Conversion maybe very inaccurate
+         *
          * @param cyan
          * @param magenta
          * @param yellow
          * @param black
          * @return the RGB values
          */
         public static Number[] fromCMYKtoRGB(float cyan, float magenta, float yellow, float black){
             //TODO: ICC profiles should be used to more precise conversion, as shown here:
             //http://stackoverflow.com/questions/3123574/how-to-convert-from-cmyk-to-rgb-in-java-correctly
             Number[] rgbValues = new Number[3];
             float colors = 255 - black;
             rgbValues[0] = colors * (255 - cyan) / 255;
             rgbValues[1] = colors * (255 - magenta) / 255;
             rgbValues[2] = colors * (255 - yellow) / 255;
             return rgbValues;
+        }
         /**
          *  Convert HSL values to RGBA values with a default alpha value of 1.
+         *
          *  @param h Hue is specified as degrees in the range 0 - 360.
          *  @param s Saturation is specified as a percentage in the range 1 - 100.
          *  @param l Lumanance is specified as a percentage in the range 1 - 100.
+         *
          *  @returns the RGBA values
          */
         public static Number[] fromHSLtoRGBA(float h, float s, float l)
+        {
             return fromHSLtoRGBA(h, s, l, 1.0f);
+        }
         /**
          *  Convert HSL values to RGBA values
+         *
          *  @param h Hue is specified as degrees in the range 0 - 360.
          *  @param s Saturation is specified as a percentage in the range 1 - 100.
          *  @param l Lumanance is specified as a percentage in the range 1 - 100.
          *  @param alpha  the alpha value between 0 - 1
+         *
          *  @returns the RGBA values
          */
         public static Number[] fromHSLtoRGBA(float h, float s, float l, float alpha)
+        {
             if (s <0.0f || s > 100.0f)
+            {
                 String message = "Color parameter outside of expected range - Saturation";
                 throw new IllegalArgumentException( message );
+            }
             if (l <0.0f || l > 100.0f)
+            {
                 String message = "Color parameter outside of expected range - Luminance";
                 throw new IllegalArgumentException( message );
+            }
             if (alpha <0.0f || alpha > 1.0f)
+            {
                 String message = "Color parameter outside of expected range - Alpha";
                 throw new IllegalArgumentException( message );
+            }
             //  Formula needs all values between 0 - 1.
             h = h % 360.0f;
             h /= 360f;
             s /= 100f;
             l /= 100f;
             float q = 0;
             if (l < 0.5)
                 q = l * (1 + s);
             else
                 q = (l + s) - (s * l);
             float p = 2 * l - q;
             float r = Math.max(0, HueToRGB(p, q, h + (1.0f / 3.0f)));
             float g = Math.max(0, HueToRGB(p, q, h));
             float b = Math.max(0, HueToRGB(p, q, h - (1.0f / 3.0f)));
             r = Math.min(r, 1.0f);
             g = Math.min(g, 1.0f);
             b = Math.min(b, 1.0f);
             Number[] rgbValues=new Number[4];
             rgbValues[0]=r;
             rgbValues[1]=g;
             rgbValues[2]=b;
             rgbValues[3]=alpha;
             return rgbValues;
+        }
         private static float HueToRGB(float p, float q, float h)
+        {
             if (h < 0) h += 1;
             if (h > 1 ) h -= 1;
             if (6 * h < 1)
+            {
                 return p + ((q - p) * 6 * h);
+            }
             if (2 * h < 1 )
+            {
                 return  q;
+            }
             if (3 * h < 2)
+            {
                 return p + ( (q - p) * 6 * ((2.0f / 3.0f) - h) );
+            }
             return p;
+        }
+    }

Also available in: Unified diff

Application: gvSIG desktop » gvSIG raster

Revision 6315