Revision 372 org.gvsig.vectorediting/trunk/org.gvsig.vectorediting/org.gvsig.vectorediting.swing/org.gvsig.vectorediting.swing.impl/src/main/java/org/gvsig/vectorediting/swing/impl/DefaultEditingBehavior.java
DefaultEditingBehavior.java | ||
---|---|---|
28 | 28 |
import java.awt.Graphics; |
29 | 29 |
import java.awt.Image; |
30 | 30 |
import java.awt.event.MouseEvent; |
31 |
import java.awt.geom.Point2D; |
|
31 | 32 |
import java.awt.image.BufferedImage; |
32 | 33 |
import java.util.Iterator; |
33 | 34 |
import java.util.Set; |
... | ... | |
37 | 38 |
import org.slf4j.Logger; |
38 | 39 |
import org.slf4j.LoggerFactory; |
39 | 40 |
|
41 |
import org.gvsig.fmap.geom.Geometry; |
|
42 |
import org.gvsig.fmap.geom.GeometryLocator; |
|
40 | 43 |
import org.gvsig.fmap.geom.primitive.Point; |
41 | 44 |
import org.gvsig.fmap.mapcontext.ViewPort; |
42 | 45 |
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol; |
... | ... | |
47 | 50 |
import org.gvsig.fmap.mapcontrol.tools.Behavior.Behavior; |
48 | 51 |
import org.gvsig.fmap.mapcontrol.tools.Listeners.ToolListener; |
49 | 52 |
import org.gvsig.tools.ToolsLocator; |
53 |
import org.gvsig.tools.exception.BaseException; |
|
50 | 54 |
import org.gvsig.tools.i18n.I18nManager; |
51 | 55 |
import org.gvsig.vectorediting.lib.api.DrawingStatus; |
52 | 56 |
import org.gvsig.vectorediting.lib.api.DrawingStatus.Status; |
... | ... | |
125 | 129 |
} |
126 | 130 |
} |
127 | 131 |
|
128 |
Point point; |
|
129 |
if(getMapControl().getAdjustedPoint() != null){ |
|
130 |
point = vp.convertToMapPoint(getMapControl().getAdjustedPoint()); |
|
132 |
Point point = null; |
|
133 |
Point2D point2D = getMapControl().getMapAdjustedPoint(); |
|
134 |
if (point2D == null) { |
|
135 |
point2D = getMapControl().getAdjustedPoint(); |
|
136 |
point = vp.convertToMapPoint(point2D); |
|
131 | 137 |
} else { |
132 |
point = vp.convertToMapPoint(e.getX(), e.getY()); |
|
138 |
try { |
|
139 |
point = |
|
140 |
GeometryLocator.getGeometryManager().createPoint( |
|
141 |
point2D.getX(), point2D.getY(), |
|
142 |
Geometry.SUBTYPES.GEOM2D); |
|
143 |
} catch (BaseException ex) { |
|
144 |
logger.warn("Can't create point geometry from " |
|
145 |
+ point2D.toString()); |
|
146 |
} |
|
133 | 147 |
} |
134 | 148 |
|
135 | 149 |
try { |
... | ... | |
206 | 220 |
Status status = (Status) iterator.next(); |
207 | 221 |
ISymbol symbol = status.getSymbol(); |
208 | 222 |
if (symbol == null) { |
209 |
symbol = MapControlLocator.getMapControlManager() |
|
223 |
symbol = |
|
224 |
MapControlLocator.getMapControlManager() |
|
210 | 225 |
.getAxisReferenceSymbol(); |
211 | 226 |
} |
212 | 227 |
if (symbol instanceof ITextSymbol) { |
Also available in: Unified diff