Revision 7659 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/ShpStrategy.java

View differences:

ShpStrategy.java
57 57
import com.iver.cit.gvsig.fmap.ViewPort;
58 58
import com.iver.cit.gvsig.fmap.core.FShape;
59 59
import com.iver.cit.gvsig.fmap.core.IGeometry;
60
import com.iver.cit.gvsig.fmap.core.ISymbol;
60 61
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
61 62
import com.iver.cit.gvsig.fmap.drivers.BoundedShapes;
62 63
import com.iver.cit.gvsig.fmap.drivers.DriverAttributes;
......
98 99

  
99 100
	/**
100 101
	 * @see com.iver.cit.gvsig.fmap.operations.LayerOperations#draw(java.awt.image.BufferedImage,
101
	 *      java.awt.Graphics2D, FStyle2D)
102
	 *      java.awt.Graphics2D, ISymbol)
102 103
	 */
103 104
	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
104 105
			Cancellable cancel) throws DriverException {
......
132 133

  
133 134
			if (l instanceof ClassifiedLegendInfo) {
134 135
				ClassifiedLegendInfo clsfLegend = (ClassifiedLegendInfo) l;
135
				FSymbol[] symbs = clsfLegend.getSymbols();
136
				ISymbol[] symbs = clsfLegend.getSymbols();
136 137
				// double rSym = 0;
137 138
				// double maxRSym = -1;
138 139

  
......
227 228
					bounds = ct.convert(bounds);
228 229
				}
229 230
				if (XRectangle2D.intersectInclusive(extent, bounds)) {
230
					FSymbol symbol = l.getSymbol(i);
231
					ISymbol symbol = l.getSymbol(i);
231 232

  
232 233
					if (bitSet.get(i)) {
233
						symbol = FSymbol.getSymbolForSelection(symbol);
234
						symbol = symbol.getSymbolForSelection();
234 235
					}
235 236

  
236 237
					boolean bPoint = (shapeBounds.getShapeType(i) == FShape.POINT);
......
285 286
							continue;
286 287
						if ((pixX > 0) && (pixX < image.getWidth())) {
287 288
							if ((pixY > 0) && (pixY < image.getHeight())) {
288
								image.setRGB(pixX, pixY, symbol.getRgb());
289
								image.setRGB(pixX, pixY, symbol.getOnePointRgb());
289 290
							}
290 291
						}
291 292
					}
......
384 385
				}
385 386

  
386 387
				if (XRectangle2D.intersectInclusive(extent, bounds)) {
387
					FSymbol symbol = l.getSymbol(i);
388
					ISymbol symbol = l.getSymbol(i);
388 389

  
389 390
					if (bitSet.get(i)) {
390
						symbol = FSymbol.getSymbolForSelection(symbol);
391
						symbol = symbol.getSymbolForSelection();
391 392
					}
392 393

  
393 394
					boolean bPoint = (shapeBounds.getShapeType(i) == FShape.POINT);

Also available in: Unified diff