Revision 30335 branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/EditVertexCADTool.java
EditVertexCADTool.java | ||
---|---|---|
41 | 41 |
package org.gvsig.editing.gui.cad.tools; |
42 | 42 |
|
43 | 43 |
import java.awt.Component; |
44 |
import java.awt.Graphics; |
|
45 |
import java.awt.Graphics2D; |
|
46 | 44 |
import java.awt.event.InputEvent; |
47 | 45 |
import java.awt.geom.PathIterator; |
48 | 46 |
import java.awt.geom.Point2D; |
... | ... | |
70 | 68 |
import org.gvsig.fmap.geom.Geometry; |
71 | 69 |
import org.gvsig.fmap.geom.aggregate.impl.BaseMultiPrimitive; |
72 | 70 |
import org.gvsig.fmap.geom.handler.Handler; |
73 |
import org.gvsig.fmap.geom.operation.DrawInts; |
|
74 |
import org.gvsig.fmap.geom.operation.DrawOperationContext; |
|
75 |
import org.gvsig.fmap.geom.operation.GeometryOperationException; |
|
76 |
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException; |
|
77 | 71 |
import org.gvsig.fmap.geom.primitive.GeneralPathX; |
78 | 72 |
import org.gvsig.fmap.geom.util.Converter; |
79 | 73 |
import org.gvsig.fmap.mapcontext.ViewPort; |
80 | 74 |
import org.gvsig.fmap.mapcontrol.MapControl; |
81 |
import org.gvsig.symbology.fmap.mapcontext.rendering.symbol.FGraphicUtilities;
|
|
75 |
import org.gvsig.fmap.mapcontrol.MapControlDrawer;
|
|
82 | 76 |
|
83 | 77 |
|
84 | 78 |
|
... | ... | |
195 | 189 |
* @param x par?metro x del punto que se pase para dibujar. |
196 | 190 |
* @param y par?metro x del punto que se pase para dibujar. |
197 | 191 |
*/ |
198 |
public void drawOperation(Graphics g, double x, double y) {
|
|
199 |
drawVertex(g,getCadToolAdapter().getMapControl().getViewPort());
|
|
192 |
public void drawOperation(MapControlDrawer renderer, double x, double y) {
|
|
193 |
drawVertex(renderer,getCadToolAdapter().getMapControl().getViewPort());
|
|
200 | 194 |
} |
201 | 195 |
|
202 | 196 |
/** |
... | ... | |
284 | 278 |
e.printStackTrace(); |
285 | 279 |
} |
286 | 280 |
} |
287 |
private void drawVertex(Graphics g,ViewPort vp){
|
|
281 |
private void drawVertex(MapControlDrawer renderer,ViewPort vp){
|
|
288 | 282 |
VectorialLayerEdited vle=getVLE(); |
289 | 283 |
DisposableIterator iterator = null; |
290 | 284 |
try { |
... | ... | |
294 | 288 |
Feature feature = (Feature) iterator.next(); |
295 | 289 |
|
296 | 290 |
Geometry ig = (feature.getDefaultGeometry()).cloneGeometry(); |
297 |
if (ig == null) { |
|
298 |
continue; |
|
299 |
} |
|
300 |
DrawOperationContext doc = new DrawOperationContext(); |
|
301 |
doc.setGraphics((Graphics2D) g); |
|
302 |
doc.setViewPort(vp); |
|
303 |
doc.setSymbol(DefaultCADTool.geometrySelectSymbol); |
|
304 |
try { |
|
305 |
ig.invokeOperation(DrawInts.CODE, doc); |
|
306 |
} catch (GeometryOperationNotSupportedException e) { |
|
307 |
e.printStackTrace(); |
|
308 |
} catch (GeometryOperationException e) { |
|
309 |
e.printStackTrace(); |
|
310 |
} |
|
291 |
renderer.draw(ig, mapControlManager.getGeometrySelectionSymbol()); |
|
292 |
|
|
311 | 293 |
Handler[] handlers = ig.getHandlers(Geometry.SELECTHANDLER); |
312 | 294 |
if (numSelect >= handlers.length) { |
313 | 295 |
numSelect = 0; |
314 | 296 |
} |
315 | 297 |
if (handlers.length==0) |
316 | 298 |
continue; |
317 |
FGraphicUtilities.DrawVertex((Graphics2D) g, vp |
|
318 |
.getAffineTransform(), handlers[numSelect]); |
|
299 |
renderer.drawHandler(handlers[numSelect], vp.getAffineTransform()); |
|
319 | 300 |
} |
320 | 301 |
} catch (DataException e) { |
321 | 302 |
// TODO Auto-generated catch block |
... | ... | |
343 | 324 |
Point2D ptSrc = new Point2D.Double(); |
344 | 325 |
boolean bFirst = false; |
345 | 326 |
|
346 |
theIterator = gp.getPathIterator(null, Converter.FLATNESS);
|
|
327 |
theIterator = gp.getPathIterator(null, geomManager.getFlatness());
|
|
347 | 328 |
int numSegmentsAdded = 0; |
348 | 329 |
while (!theIterator.isDone()) { |
349 | 330 |
theType = theIterator.currentSegment(theData); |
... | ... | |
492 | 473 |
Point2D pLast=new Point2D.Double(); |
493 | 474 |
Point2D pAnt = new Point2D.Double(); |
494 | 475 |
Point2D firstPoint=null; |
495 |
theIterator = geome.getPathIterator(null,Converter.FLATNESS); //, flatness);
|
|
476 |
theIterator = geome.getPathIterator(null, geomManager.getFlatness()); //, flatness);
|
|
496 | 477 |
int numSegmentsAdded = 0; |
497 | 478 |
while (!theIterator.isDone()) { |
498 | 479 |
theType = theIterator.currentSegment(theData); |
... | ... | |
698 | 679 |
iterator = ((FeatureSelection) featureStore.getSelection()) |
699 | 680 |
.iterator(); |
700 | 681 |
double tam = getCadToolAdapter().getMapControl().getViewPort() |
701 |
.toMapDistance(MapControl.tolerance);
|
|
682 |
.toMapDistance(mapControlManager.getTolerance());
|
|
702 | 683 |
Rectangle2D rect = new Rectangle2D.Double(firstPoint.getX() - tam, |
703 | 684 |
firstPoint.getY() - tam, tam * 2, tam * 2); |
704 | 685 |
while (iterator.hasNext()) { |
Also available in: Unified diff