Revision 31400

View differences:

trunk/extensions/extSymbology/src/org/gvsig/symbology/fmap/symbols/LineFillSymbol.java
292 292

  
293 293
	public void setCartographicSize(double cartographicSize, FShape shp) {
294 294
		super.setCartographicSize(cartographicSize, shp);
295
		if (getLineSymbol()!=null) {
296
			getLineSymbol().setCartographicSize(csLineWidth, shp);
297
		}
295 298
		csOffset=offset;
296 299
		csSeparation=separation;
297 300
		csLineWidth=symbolLineWidth;
298
		if (getLineSymbol()!=null) {
299
			getLineSymbol().setCartographicSize(cartographicSize, shp);
300
		}
301 301

  
302 302
	}
303 303

  
trunk/extensions/extSymbology/src/org/gvsig/symbology/fmap/symbols/MarkerFillSymbol.java
158 158
import com.iver.cit.gvsig.fmap.MapContext;
159 159
import com.iver.cit.gvsig.fmap.Messages;
160 160
import com.iver.cit.gvsig.fmap.ViewPort;
161
import com.iver.cit.gvsig.fmap.core.CartographicSupportToolkit;
161 162
import com.iver.cit.gvsig.fmap.core.FPoint2D;
162 163
import com.iver.cit.gvsig.fmap.core.FPolyline2D;
163 164
import com.iver.cit.gvsig.fmap.core.FShape;
......
191 192
	private MarkerFillSymbol selectionSymbol;
192 193
	private IMarkerFillPropertiesStyle markerFillProperties = new SimpleMarkerFillPropertiesStyle();
193 194
	private IMarkerSymbol markerSymbol = SymbologyFactory.createDefaultMarkerSymbol();
195
	private double markerSize = markerSymbol.getSize();
196
	private double csMarkerSize = markerSize;
194 197
	private PrintRequestAttributeSet properties;
195 198

  
196 199
	public ISymbol getSymbolForSelection() {
......
229 232
			break;
230 233
		case GRID_FILL:
231 234
			// case a grid fill is used
232
		{
235
			{
233 236
			Rectangle rClip = null;
234 237
			if (g.getClipBounds()!=null){
235 238
				rClip=(Rectangle)g.getClipBounds().clone();
......
280 283

  
281 284
			g.setColor(null);
282 285
			g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
283
					RenderingHints.VALUE_ANTIALIAS_ON);
286
				RenderingHints.VALUE_ANTIALIAS_ON);
284 287

  
285 288
			g.translate(xOffset, -yOffset);
286 289
			g.setPaint(resulPatternFill);
......
288 291
			g.translate(-xOffset, +yOffset);
289 292
			g.setClip(rClip);
290 293

  
291
		}
294
			}
292 295
			break;
293 296
		case RANDOM_FILL:
294 297
			{
......
439 442
		markerFillProperties = (SimpleMarkerFillPropertiesStyle) SymbologyFactory.
440 443
							createStyleFromXML(xml.getChild(1), null);
441 444

  
445
		csMarkerSize = markerSize = markerSymbol.getSize();
446

  
442 447
		if (xml.contains("unit")) { // remove this line when done
443 448
		// measure unit (for outline)
444 449
		setUnit(xml.getIntProperty("unit"));
......
457 462

  
458 463
	public void setMarker(IMarkerSymbol marker) {
459 464
		this.markerSymbol = marker;
465
		csMarkerSize = markerSize = marker.getSize();
460 466
	}
461 467

  
462 468
	public IMarkerSymbol getMarker() {
......
515 521
	public void setCartographicSize(double cartographicSize, FShape shp) {
516 522
		super.setCartographicSize(cartographicSize, shp);
517 523
		if (getMarker()!=null) {
518
			getMarker().setCartographicSize(cartographicSize, shp);
524
			getMarker().setCartographicSize(csMarkerSize, shp);
519 525
		}
526
		csMarkerSize = markerSize;
520 527
	}
521 528

  
522 529
	public double toCartographicSize(ViewPort viewPort, double dpi, FShape shp) {
530
		IMarkerSymbol marker = getMarker();
531
		if (marker!=null) {
532
			csMarkerSize = CartographicSupportToolkit.getCartographicLength(this, markerSize, viewPort, dpi);
533
		}
523 534
		double s = super.toCartographicSize(viewPort, dpi, shp);
524
		if (getMarker()!=null) {
525
			s = getMarker().toCartographicSize(viewPort, dpi, shp);
526
		}
527 535
		return s;
528 536
	}
529 537

  

Also available in: Unified diff