Revision 10977

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrAnnotation.java
98 98

  
99 99
	/**
100 100
	 * @see com.iver.cit.gvsig.fmap.layers.LayerOperations#draw(java.awt.image.BufferedImage,
101
	 *      java.awt.Graphics2D, ISymbol)
101
	 *      ISymbol)
102 102
	 */
103 103
	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
104 104
			Cancellable cancel, double scale) throws ReadDriverException {
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/RasterAdapter.java
112 112
	}
113 113

  
114 114
	/**
115
	 * @see com.iver.cit.gvsig.fmap.layers.LayerOperations#draw(java.awt.image.BufferedImage, java.awt.Graphics2D, ISymbol)
115
	 * @see com.iver.cit.gvsig.fmap.layers.LayerOperations#draw(java.awt.image.BufferedImage, ISymbol)
116 116
	 */
117 117
	public void draw(BufferedImage image, Graphics2D g, ViewPort vp, Cancellable cancel) throws DriverIOException {
118 118
		((RasterDriver) driver).draw(image,g, vp);
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/MapContext.java
585 585

  
586 586
	/**
587 587
	 * @see com.iver.cit.gvsig.fmap.operations.LayerOperations#draw(java.awt.image.BufferedImage,
588
	 *      java.awt.Graphics2D, ISymbol)
588
	 *      ISymbol)
589 589
	 */
590 590
	public void draw(BufferedImage image, Graphics2D g, Cancellable cancel,
591 591
			double scale) throws ReadDriverException {
......
717 717

  
718 718
	/**
719 719
	 * @see com.iver.cit.gvsig.fmap.operations.LayerOperations#draw(java.awt.image.BufferedImage,
720
	 *      java.awt.Graphics2D, ISymbol)
720
	 *      ISymbol)
721 721
	 */
722 722
	public void draw(BufferedImage image, Graphics2D g, double scale)
723 723
			throws ReadDriverException {
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/RasterDriver.java
85 85
	public void setTransparency(int trans);
86 86

  
87 87
	/**
88
	 * @see com.iver.cit.gvsig.fmap.layers.LayerOperations#draw(java.awt.image.BufferedImage, java.awt.Graphics2D, ISymbol)
88
	 * @see com.iver.cit.gvsig.fmap.layers.LayerOperations#draw(java.awt.image.BufferedImage, ISymbol)
89 89
	 */
90 90
	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort)
91 91
			throws DriverIOException;
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/BasicFileRasterDriver.java
61 61

  
62 62
	/**
63 63
	 * @see com.iver.cit.gvsig.fmap.layers.LayerOperations#draw(java.awt.image.BufferedImage,
64
	 * 		java.awt.Graphics2D, ISymbol)
64
	 * 		ISymbol)
65 65
	 */
66 66
	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort)
67 67
		throws DriverIOException;
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/DefaultStrategy.java
144 144
	/**
145 145
	 * @throws ReadDriverException
146 146
	 * @see com.iver.cit.gvsig.fmap.operations.LayerOperations#draw(java.awt.image.BufferedImage,
147
	 * 		java.awt.Graphics2D, ISymbol)
147
	 * 		ISymbol)
148 148
	 */
149 149
	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
150 150
		Cancellable cancel) throws ReadDriverException {
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/ShpStrategy.java
100 100

  
101 101
	/**
102 102
	 * @see com.iver.cit.gvsig.fmap.operations.LayerOperations#draw(java.awt.image.BufferedImage,
103
	 *      java.awt.Graphics2D, ISymbol)
103
	 *      ISymbol)
104 104
	 */
105 105
	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
106 106
			Cancellable cancel) throws ReadDriverException {
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/styles/ILabelStyle.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.2  2007-03-09 11:20:56  jaume
46
* Revision 1.3  2007-03-29 16:02:01  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.2  2007/03/09 11:20:56  jaume
47 50
* Advanced symbology (start committing)
48 51
*
49 52
* Revision 1.1.2.1  2007/02/15 16:23:44  jaume
......
56 59
*/
57 60
package com.iver.cit.gvsig.fmap.core.styles;
58 61

  
62
import java.awt.Graphics2D;
63
import java.awt.Shape;
59 64
import java.awt.geom.AffineTransform;
60 65
import java.awt.geom.Point2D;
61 66

  
62
import com.iver.cit.gvsig.fmap.core.symbols.PictureMarkerSymbol;
63

  
64 67
/**
65 68
 * Defines the style that a Label symbol can contain which typically define
66 69
 * a background of the label as an Image, the texts that the label holds
......
85 88
	 * Document me!
86 89
	 * @return
87 90
	 */
88
	public PictureMarkerSymbol getBackground();
91
	public void drawBackground(Graphics2D g, Shape shp);
89 92

  
90 93
	/**
91 94
	 * Returns an array of points whose length is getFieldCount()-1 or less
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/styles/SimpleLabelStyle.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.2  2007-03-09 11:20:56  jaume
46
* Revision 1.3  2007-03-29 16:02:01  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.2  2007/03/09 11:20:56  jaume
47 50
* Advanced symbology (start committing)
48 51
*
49 52
* Revision 1.1.2.2  2007/02/15 16:23:44  jaume
......
58 61

  
59 62
import java.awt.Graphics2D;
60 63
import java.awt.Rectangle;
64
import java.awt.Shape;
61 65
import java.awt.geom.AffineTransform;
62 66
import java.awt.geom.Point2D;
63 67

  
......
91 95
		return text;
92 96
	}
93 97

  
94
	public PictureMarkerSymbol getBackground() {
95
		return backGround;
96
	}
97

  
98 98
	public Point2D[] getTextPositions(AffineTransform at) {
99 99
		// TODO Implement it
100 100
		throw new Error("Not yet implemented!");
......
129 129
		throw new Error("Not yet implemented!");
130 130

  
131 131
	}
132

  
133
	public void drawBackground(Graphics2D g, Shape shp) {
134
		// no background
135
	}
132 136
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/v02/FArrowSymbol.java
276 276
			rect.x + rect.width, rect.y + (rect.height / 2));
277 277

  
278 278
		shp = new FPolyline2D(line);
279
		draw(g, mT, shp);
279
		draw(g, scaleInstance, shp);
280 280
	}
281 281

  
282 282

  
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/MultiLayerMarkerSymbol.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.3  2007-03-26 14:26:02  jaume
46
* Revision 1.4  2007-03-29 16:02:01  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.3  2007/03/26 14:26:02  jaume
47 50
* implemented Print
48 51
*
49 52
* Revision 1.2  2007/03/09 11:20:57  jaume
......
73 76
import com.iver.cit.gvsig.fmap.core.FShape;
74 77
import com.iver.cit.gvsig.fmap.core.IGeometry;
75 78
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
76
import com.iver.cit.gvsig.fmap.core.styles.ILabelStyle;
77 79
import com.iver.utiles.XMLEntity;
78 80

  
79 81
public class MultiLayerMarkerSymbol extends AbstractSymbol implements IMarkerSymbol, IMultiLayerSymbol {
......
250 252
	}
251 253

  
252 254
	public void addLayer(ISymbol newLayer, int layerIndex) throws IndexOutOfBoundsException {
253
		if (newLayer == null || newLayer instanceof ILabelStyle) return; // null or symbols that are styles are not allowed
255
		if (newLayer == null )/*|| newLayer instanceof ILabelStyle)*/ return; // null or symbols that are styles are not allowed
254 256

  
255 257
		selectionSymbol = null; /* forces the selection symbol to be re-created
256 258
		 						 * next time it is required
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/ITextSymbol.java
2 2

  
3 3
import java.awt.Color;
4 4
import java.awt.Font;
5
import java.awt.Graphics2D;
5 6

  
7
import com.iver.cit.gvsig.fmap.core.FShape;
8
/**
9
 * Represents a ISymbol that draws a text.
10
 * @author jaume
11
 *
12
 */
6 13
public interface ITextSymbol extends ISymbol {
7

  
14
	/**
15
	 * Establishes the font that will be used to render this ITextSymbol.
16
	 * @param font
17
	 */
8 18
	public abstract void setFont(Font font);
9 19

  
20
	/**
21
	 * Returns the currently set font.
22
	 * @return Font
23
	 */
10 24
	public abstract Font getFont();
11 25

  
26
	/**
27
	 * Returns the currently color set to be applied to the text
28
	 * @return Color
29
	 */
12 30
	public abstract Color getTextColor();
13 31

  
32
	/**
33
	 * Sets the color of the text
34
	 * @param color
35
	 */
14 36
	public abstract void setTextColor(Color color);
15 37

  
38
	/**
39
	 * Returns the text contained by this symbol
40
	 * @return
41
	 * @deprecated ?do i need it?
42
	 */
16 43
	public abstract String getText();
17 44

  
45
	/**
46
	 * Sets the text to be rendered by this symbol
47
	 * @param text, a String
48
	 */
18 49
	public abstract void setText(String text);
19 50

  
51
	/**
52
	 * Sets the font size currently set to this symbol
53
	 * @param d
54
	 */
20 55
	public abstract void setFontSize(double d);
21 56

  
57
	/**
58
	 * Computes a FShape wrapping the text to be applied
59
	 * @param g
60
	 * @param targetSymbolShape
61
	 * @return
62
	 */
63
	public abstract FShape getTextShape(Graphics2D g, FShape targetSymbolShape);
64

  
22 65
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/MultiLayerFillSymbol.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.4  2007-03-26 14:25:29  jaume
46
* Revision 1.5  2007-03-29 16:02:01  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.4  2007/03/26 14:25:29  jaume
47 50
* implemented Print
48 51
*
49 52
* Revision 1.3  2007/03/13 16:58:36  jaume
......
78 81
import com.iver.cit.gvsig.fmap.core.FShape;
79 82
import com.iver.cit.gvsig.fmap.core.IGeometry;
80 83
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
81
import com.iver.cit.gvsig.fmap.core.styles.ILabelStyle;
82 84
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
83 85
import com.iver.utiles.XMLEntity;
84 86

  
......
252 254
	}
253 255

  
254 256
	public void addLayer(ISymbol newLayer, int layerIndex) throws IndexOutOfBoundsException {
255
		if (newLayer == null || newLayer instanceof ILabelStyle) return; // null or symbols that are styles are not allowed
257
		if (newLayer == null )/*|| newLayer instanceof ILabelStyle)*/ return; // null or symbols that are styles are not allowed
256 258

  
257 259
		selectionSymbol = null; /* forces the selection symbol to be re-created
258 260
		 						 * next time it is required
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/SimpleTextSymbol.java
175 175
		this.rotation = rotation;
176 176
	}
177 177

  
178
	public FShape getTextShape(Graphics2D g, FShape targetSymbolShape ) {
179
		// TODO Implement it
180
		throw new Error("Not yet implemented!");
181

  
182
	}
183

  
178 184
}

Also available in: Unified diff