Revision 7659 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/AnnotationStrategy.java
AnnotationStrategy.java | ||
---|---|---|
21 | 21 |
import com.iver.cit.gvsig.fmap.core.FShape; |
22 | 22 |
import com.iver.cit.gvsig.fmap.core.GeneralPathX; |
23 | 23 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
24 |
import com.iver.cit.gvsig.fmap.core.ISymbol; |
|
24 | 25 |
import com.iver.cit.gvsig.fmap.core.ShapeFactory; |
25 | 26 |
import com.iver.cit.gvsig.fmap.core.v02.FGraphicUtilities; |
26 | 27 |
import com.iver.cit.gvsig.fmap.core.v02.FLabel; |
... | ... | |
70 | 71 |
} |
71 | 72 |
/** |
72 | 73 |
* @see com.iver.cit.gvsig.fmap.operations.LayerOperations#draw(java.awt.image.BufferedImage, |
73 |
* java.awt.Graphics2D, FStyle2D)
|
|
74 |
* java.awt.Graphics2D, ISymbol)
|
|
74 | 75 |
*/ |
75 | 76 |
public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort, |
76 | 77 |
Cancellable cancel) throws DriverException { |
... | ... | |
83 | 84 |
FBitSet bitSet=lyrAnnotation.getRecordset().getSelection(); |
84 | 85 |
|
85 | 86 |
boolean inPixels=lyrAnnotation.isInPixels(); |
86 |
FSymbol theSymbol = l.getDefaultSymbol(); |
|
87 |
FSymbol theSymbol = (FSymbol) l.getDefaultSymbol();
|
|
87 | 88 |
theSymbol.setFontSizeInPixels(inPixels); |
88 | 89 |
System.out.println("Dibujando Anotaciones..."); |
89 | 90 |
this.viewPort=viewPort;//capa.getFMap().getViewPort(); |
... | ... | |
138 | 139 |
if (XRectangle2D.intersectInclusive(elExtent, r)) |
139 | 140 |
{ |
140 | 141 |
FPoint2D p=new FPoint2D(viewPort.fromMapPoint(new Point2D.Double(r.getX(),r.getY()))); |
141 |
FGraphicUtilities.DrawShape(g,at,p,symbolPoint); |
|
142 |
symbolPoint.draw(g, at, p); |
|
143 |
// FGraphicUtilities.DrawShape(g,at,p,symbolPoint); |
|
142 | 144 |
if (bitSet.get(numOriginal)) { |
143 | 145 |
FGraphicUtilities.DrawAnnotation(g, at, theSymbol, theLabel,metrics,true); |
144 | 146 |
}else{ |
... | ... | |
169 | 171 |
} |
170 | 172 |
/** |
171 | 173 |
* @see com.iver.cit.gvsig.fmap.operations.LayerOperations#draw(java.awt.image.BufferedImage, |
172 |
* java.awt.Graphics2D, FStyle2D)
|
|
174 |
* java.awt.Graphics2D, ISymbol)
|
|
173 | 175 |
*/ |
174 | 176 |
public void print(BufferedImage image, Graphics2D g, ViewPort viewPort, |
175 | 177 |
Cancellable cancel) throws DriverException { |
... | ... | |
182 | 184 |
FBitSet bitSet=lyrAnnotation.getRecordset().getSelection(); |
183 | 185 |
|
184 | 186 |
boolean inPixels=lyrAnnotation.isInPixels(); |
185 |
FSymbol theSymbol = l.getDefaultSymbol(); |
|
187 |
FSymbol theSymbol = (FSymbol) l.getDefaultSymbol();
|
|
186 | 188 |
theSymbol.setFontSizeInPixels(inPixels); |
187 | 189 |
this.viewPort=viewPort;//capa.getFMap().getViewPort(); |
188 | 190 |
AffineTransform at=viewPort.getAffineTransform(); |
Also available in: Unified diff