Revision 1148

View differences:

org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/test/java/org/gvsig/raster/app/extension/TestInfoByPointPanel.java
18 18
			desc.getTabs().addChangeListener(this);
19 19
			InfoByPointDataModel model = desc.getInfoByPointDataModel();
20 20
			model.setARGB(0, 255, 125, 110);
21
			model.setCMYK(54, 254, 121, 190);
21
			model.setCMYK(new double[]{54, 254, 121, 190});
22 22
			model.setHSL(234.3, 125.5, 110.3);
23 23
			model.setBandValues(new double[]{4.53, 2.24, 67.7, 67.87});
24 24
			model.setNumberOfBands(4);
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/InfoByRasterPointExtension.java
19 19
import org.gvsig.raster.fmap.layers.FLyrRaster;
20 20
import org.gvsig.raster.tools.app.basic.tool.infobypoint.gui.InfoByPointDataModel;
21 21
import org.gvsig.raster.tools.app.basic.tool.infobypoint.viewtool.InfoByPixelPointListener;
22
import org.gvsig.raster.tools.app.basic.tool.multiresolution.ResolutionLevelListener;
23 22

  
24 23
public class InfoByRasterPointExtension extends Extension {
25 24
	
......
49 48
			mapCtrl.setTool("infoByRasterPoint");
50 49
			
51 50
			model.setARGB(0, 255, 125, 110);
52
			model.setCMYK(54, 254, 121, 190);
51
			model.setCMYK(new double[]{54, 254, 121, 190});
53 52
			model.setHSL(234.3, 125.5, 110.3);
54 53
			model.setBandValues(new double[]{4.53, 2.24, 67.7, 67.87});
55 54
			model.setNumberOfBands(4);
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/gui/InfoByPointDataModel.java
33 33
	public Point2D             worldPoint              = new Point2D.Double();
34 34
	public Point2D             viewPoint               = new Point2D.Double();
35 35
	public int[]               argb                    = new int[4];
36
	public int[]               cmyk                    = new int[4];
36
	public double[]            cmyk                    = new double[4];
37 37
	public double[]            hsl                     = new double[3];
38 38
	public List<String>        layers                  = new ArrayList<String>();
39 39
	
......
62 62
		argb[3] = b;
63 63
	}
64 64
	
65
	public void setCMYK(int c, int m, int i, int k) {
66
		cmyk[0] = c;
67
		cmyk[1] = m;
68
		cmyk[2] = i;
69
		cmyk[3] = k;
65
	public void setCMYK(double[] cmyk) {
66
		this.cmyk = cmyk;
70 67
	}
71 68
	
72 69
	public void setHSL(double h, double s, double l) {
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/viewtool/InfoByPixelPointListener.java
25 25
import java.awt.image.BufferedImage;
26 26

  
27 27
import org.gvsig.andami.PluginServices;
28
import org.gvsig.fmap.dal.coverage.RasterLocator;
29
import org.gvsig.fmap.dal.coverage.RasterManager;
30
import org.gvsig.fmap.dal.coverage.util.ColorConversion;
28 31
import org.gvsig.fmap.mapcontrol.MapControl;
29 32
import org.gvsig.fmap.mapcontrol.tools.Events.PointEvent;
30 33
import org.gvsig.raster.tools.app.basic.tool.infobypoint.gui.InfoByPointDataModel;
......
38 41
 * @author BorSanZa - Borja S?nchez Zamorano (borja.sanchez@iver.es)
39 42
 */
40 43
public class InfoByPixelPointListener extends SelectImageListImpl {
41
	private InfoByPointDataModel model = null;
44
	private RasterManager            rManager            = RasterLocator.getManager();
45
	private InfoByPointDataModel     model               = null;
46
	private ColorConversion          conv                = null;
42 47
	
43 48
	/**
44 49
	 * Contructor
......
47 52
	public InfoByPixelPointListener(MapControl mapCtrl, InfoByPointDataModel model) {
48 53
		super(mapCtrl);
49 54
		this.model = model;
55
		conv = rManager.getColorConversion();
50 56
	}
51 57

  
52 58
	/* (non-Javadoc)
......
68 74
		int a = image.getTransparency();
69 75
		
70 76
		model.setARGB(a, r, g, b);
77
		double[] cmyk = conv.RGBtoCMYK(r & 0xff, g & 0xff, b & 0xff, 1D);
78
		model.setCMYK(cmyk);
79
		
80
		double[] hsl = conv.RGBtoHSL(r & 0xff, g & 0xff, b & 0xff);
81
		hsl[0] = (int)(255.0 * hsl[0] / 360.0 + 0.5);
82
		hsl[2] = (int) (hsl[2] * 255. + 0.5);
83
		hsl[1] = (int) (hsl[1] * 255. + 0.5);
84
		model.setHSL(hsl[0], hsl[1], hsl[2]);
71 85
	}
72 86
}

Also available in: Unified diff