Revision 4465

View differences:

trunk/extensions/extCAD/sm/SelectionCADTool.sm
41 41
				setQuestion("select_handlers");
42 42
				setDescription(new String[]{"Cancelar"});
43 43
				addPoint( pointX,pointY,event);
44
				end();
44 45
				}
45 46
}
46 47

  
......
52 53
				setQuestion("select_handlers");
53 54
				setDescription(new String[]{"Cancelar"});
54 55
				addPoint( pointX,pointY,event);
56
				end();
55 57
				}
56 58
	// Si no lo hemos conseguido
57 59
	addPoint( pointX:double,pointY:double,event:InputEvent)
58 60
			FirstPoint {
59 61
				setQuestion("Precise punto del rect?ngulo de selecci?n");
60 62
				setDescription(new String[]{"Cancelar"});
61

  
62 63
				}
63 64

  
64 65

  
......
94 95
				addPoint( pointX,pointY,event);
95 96
				// refresh();
96 97
				}
97
				
98

  
98 99
}
99 100

  
100 101
WithHandlers{
trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/DefaultCADTool.java
69 69
import com.iver.cit.gvsig.fmap.edition.IRowEdited;
70 70
import com.iver.cit.gvsig.fmap.edition.VectorialEditableAdapter;
71 71
import com.iver.cit.gvsig.fmap.layers.FBitSet;
72
import com.iver.cit.gvsig.layers.VectorialLayerEdited;
72 73

  
73 74
/**
74 75
 * DOCUMENT ME!
......
278 279
		CADTool.drawingSymbol.setOutlineColor(Color.GREEN);
279 280

  
280 281
	}
282
	protected ArrayList getSelectedRow(){
283
		VectorialLayerEdited vle = (VectorialLayerEdited) CADExtension
284
		.getEditionManager().getActiveLayerEdited();
285
    	ArrayList selectedRow = vle.getSelectedRow();
286
    	return selectedRow;
287
	}
281 288

  
282 289
}
trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/tools/smc/SelectionCADToolContext.java
247 247
                        ctxt.setQuestion("select_handlers");
248 248
                        ctxt.setDescription(new String[]{"Cancelar"});
249 249
                        ctxt.addPoint(pointX, pointY, event);
250
                        ctxt.end();
250 251
                    }
251 252
                    finally
252 253
                    {
......
292 293
                        ctxt.setQuestion("select_handlers");
293 294
                        ctxt.setDescription(new String[]{"Cancelar"});
294 295
                        ctxt.addPoint(pointX, pointY, event);
296
                        ctxt.end();
295 297
                    }
296 298
                    finally
297 299
                    {
trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/tools/SelectionCADTool.java
72 72

  
73 73
/**
74 74
 * DOCUMENT ME!
75
 * 
75
 *
76 76
 * @author Vicente Caballero Navarro
77 77
 */
78 78
public class SelectionCADTool extends DefaultCADTool {
......
105 105

  
106 106
	/*
107 107
	 * (non-Javadoc)
108
	 * 
108
	 *
109 109
	 * @see com.iver.cit.gvsig.gui.cad.CADTool#transition(com.iver.cit.gvsig.fmap.layers.FBitSet,
110 110
	 *      double, double)
111 111
	 */
......
119 119

  
120 120
	/*
121 121
	 * (non-Javadoc)
122
	 * 
122
	 *
123 123
	 * @see com.iver.cit.gvsig.gui.cad.CADTool#transition(com.iver.cit.gvsig.fmap.layers.FBitSet,
124 124
	 *      double)
125 125
	 */
......
129 129

  
130 130
	/*
131 131
	 * (non-Javadoc)
132
	 * 
132
	 *
133 133
	 * @see com.iver.cit.gvsig.gui.cad.CADTool#transition(com.iver.cit.gvsig.fmap.layers.FBitSet,
134 134
	 *      java.lang.String)
135 135
	 */
......
144 144
	/**
145 145
	 * Equivale al transition del prototipo pero sin pasarle como par? metro el
146 146
	 * editableFeatureSource que ya estar? creado.
147
	 * 
147
	 *
148 148
	 * @param selection
149 149
	 *            Bitset con las geometr?as que est?n seleccionadas.
150 150
	 * @param x
......
199 199
		VectorialLayerEdited vle = (VectorialLayerEdited) CADExtension
200 200
			.getEditionManager().getActiveLayerEdited();
201 201
		ArrayList selectedRow = vle.getSelectedRow();
202
		
202

  
203 203
		lastPoint = new Point2D.Double(x, y);
204 204
		FBitSet selection = getCadToolAdapter().getVectorialAdapter()
205 205
			.getSelection();
......
269 269
	/**
270 270
	 * M?todo para dibujar la lo necesario para el estado en el que nos
271 271
	 * encontremos.
272
	 * 
272
	 *
273 273
	 * @param g
274 274
	 *            Graphics sobre el que dibujar.
275 275
	 * @param selectedGeometries
......
335 335

  
336 336
	/**
337 337
	 * Add a diferent option.
338
	 * 
338
	 *
339 339
	 * @param sel
340 340
	 *            DOCUMENT ME!
341 341
	 * @param s
......
347 347

  
348 348
	/*
349 349
	 * (non-Javadoc)
350
	 * 
350
	 *
351 351
	 * @see com.iver.cit.gvsig.gui.cad.CADTool#addvalue(double)
352 352
	 */
353 353
	public void addValue(double d) {
......
374 374
	}
375 375

  
376 376
	public void end() {
377
		CADExtension.setCADTool(getTool());
377
		if (!tool.equals("selection"))
378
			CADExtension.setCADTool(getTool());
378 379
	}
379 380

  
380 381
	public String getName() {
trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/tools/MoveCADTool.java
60 60
import com.iver.cit.gvsig.gui.cad.DefaultCADTool;
61 61
import com.iver.cit.gvsig.gui.cad.tools.smc.MoveCADToolContext;
62 62
import com.iver.cit.gvsig.gui.cad.tools.smc.MoveCADToolContext.MoveCADToolState;
63
import com.iver.cit.gvsig.layers.VectorialLayerEdited;
64 63

  
65 64

  
66 65
/**
......
133 132
        MoveCADToolState actualState = (MoveCADToolState) _fsm.getPreviousState();
134 133
        String status = actualState.getName();
135 134
        VectorialEditableAdapter vea = getCadToolAdapter().getVectorialAdapter();
136
        VectorialLayerEdited vle = (VectorialLayerEdited) CADExtension
137
		.getEditionManager().getActiveLayerEdited();
138
    	ArrayList selectedRow = vle.getSelectedRow();
135
        ArrayList selectedRow=getSelectedRow();
139 136

  
140 137
    	if (status.equals("Move.FirstPointToMove")) {
141 138
            firstPoint = new Point2D.Double(x, y);
......
179 176
    public void drawOperation(Graphics g, double x, double y) {
180 177
        MoveCADToolState actualState = ((MoveCADToolContext) _fsm).getState();
181 178
        String status = actualState.getName();
182
        	VectorialLayerEdited vle = (VectorialLayerEdited) CADExtension
183
			.getEditionManager().getActiveLayerEdited();
184
        	ArrayList selectedRow = vle.getSelectedRow();
179
        ArrayList selectedRow=getSelectedRow();
185 180
        	drawHandlers(g, selectedRow,
186 181
                     getCadToolAdapter().getMapControl().getViewPort()
187 182
                         .getAffineTransform());

Also available in: Unified diff