Revision 250

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/UniqueSymbolLegend.java
1 1
package com.iver.cit.gvsig.fmap.rendering;
2 2

  
3

  
3 4
import org.geotools.renderer.style.Style2D;
4 5

  
6
import com.iver.cit.gvsig.fmap.rendering.styling.FStyle2D;
5 7

  
6 8

  
9

  
7 10
public class UniqueSymbolLegend implements Legend {
8 11

  
9
	private Style2D symbol;
12
	private FStyle2D symbol = new FStyle2D();
10 13
	private int labelField = -1;
11 14
	
12 15
	public UniqueSymbolLegend(Style2D style){
13
		this.symbol = style;
16
		symbol.setStyle2D(style);
14 17
	}
15 18
	
16 19
	/**
17 20
	 * @see com.iver.cit.gvsig.fmap.rendering.Legend#getSymbol(java.lang.Object)
18 21
	 */
19
	public Style2D getSymbol(Object value) {
22
	public FStyle2D getSymbol(Object value) {
20 23
		return symbol;
21 24
	}
22 25

  
23 26
	/**
24
	 * @see com.iver.cit.gvsig.fmap.rendering.Legend#setDefaultSymbol(org.geotools.renderer.style.Style2D)
27
	 * @see com.iver.cit.gvsig.fmap.rendering.Legend#setDefaultSymbol(FStyle2D)
25 28
	 */
26
	public void setDefaultSymbol(Style2D s) {
29
	public void setDefaultSymbol(FStyle2D s) {
27 30
		symbol = s;
28 31
	}
29 32

  
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/LegendFactory.java
2 2

  
3 3
package com.iver.cit.gvsig.fmap.rendering;
4 4

  
5
import java.awt.AlphaComposite;
5 6
import java.awt.BasicStroke;
6 7
import java.awt.Color;
7 8

  
......
17 18
	
18 19
	static{
19 20
		DEFAULT_LINE_SYMBOL.setContour(Color.BLUE);
21
		DEFAULT_LINE_SYMBOL.setContourComposite(AlphaComposite.DstOver);
20 22
		BasicStroke stroke = new BasicStroke(1);
21 23
		DEFAULT_LINE_SYMBOL.setStroke(stroke);
22 24
	}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/Legend.java
2 2

  
3 3
package com.iver.cit.gvsig.fmap.rendering;
4 4

  
5
import org.geotools.renderer.style.Style2D;
6 5

  
6
import com.iver.cit.gvsig.fmap.rendering.styling.FStyle2D;
7

  
7 8
public interface Legend {
8 9
    /**
9 10
     * Devuelve el s?mbolo asociado al objeto que se pasa como par?metro. Si se pasa null se devuelve el s?mbolo por defecto. En un Legend de s?mbolo ?nico siempre se devuelve dicho s?mbolo 
10 11
     */
11
    Style2D getSymbol(Object value);
12
    FStyle2D getSymbol(Object value);
12 13

  
13 14
    /**
14 15
     * Establece el s?mbolo por defecto del Legend. En un Legend de s?mbolo ?nico, el s?mbolo se establece invocando este m?todo 
15 16
     */
16
    void setDefaultSymbol(Style2D s);
17
    void setDefaultSymbol(FStyle2D s);
17 18

  
18 19
    /**
19 20
     * Obtiene el ?ndice del campo que sirve de etiquetado o -1 si no ha sido etiquetado 
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/DefaultStrategy.java
13 13
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver;
14 14
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
15 15
import com.iver.cit.gvsig.fmap.layers.VectorialAdapter;
16
import com.iver.cit.gvsig.fmap.operations.Cancellable;
17 16
import com.iver.cit.gvsig.fmap.operations.QueriedPoint;
18 17
import com.iver.cit.gvsig.fmap.rendering.Legend;
18
import com.iver.cit.gvsig.fmap.rendering.styling.FStyle2D;
19 19

  
20 20

  
21 21
/**
......
103 103
			Legend l = capa.getLegend(geom.getType());
104 104

  
105 105
			if (geom.intersects(extent)) {
106
				geom.draw(g, viewPort, l.getSymbol(null));
106
				FStyle2D symbol = l.getSymbol(null);
107
				geom.draw(g, viewPort, symbol.getStyle2D());
107 108
			}
108 109
		}
109 110

  
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/ShpStrategy.java
9 9
import java.awt.geom.Rectangle2D;
10 10
import java.awt.image.BufferedImage;
11 11
import java.io.IOException;
12
import java.util.BitSet;
12 13

  
13 14
import org.geotools.renderer.style.Style2D;
14 15

  
......
21 22
import com.iver.cit.gvsig.fmap.layers.VectorialAdapter;
22 23
import com.iver.cit.gvsig.fmap.operations.Cancellable;
23 24
import com.iver.cit.gvsig.fmap.rendering.Legend;
25
import com.iver.cit.gvsig.fmap.rendering.styling.FStyle2D;
24 26

  
25 27

  
26 28
/**
......
71 73
					}else{
72 74
						g.setPaint(Color.black);
73 75
					} */
74
					Style2D symbol = l.getSymbol(null); // Cambiar esto
76
					FStyle2D symbol = l.getSymbol(null); // Cambiar esto
75 77
		            if ((bounds.getHeight() > viewPort.getDist1pixel()) ||
76 78
		                    (bounds.getWidth() > viewPort.getDist1pixel()))
77
		            {					
79
		            {	
80
		            	Style2D style2D = symbol.getStyle2D();
78 81
		            	geom = driver.getShape(i);
79
		            	geom.draw(g, viewPort, symbol);
82
		            	geom.draw(g, viewPort, style2D);
80 83
		            }
81 84
	                else
82 85
	                {
......
93 96
	                        if ((pixY > 0) && (pixY < image.getHeight())) {
94 97
	                            // theSymbol = getAssociatedSymbol(numReg);
95 98
	                            image.setRGB(pixX, pixY,
96
	                                Color.GRAY.getRGB());
99
	                                symbol.getRgb());
97 100
	                        }
98 101
	                    }
99 102
	                }	

Also available in: Unified diff