Revision 30335 branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/MultiPointCADTool.java

View differences:

MultiPointCADTool.java
40 40
 */
41 41
package org.gvsig.editing.gui.cad.tools;
42 42

  
43
import java.awt.Graphics;
44
import java.awt.Graphics2D;
45 43
import java.awt.event.InputEvent;
46 44
import java.util.ArrayList;
47 45

  
......
55 53
import org.gvsig.fmap.geom.Geometry.SUBTYPES;
56 54
import org.gvsig.fmap.geom.Geometry.TYPES;
57 55
import org.gvsig.fmap.geom.aggregate.MultiPoint;
58
import org.gvsig.fmap.geom.operation.Draw;
59
import org.gvsig.fmap.geom.operation.DrawOperationContext;
60
import org.gvsig.fmap.geom.operation.GeometryOperationException;
61
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
62 56
import org.gvsig.fmap.geom.primitive.Point;
57
import org.gvsig.fmap.mapcontrol.MapControlDrawer;
63 58

  
64 59

  
65 60

  
......
140 135
	 * @param x par?metro x del punto que se pase para dibujar.
141 136
	 * @param y par?metro x del punto que se pase para dibujar.
142 137
	 */
143
	public void drawOperation(Graphics g, double x,
138
	public void drawOperation(MapControlDrawer renderer, double x,
144 139
			double y) {
145 140
		try {
146 141
			int num=points.size();
......
152 147
				pointsAux[i].setY(p[1]);
153 148
			}
154 149

  
155
			DrawOperationContext doc=new DrawOperationContext();
156
			doc.setGraphics((Graphics2D)g);
157
			doc.setViewPort(getCadToolAdapter().getMapControl().getViewPort());
158
			doc.setSymbol(DefaultCADTool.geometrySelectSymbol);
159

  
160 150
			MultiPoint multiPoint = (MultiPoint)geomManager.create(TYPES.MULTIPOINT, SUBTYPES.GEOM2D);
161 151
			for (int i=0 ; i<pointsAux.length ; i++){
162 152
				multiPoint.addPoint(pointsAux[i]);
163 153
			}
164
			multiPoint.invokeOperation(Draw.CODE,doc);
165
			createPoint(x,y).invokeOperation(Draw.CODE,doc);
166
		} catch (GeometryOperationNotSupportedException e) {
167
			e.printStackTrace();
168
		} catch (GeometryOperationException e) {
169
			e.printStackTrace();
154
			renderer.draw(multiPoint, mapControlManager.getGeometrySelectionSymbol());
155

  
156
			renderer.draw(createPoint(x,y), mapControlManager.getGeometrySelectionSymbol());		
170 157
		} catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
171 158
			logger.error(new CreateGeometryException(TYPES.MULTIPOINT, SUBTYPES.GEOM2D, e));
172 159
		}

Also available in: Unified diff