Revision 30335 branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/preferences/EditingPage.java

View differences:

EditingPage.java
193 193
import org.gvsig.fmap.geom.Geometry;
194 194
import org.gvsig.fmap.mapcontext.MapContextLocator;
195 195
import org.gvsig.fmap.mapcontext.MapContextManager;
196
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
197
import org.gvsig.fmap.mapcontrol.MapControlLocator;
198
import org.gvsig.fmap.mapcontrol.MapControlManager;
196 199
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.line.ILineSymbol;
197 200
import org.gvsig.utils.StringUtilities;
198 201
import org.gvsig.utils.XMLEntity;
......
239 242
	private JSlider jsDefaultGeometrySelectionAlpha;
240 243
	private JSlider jsDefaultHandlerAlpha;
241 244

  
242
	private MapContextManager manager = MapContextLocator.getMapContextManager();
245
	private MapContextManager mapContextManager = MapContextLocator.getMapContextManager();
246
	private MapControlManager mapControlManager = MapControlLocator.getMapControlManager();
243 247
	
244 248
	/**
245 249
	 * Creates a new panel containing View preferences settings.
......
266 270
//			jccDefaultSelectionOutLineColor.setColor(colorOutLine);
267 271
//			jccDefaultSelectionOutLineColor.setAlpha(color.getAlpha());
268 272
			jsDefaultSelectionAlpha.setValue(color.getAlpha());
269
			DefaultCADTool.selectionSymbol = manager.createSymbol(
270
					Geometry.TYPES.GEOMETRY, color);
273
			mapControlManager.setSelectionSymbol(mapContextManager.createSymbol(
274
					Geometry.TYPES.GEOMETRY, color));
271 275
//			DefaultCADTool.selectionSymbol.setOutlineColor(colorOutLine);
272 276
		}else{
273 277
			Color color=Color.RED;
......
276 280
//			jccDefaultSelectionOutLineColor.setColor(color.darker());
277 281
//			jccDefaultSelectionOutLineColor.setAlpha(color.getAlpha());
278 282
			jsDefaultSelectionAlpha.setValue(color.getAlpha());
279
			DefaultCADTool.selectionSymbol = manager.createSymbol(
280
					Geometry.TYPES.GEOMETRY, color);
283
			mapControlManager.setSelectionSymbol(mapContextManager.createSymbol(
284
					Geometry.TYPES.GEOMETRY, color));
281 285
//			DefaultCADTool.selectionSymbol.setOutlineColor(color.darker());
282 286
		}
283 287

  
......
291 295
//			jccDefaultAxisReferencesOutLineColor.setColor(colorOutLine);
292 296
//			jccDefaultAxisReferencesOutLineColor.setAlpha(color.getAlpha());
293 297
			jsDefaultAxisReferencesAlpha.setValue(color.getAlpha());
294
			DefaultCADTool.axisReferencesSymbol = manager.createSymbol(
295
					Geometry.TYPES.GEOMETRY, color);
298
			ISymbol symbol = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, color);
299
			mapControlManager.setAxisReferenceSymbol(symbol);
296 300
		}else{
297 301
			Color color=new Color(100, 100, 100, 100);
298 302
			jccDefaultAxisReferencesColor.setColor(color);
......
300 304
//			jccDefaultAxisReferencesOutLineColor.setColor(color.darker());
301 305
//			jccDefaultAxisReferencesOutLineColor.setAlpha(color.getAlpha());
302 306
			jsDefaultAxisReferencesAlpha.setValue(color.getAlpha());
303
			DefaultCADTool.axisReferencesSymbol = manager.createSymbol(
304
					Geometry.TYPES.GEOMETRY, color);
307
			ISymbol symbol = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, color);
308
			mapControlManager.setAxisReferenceSymbol(symbol);
305 309
		}
306 310

  
307 311
		// Default geometry selection color
......
313 317
//			jccDefaultGeometrySelectionOutLineColor.setColor(colorOutLine);
314 318
//			jccDefaultGeometrySelectionOutLineColor.setAlpha(color.getAlpha());
315 319
			jsDefaultGeometrySelectionAlpha.setValue(color.getAlpha());
316
			DefaultCADTool.geometrySelectSymbol = manager.createSymbol(
317
					Geometry.TYPES.GEOMETRY, color);
320
			ISymbol symbol = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, color);
321
			mapControlManager.setGeometrySelectionSymbol(symbol);
318 322
		}else{
319 323
			Color color=new Color(255, 0,0, 100);
320 324
			jccDefaultGeometrySelectionColor.setColor(color);
......
322 326
//			jccDefaultGeometrySelectionOutLineColor.setColor(color.darker());
323 327
//			jccDefaultGeometrySelectionOutLineColor.setAlpha(color.getAlpha());
324 328
			jsDefaultGeometrySelectionAlpha.setValue(color.getAlpha());
325
			DefaultCADTool.geometrySelectSymbol = manager.createSymbol(
326
					Geometry.TYPES.GEOMETRY, color);
329
			ISymbol symbol = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, color);
330
			mapControlManager.setGeometrySelectionSymbol(symbol);
327 331
		}
328 332

  
329 333
		// Default handler color
......
335 339
			jccDefaultHandlerOutLineColor.setColor(colorOutLine);
336 340
			jccDefaultHandlerOutLineColor.setAlpha(color.getAlpha());
337 341
			jsDefaultGeometrySelectionAlpha.setValue(color.getAlpha());
338
			DefaultCADTool.handlerSymbol = manager.createSymbol(
339
					Geometry.TYPES.GEOMETRY, color);
340
			if (DefaultCADTool.handlerSymbol instanceof ILineSymbol) {
341
				((ILineSymbol)DefaultCADTool.handlerSymbol).setLineColor(colorOutLine);
342
			ISymbol symbol = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, color);
343
			mapControlManager.setHandlerSymbol(symbol);
344
			if (mapControlManager.getHandlerSymbol()instanceof ILineSymbol) {
345
				((ILineSymbol)mapControlManager.getHandlerSymbol()).setLineColor(colorOutLine);
342 346
			}
343 347
		}else{
344 348
			Color color=Color.ORANGE;
......
347 351
			jccDefaultHandlerOutLineColor.setColor(color.darker());
348 352
			jccDefaultHandlerOutLineColor.setAlpha(color.getAlpha());
349 353
			jsDefaultHandlerAlpha.setValue(color.getAlpha());
350
			DefaultCADTool.handlerSymbol = manager.createSymbol(
351
					Geometry.TYPES.GEOMETRY, color);
352
			if (DefaultCADTool.handlerSymbol instanceof ILineSymbol) {
353
				((ILineSymbol)DefaultCADTool.handlerSymbol).setLineColor(color.darker());
354
			ISymbol symbol = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, color);
355
			mapControlManager.setHandlerSymbol(symbol);
356
			if (mapControlManager.getHandlerSymbol() instanceof ILineSymbol) {
357
				((ILineSymbol)mapControlManager.getHandlerSymbol()).setLineColor(color.darker());
354 358
			}
355 359
		}
356 360
	}
......
494 498
			StringUtilities.color2String(selectionColor));
495 499
//		xml.putProperty(DEFAULT_SELECTION_OUTLINE_COLOR,
496 500
//				StringUtilities.color2String(selectionOutLineColor));
497
		DefaultCADTool.selectionSymbol = manager.createSymbol(
498
				Geometry.TYPES.GEOMETRY,selectionColor);
501
		ISymbol symbol = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, selectionColor);
502
		mapControlManager.setSelectionSymbol(symbol);
503
		
499 504
//		DefaultCADTool.selectionSymbol.setOutlineColor(selectionOutLineColor);
500 505

  
501 506
		xml.putProperty(DEFAULT_AXIS_REFERENCES_COLOR,
502 507
			StringUtilities.color2String(modifyColor));
503 508
//		xml.putProperty(DEFAULT_AXIS_REFERENCES_OUTLINE_COLOR,
504 509
//				StringUtilities.color2String(modifyOutLineColor));
505
		DefaultCADTool.axisReferencesSymbol = manager.createSymbol(
506
				Geometry.TYPES.GEOMETRY, modifyColor);
510
		ISymbol symbol2 = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, modifyColor);
511
		mapControlManager.setAxisReferenceSymbol(symbol2);
507 512
//		DefaultCADTool.axisReferencesSymbol.setOutlineColor(modifyOutLineColor);
508 513

  
509 514
		xml.putProperty(DEFAULT_RECTANGLE_SELECTION_COLOR,
510 515
				StringUtilities.color2String(drawingColor));
511 516
//		xml.putProperty(DEFAULT_GEOMETRY_SELECTION_OUTLINE_COLOR,
512 517
//				StringUtilities.color2String(drawingOutLineColor));
513
		DefaultCADTool.geometrySelectSymbol = manager.createSymbol(
514
				Geometry.TYPES.GEOMETRY, drawingColor);
518
		ISymbol symbol3 = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, drawingColor);
519
		mapControlManager.setGeometrySelectionSymbol(symbol3);
520
				
515 521
//		DefaultCADTool.geometrySelectSymbol.setOutlineColor(drawingOutLineColor);
516 522

  
517 523
		xml.putProperty(DEFAULT_HANDLER_COLOR,
518 524
				StringUtilities.color2String(handlerColor));
519 525
		xml.putProperty(DEFAULT_HANDLER_OUTLINE_COLOR,
520 526
				StringUtilities.color2String(handlerOutLineColor));
521
		DefaultCADTool.handlerSymbol = manager.createSymbol(
522
				Geometry.TYPES.GEOMETRY, handlerColor);
523
		if (DefaultCADTool.handlerSymbol instanceof ILineSymbol) {
524
			((ILineSymbol)DefaultCADTool.handlerSymbol).setLineColor(handlerOutLineColor);
527
		
528
		ISymbol symbol4 = mapContextManager.createSymbol(Geometry.TYPES.GEOMETRY, handlerColor);
529
		mapControlManager.setHandlerSymbol(symbol4);
530
		
531
		if (mapControlManager.getHandlerSymbol() instanceof ILineSymbol) {
532
			((ILineSymbol)mapControlManager.getHandlerSymbol()).setLineColor(handlerOutLineColor);
525 533
		}
526 534
	}
527 535

  

Also available in: Unified diff