Revision 9524 branches/piloto3d/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/FGeometry.java

View differences:

FGeometry.java
60 60

  
61 61
import com.iver.cit.gvsig.fmap.ViewPort;
62 62
import com.iver.cit.gvsig.fmap.core.v02.FConverter;
63
import com.iver.cit.gvsig.fmap.core.v02.FGraphicUtilities;
64 63
import com.iver.cit.gvsig.fmap.core.v02.FLabel;
65
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
66 64
import com.iver.cit.gvsig.fmap.rendering.styling.FStyle2D;
67 65
import com.vividsolutions.jts.geom.Geometry;
68 66

  
......
128 126
	 * @param vp ViewPort.
129 127
	 * @param symbol S?mbolo.
130 128
	 */
131
	public void draw(Graphics2D g, ViewPort vp, FSymbol symbol) {
129
	public void draw(Graphics2D g, ViewPort vp, ISymbol symbol) {
132 130
		// OJO CON LA PRECISION. DEBERIAMOS USAR: ((GeneralPathX) shp.m_Polyline).transform(mT);
133 131
		// O HACER UNA FUNCION DE TRANSFORMACI?N QUE USE LOS DOUBLES DEL
134 132
		// SHAPE
135 133
		// Shape shpTrans = vp.getAffineTransform().createTransformedShape(shp);
136 134
		transform(vp.getAffineTransform());
137
		FGraphicUtilities.DrawShape(g, vp.getAffineTransform(), shp, symbol);
135
		symbol.draw(g, vp.getAffineTransform(), shp);
136
		// FGraphicUtilities.DrawShape(g, vp.getAffineTransform(), shp, symbol);
138 137
	}
139 138

  
140 139
    /* (non-Javadoc)
141 140
     * @see com.iver.cit.gvsig.fmap.core.IGeometry#drawInts(java.awt.Graphics2D, com.iver.cit.gvsig.fmap.ViewPort, com.iver.cit.gvsig.fmap.core.v02.FSymbol)
142 141
     */
143
    public void drawInts(Graphics2D g, ViewPort vp, FSymbol symbol) {
144
        FShape decimatedShape = FConverter.transformToInts(this, vp.getAffineTransform());
145
        FGraphicUtilities.DrawShape(g, vp.getAffineTransform(), decimatedShape, symbol);
142
    public void drawInts(Graphics2D g, ViewPort vp, ISymbol symbol) {
143
    	try
144
    	{
145
    		FShape decimatedShape = FConverter.transformToInts(this, vp.getAffineTransform());
146
    		symbol.draw(g, vp.getAffineTransform(), decimatedShape);
147
    	}
148
    	catch (Exception e)
149
    	{
150
    		e.printStackTrace();
151
    	}
152
        // FGraphicUtilities.DrawShape(g, vp.getAffineTransform(), decimatedShape, symbol);
146 153
    }
147 154

  
148 155
	/**
......
173 180
		// return shp.getBounds2D();
174 181
		return bounds2D;
175 182
	}
176
	
183

  
177 184
	public Rectangle2D reCalculateBounds2D()
178 185
	{
179 186
		return shp.getBounds2D();
......
225 232
	}
226 233

  
227 234

  
228
	
235

  
229 236
    /* (non-Javadoc)
230 237
     * @see com.iver.cit.gvsig.fmap.core.IGeometry#fastIntersects(double, double, double, double)
231 238
     */

Also available in: Unified diff