Revision 22036

View differences:

branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/DefaultCADTool.java
89 89 
 */
90 90 
public abstract class DefaultCADTool implements CADTool {
91 91 
	public static ISymbol selectionSymbol = SymbologyFactory.
92 
	createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE, new Color(255, 0,0, 100)); // Le ponemos una transparencia
92 
	createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY, new Color(255, 0,0, 100)); // Le ponemos una transparencia
93 93 
	public static ISymbol axisReferencesSymbol = SymbologyFactory.
94 
	createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE, new Color(100, 100, 100, 100));
94 
	createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY, new Color(100, 100, 100, 100));
95 95 
	public static ISymbol geometrySelectSymbol = SymbologyFactory.
96 
	createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE, Color.RED);
96 
	createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY, Color.RED);
97 97 
	public static ISymbol handlerSymbol = SymbologyFactory.
98 
	createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE, Color.ORANGE);
98 
	createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY, Color.ORANGE);
99 99 
	private static Logger logger = Logger.getLogger(DefaultCADTool.class
100 100 
			.getName());
101 101 
	private CADToolAdapter cadToolAdapter;
branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/tools/ExtendCADTool.java
297 297 
	public boolean isApplicable(int shapeType) {
298 298 
		switch (shapeType) {
299 299 
		case Geometry.TYPES.CURVE:
300 
		case Geometry.TYPES.AGGREGATE:
300 
		case Geometry.TYPES.GEOMETRY:
301 301 
			return true;
302 302 
		}
303 303 
		return false;
branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/tools/JoinCADTool.java
296 296 

  		




  297
  297
  
    
	public boolean isApplicable(int shapeType) {


  		




  298
  298
  
    
		switch (shapeType) {


  		




  299
  
  
    
		case Geometry.TYPES.AGGREGATE:


  		




  
  299
  
    
		case Geometry.TYPES.GEOMETRY:


  		




  300
  300
  
    
		case Geometry.TYPES.CURVE:


  		




  301
  301
  
    
			return true;


  		




  302
  302
  
    
		}


  		












  

    
      branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/panels/ChooseGeometryType.java
    
  





  194
  194
  
    
		getJRadioButtonMultiPoint().setEnabled(store.canWriteGeometry(Geometry.TYPES.MULTIPOINT));


  		




  195
  195
  
    
		getJRadioButtonLine().setEnabled(store.canWriteGeometry(Geometry.TYPES.CURVE));


  		




  196
  196
  
    
		getJRadioButtonPolygon().setEnabled(store.canWriteGeometry(Geometry.TYPES.SURFACE));


  		




  197
  
  
    
		getJRadioButtonMulti().setEnabled(store.canWriteGeometry(Geometry.TYPES.AGGREGATE));


  		




  
  197
  
    
		getJRadioButtonMulti().setEnabled(store.canWriteGeometry(Geometry.TYPES.GEOMETRY));


  		




  198
  198
  
    
	}


  		




  199
  199
  
    

  		




  200
  200
  
    
	public int getSelectedGeometryType()


  		




  ......




  208
  208
  
    
		if (getJRadioButtonPolygon().isSelected())


  		




  209
  209
  
    
			return Geometry.TYPES.SURFACE;


  		




  210
  210
  
    
		if (getJRadioButtonMulti().isSelected())


  		




  211
  
  
    
			return Geometry.TYPES.AGGREGATE;


  		




  
  211
  
    
			return Geometry.TYPES.GEOMETRY;


  		




  212
  212
  
    

  		




  213
  213
  
    
		return -1;


  		




  214
  214
  
    
	}


  		












  

    
      branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/CADToolAdapter.java
    
  





  1417
  1417
  
    
	 * @return type of the shape that's the current active and vector layer being edited


  		




  1418
  1418
  
    
	 */


  		




  1419
  1419
  
    
	public int getActiveLayerType() {


  		




  1420
  
  
    
		int type=Geometry.TYPES.AGGREGATE;


  		




  
  1420
  
    
		int type=Geometry.TYPES.GEOMETRY;


  		




  1421
  1421
  
    
		try {


  		




  1422
  1422
  
    
			type=((FLyrVect)CADExtension.getEditionManager().getActiveLayerEdited().getLayer()).getShapeType();


  		




  1423
  1423
  
    
		} catch (ReadException e) {


  		












  

    
      branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/gui/preferences/EditingPage.java
    
  





  263
  263
  
    
//			jccDefaultSelectionOutLineColor.setAlpha(color.getAlpha());


  		




  264
  264
  
    
			jsDefaultSelectionAlpha.setValue(color.getAlpha());


  		




  265
  265
  
    
			DefaultCADTool.selectionSymbol = SymbologyFactory.


  		




  266
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  266
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  267
  267
  
    
//			DefaultCADTool.selectionSymbol.setOutlineColor(colorOutLine);


  		




  268
  268
  
    
		}else{


  		




  269
  269
  
    
			Color color=Color.RED;


  		




  ......




  273
  273
  
    
//			jccDefaultSelectionOutLineColor.setAlpha(color.getAlpha());


  		




  274
  274
  
    
			jsDefaultSelectionAlpha.setValue(color.getAlpha());


  		




  275
  275
  
    
			DefaultCADTool.selectionSymbol = SymbologyFactory.


  		




  276
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  276
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  277
  277
  
    
//			DefaultCADTool.selectionSymbol.setOutlineColor(color.darker());


  		




  278
  278
  
    
		}


  		




  279
  279
  
    

  		




  ......




  288
  288
  
    
//			jccDefaultAxisReferencesOutLineColor.setAlpha(color.getAlpha());


  		




  289
  289
  
    
			jsDefaultAxisReferencesAlpha.setValue(color.getAlpha());


  		




  290
  290
  
    
			DefaultCADTool.axisReferencesSymbol = SymbologyFactory.


  		




  291
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  291
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  292
  292
  
    
		}else{


  		




  293
  293
  
    
			Color color=new Color(100, 100, 100, 100);


  		




  294
  294
  
    
			jccDefaultAxisReferencesColor.setColor(color);


  		




  ......




  297
  297
  
    
//			jccDefaultAxisReferencesOutLineColor.setAlpha(color.getAlpha());


  		




  298
  298
  
    
			jsDefaultAxisReferencesAlpha.setValue(color.getAlpha());


  		




  299
  299
  
    
			DefaultCADTool.axisReferencesSymbol = SymbologyFactory.


  		




  300
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  300
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  301
  301
  
    
		}


  		




  302
  302
  
    

  		




  303
  303
  
    
		// Default geometry selection color


  		




  ......




  310
  310
  
    
//			jccDefaultGeometrySelectionOutLineColor.setAlpha(color.getAlpha());


  		




  311
  311
  
    
			jsDefaultGeometrySelectionAlpha.setValue(color.getAlpha());


  		




  312
  312
  
    
			DefaultCADTool.geometrySelectSymbol = SymbologyFactory.


  		




  313
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  313
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  314
  314
  
    
		}else{


  		




  315
  315
  
    
			Color color=new Color(255, 0,0, 100);


  		




  316
  316
  
    
			jccDefaultGeometrySelectionColor.setColor(color);


  		




  ......




  319
  319
  
    
//			jccDefaultGeometrySelectionOutLineColor.setAlpha(color.getAlpha());


  		




  320
  320
  
    
			jsDefaultGeometrySelectionAlpha.setValue(color.getAlpha());


  		




  321
  321
  
    
			DefaultCADTool.geometrySelectSymbol = SymbologyFactory.


  		




  322
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  322
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  323
  323
  
    
		}


  		




  324
  324
  
    

  		




  325
  325
  
    
		// Default handler color


  		




  ......




  332
  332
  
    
			jccDefaultHandlerOutLineColor.setAlpha(color.getAlpha());


  		




  333
  333
  
    
			jsDefaultGeometrySelectionAlpha.setValue(color.getAlpha());


  		




  334
  334
  
    
			DefaultCADTool.handlerSymbol = SymbologyFactory.


  		




  335
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  335
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  336
  336
  
    
			if (DefaultCADTool.handlerSymbol instanceof ILineSymbol) {


  		




  337
  337
  
    
				((ILineSymbol)DefaultCADTool.handlerSymbol).setLineColor(colorOutLine);


  		




  338
  338
  
    
			}


  		




  ......




  344
  344
  
    
			jccDefaultHandlerOutLineColor.setAlpha(color.getAlpha());


  		




  345
  345
  
    
			jsDefaultHandlerAlpha.setValue(color.getAlpha());


  		




  346
  346
  
    
			DefaultCADTool.handlerSymbol = SymbologyFactory.


  		




  347
  
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,color);


  		




  
  347
  
    
			createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,color);


  		




  348
  348
  
    
			if (DefaultCADTool.handlerSymbol instanceof ILineSymbol) {


  		




  349
  349
  
    
				((ILineSymbol)DefaultCADTool.handlerSymbol).setLineColor(color.darker());


  		




  350
  350
  
    
			}


  		




  ......




  491
  491
  
    
//		xml.putProperty(DEFAULT_SELECTION_OUTLINE_COLOR,


  		




  492
  492
  
    
//				StringUtilities.color2String(selectionOutLineColor));


  		




  493
  493
  
    
		DefaultCADTool.selectionSymbol = SymbologyFactory.


  		




  494
  
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,selectionColor);


  		




  
  494
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,selectionColor);


  		




  495
  495
  
    
//		DefaultCADTool.selectionSymbol.setOutlineColor(selectionOutLineColor);


  		




  496
  496
  
    

  		




  497
  497
  
    
		xml.putProperty(DEFAULT_AXIS_REFERENCES_COLOR,


  		




  ......




  499
  499
  
    
//		xml.putProperty(DEFAULT_AXIS_REFERENCES_OUTLINE_COLOR,


  		




  500
  500
  
    
//				StringUtilities.color2String(modifyOutLineColor));


  		




  501
  501
  
    
		DefaultCADTool.axisReferencesSymbol = SymbologyFactory.


  		




  502
  
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,modifyColor);


  		




  
  502
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,modifyColor);


  		




  503
  503
  
    
//		DefaultCADTool.axisReferencesSymbol.setOutlineColor(modifyOutLineColor);


  		




  504
  504
  
    

  		




  505
  505
  
    
		xml.putProperty(DEFAULT_RECTANGLE_SELECTION_COLOR,


  		




  ......




  507
  507
  
    
//		xml.putProperty(DEFAULT_GEOMETRY_SELECTION_OUTLINE_COLOR,


  		




  508
  508
  
    
//				StringUtilities.color2String(drawingOutLineColor));


  		




  509
  509
  
    
		DefaultCADTool.geometrySelectSymbol = SymbologyFactory.


  		




  510
  
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,drawingColor);


  		




  
  510
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,drawingColor);


  		




  511
  511
  
    
//		DefaultCADTool.geometrySelectSymbol.setOutlineColor(drawingOutLineColor);


  		




  512
  512
  
    

  		




  513
  513
  
    
		xml.putProperty(DEFAULT_HANDLER_COLOR,


  		




  ......




  515
  515
  
    
		xml.putProperty(DEFAULT_HANDLER_OUTLINE_COLOR,


  		




  516
  516
  
    
				StringUtilities.color2String(handlerOutLineColor));


  		




  517
  517
  
    
		DefaultCADTool.handlerSymbol = SymbologyFactory.


  		




  518
  
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.AGGREGATE,handlerColor);


  		




  
  518
  
    
		createDefaultSymbolByShapeType(Geometry.TYPES.GEOMETRY,handlerColor);


  		




  519
  519
  
    
		if (DefaultCADTool.handlerSymbol instanceof ILineSymbol) {


  		




  520
  520
  
    
			((ILineSymbol)DefaultCADTool.handlerSymbol).setLineColor(handlerOutLineColor);


  		




  521
  521
  
    
		}


  		












Also available in:  Unified diff