Revision 41971
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/PanListenerImpl.java | ||
|---|---|---|
| 94 | 94 |
r = geomManager.createEnvelope(x, y, x+width, y+height, SUBTYPES.GEOM2D); |
| 95 | 95 |
vp.setEnvelope(r); |
| 96 | 96 |
} catch (CreateEnvelopeException e) {
|
| 97 |
logger.error("Error creating the envelope", e);
|
|
| 97 |
logger.warn("Error creating the envelope", e);
|
|
| 98 | 98 |
} |
| 99 | 99 |
|
| 100 | 100 |
} |
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/Behavior/PolylineBehavior.java | ||
|---|---|---|
| 95 | 95 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mousePressed(java.awt.event.MouseEvent) |
| 96 | 96 |
*/ |
| 97 | 97 |
public void mousePressed(MouseEvent e) throws BehaviorException {
|
| 98 |
if( !isMyButton(e) ) {
|
|
| 99 |
return; |
|
| 100 |
} |
|
| 98 | 101 |
if (e.getClickCount() == 2) {
|
| 99 | 102 |
listener.polylineFinished(new MeasureEvent((Double[]) arrayX.toArray(new Double[arrayX.size()]), (Double[]) arrayY.toArray(new Double[arrayY.size()]), e)); |
| 100 | 103 |
|
| ... | ... | |
| 121 | 124 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mouseDragged(java.awt.event.MouseEvent) |
| 122 | 125 |
*/ |
| 123 | 126 |
public void mouseDragged(MouseEvent e) throws BehaviorException {
|
| 127 |
if( !isMyButton(e) ) {
|
|
| 128 |
return; |
|
| 129 |
} |
|
| 124 | 130 |
mouseMoved(e); |
| 125 | 131 |
} |
| 126 | 132 |
|
| ... | ... | |
| 141 | 147 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mouseMoved(java.awt.event.MouseEvent) |
| 142 | 148 |
*/ |
| 143 | 149 |
public void mouseMoved(MouseEvent e) throws BehaviorException {
|
| 150 |
if( !isMyButton(e) ) {
|
|
| 151 |
return; |
|
| 152 |
} |
|
| 144 | 153 |
//System.err.println("moved antes de click");
|
| 145 | 154 |
if (isClicked) {
|
| 146 | 155 |
//System.err.println("moved despues de click");
|
| ... | ... | |
| 155 | 164 |
|
| 156 | 165 |
/** |
| 157 | 166 |
* <p>Draws the polyline in the <code>Graphics2D</code> of the associated <code>MapControl</code>.</p> |
| 158 |
* |
|
| 159 |
* @param g2 the 2D context that allows draw the polyline |
|
| 167 |
* @param mapControlDrawer |
|
| 160 | 168 |
*/ |
| 161 | 169 |
protected void drawPolyLine(MapControlDrawer mapControlDrawer) {
|
| 162 | 170 |
GeneralPathX polyline = new GeneralPathX(GeneralPathX.WIND_EVEN_ODD, arrayX.size()); |
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/Behavior/MoveWithMiddleButtonBehavior.java | ||
|---|---|---|
| 41 | 41 |
* associated <code>MapControl</code> |
| 42 | 42 |
*/ |
| 43 | 43 |
public MoveWithMiddleButtonBehavior(PanListener pli) {
|
| 44 |
super(pli,MIDDLE); |
|
| 44 |
super(pli,BUTTON_MIDDLE);
|
|
| 45 | 45 |
} |
| 46 | 46 |
|
| 47 | 47 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/Behavior/Behavior.java | ||
|---|---|---|
| 64 | 64 |
* @author Luis W. Sevilla |
| 65 | 65 |
*/ |
| 66 | 66 |
public abstract class Behavior implements IBehavior {
|
| 67 |
public static final int LEFT = 0;
|
|
| 68 |
public static final int MIDDLE = 1;
|
|
| 69 |
public static final int RIGHT = 2;
|
|
| 67 |
public static final int BUTTON_LEFT = 1;
|
|
| 68 |
public static final int BUTTON_MIDDLE = 2;
|
|
| 69 |
public static final int BUTTON_RIGHT = 4;
|
|
| 70 | 70 |
|
| 71 | 71 |
/** |
| 72 | 72 |
* Reference to the <code>MapControl</code> object that uses. |
| ... | ... | |
| 80 | 80 |
|
| 81 | 81 |
protected GeometryManager geomManager = GeometryLocator.getGeometryManager(); |
| 82 | 82 |
|
| 83 |
private int mouseButton = LEFT;
|
|
| 83 |
protected int mouseButton = BUTTON_LEFT;
|
|
| 84 | 84 |
|
| 85 | 85 |
public Behavior() {
|
| 86 | 86 |
|
| ... | ... | |
| 341 | 341 |
|
| 342 | 342 |
protected boolean isMyButton(MouseEvent e) {
|
| 343 | 343 |
switch(this.mouseButton) {
|
| 344 |
case LEFT: |
|
| 344 |
case BUTTON_LEFT:
|
|
| 345 | 345 |
default: |
| 346 | 346 |
return (SwingUtilities.isLeftMouseButton(e)); |
| 347 |
case MIDDLE: |
|
| 347 |
case BUTTON_MIDDLE:
|
|
| 348 | 348 |
return (SwingUtilities.isMiddleMouseButton(e)); |
| 349 |
case RIGHT: |
|
| 349 |
case BUTTON_RIGHT:
|
|
| 350 | 350 |
return (SwingUtilities.isRightMouseButton(e)); |
| 351 | 351 |
} |
| 352 | 352 |
} |
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/Behavior/RectangleBehavior.java | ||
|---|---|---|
| 110 | 110 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mousePressed(java.awt.event.MouseEvent) |
| 111 | 111 |
*/ |
| 112 | 112 |
public void mousePressed(MouseEvent e) {
|
| 113 |
if( !isMyButton(e) ) {
|
|
| 114 |
return; |
|
| 115 |
} |
|
| 113 | 116 |
if (e.getButton() == MouseEvent.BUTTON1) {
|
| 114 | 117 |
m_FirstPoint = e.getPoint(); |
| 115 | 118 |
getMapControl().repaint(); |
| ... | ... | |
| 125 | 128 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mouseReleased(java.awt.event.MouseEvent) |
| 126 | 129 |
*/ |
| 127 | 130 |
public void mouseReleased(MouseEvent e) throws BehaviorException {
|
| 131 |
if( !isMyButton(e) ) {
|
|
| 132 |
return; |
|
| 133 |
} |
|
| 128 | 134 |
if (m_FirstPoint == null) return; |
| 129 | 135 |
Point2D p1; |
| 130 | 136 |
Point2D p2; |
| ... | ... | |
| 182 | 188 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.Behavior#mouseDragged(java.awt.event.MouseEvent) |
| 183 | 189 |
*/ |
| 184 | 190 |
public void mouseDragged(MouseEvent e) {
|
| 191 |
if( !isMyButton(e) ) {
|
|
| 192 |
return; |
|
| 193 |
} |
|
| 185 | 194 |
m_LastPoint = e.getPoint(); |
| 186 | 195 |
getMapControl().repaint(); |
| 187 | 196 |
} |
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/Behavior/MoveBehavior.java | ||
|---|---|---|
| 33 | 33 |
import org.gvsig.fmap.mapcontrol.tools.Events.MoveEvent; |
| 34 | 34 |
import org.gvsig.fmap.mapcontrol.tools.Listeners.PanListener; |
| 35 | 35 |
import org.gvsig.fmap.mapcontrol.tools.Listeners.ToolListener; |
| 36 |
import org.slf4j.Logger; |
|
| 37 |
import org.slf4j.LoggerFactory; |
|
| 36 | 38 |
|
| 37 | 39 |
/** |
| 38 | 40 |
* <p> |
| ... | ... | |
| 44 | 46 |
* @author Pablo Piqueras Bartolom? |
| 45 | 47 |
*/ |
| 46 | 48 |
public class MoveBehavior extends Behavior {
|
| 47 |
|
|
| 49 |
private static final Logger logger = LoggerFactory.getLogger(MoveBehavior.class); |
|
| 48 | 50 |
/** |
| 49 | 51 |
* First point of the path in image coordinates. |
| 50 | 52 |
*/ |
| ... | ... | |
| 79 | 81 |
} |
| 80 | 82 |
|
| 81 | 83 |
public MoveBehavior(PanListener pli) {
|
| 82 |
this(pli,LEFT); |
|
| 84 |
this(pli,BUTTON_LEFT);
|
|
| 83 | 85 |
} |
| 84 | 86 |
|
| 85 | 87 |
public void paintComponent(MapControlDrawer renderer) {
|
| ... | ... | |
| 99 | 101 |
if (isMyButton(e)) {
|
| 100 | 102 |
isMyButton = true; |
| 101 | 103 |
m_FirstPoint = e.getPoint(); |
| 104 |
if (listener.cancelDrawing()) {
|
|
| 105 |
getMapControl().cancelDrawing(); |
|
| 106 |
} |
|
| 102 | 107 |
} |
| 103 | 108 |
|
| 104 |
if (listener.cancelDrawing()) {
|
|
| 105 |
getMapControl().cancelDrawing(); |
|
| 106 |
} |
|
| 109 |
|
|
| 107 | 110 |
} |
| 108 | 111 |
|
| 109 | 112 |
public void mouseReleased(MouseEvent e) throws BehaviorException {
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/Behavior/PolygonBehavior.java | ||
|---|---|---|
| 63 | 63 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.PolylineBehavior#mousePressed(java.awt.event.MouseEvent) |
| 64 | 64 |
*/ |
| 65 | 65 |
public void mousePressed(MouseEvent e) throws BehaviorException {
|
| 66 |
if( !isMyButton(e) ) {
|
|
| 67 |
return; |
|
| 68 |
} |
|
| 66 | 69 |
if (e.getClickCount() == 2) {
|
| 67 | 70 |
listener.polylineFinished(new MeasureEvent((Double[]) arrayX.toArray(new Double[arrayX.size()]), (Double[]) arrayY.toArray(new Double[arrayY.size()]), e)); |
| 68 | 71 |
|
| ... | ... | |
| 112 | 115 |
* @see com.iver.cit.gvsig.fmap.tools.Behavior.PolylineBehavior#mouseMoved(java.awt.event.MouseEvent) |
| 113 | 116 |
*/ |
| 114 | 117 |
public void mouseMoved(MouseEvent e) throws BehaviorException {
|
| 118 |
if( !isMyButton(e) ) {
|
|
| 119 |
return; |
|
| 120 |
} |
|
| 115 | 121 |
if (isClicked) {
|
| 116 | 122 |
changeAntPoint(getMapControl().getViewPort().toMapPoint(e.getPoint())); |
| 117 | 123 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/tools/Behavior/PointBehavior.java | ||
|---|---|---|
| 63 | 63 |
} |
| 64 | 64 |
|
| 65 | 65 |
public PointBehavior(PointListener l) {
|
| 66 |
this(l,LEFT); |
|
| 66 |
this(l,BUTTON_LEFT);
|
|
| 67 | 67 |
} |
| 68 | 68 |
|
| 69 | 69 |
/* |
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/src/main/java/org/gvsig/fmap/mapcontrol/MapControl.java | ||
|---|---|---|
| 1119 | 1119 |
drawCursor(); |
| 1120 | 1120 |
} |
| 1121 | 1121 |
|
| 1122 |
private String getStatusLabel(int status ) {
|
|
| 1123 |
switch(status) {
|
|
| 1124 |
case ACTUALIZADO: |
|
| 1125 |
return "ACTUALIZADO"; |
|
| 1126 |
case DESACTUALIZADO: |
|
| 1127 |
return "DESACTUALIZADO"; |
|
| 1128 |
default: |
|
| 1129 |
return Integer.toString(status); |
|
| 1130 |
} |
|
| 1131 |
} |
|
| 1122 | 1132 |
/** |
| 1123 | 1133 |
* <p> |
| 1124 | 1134 |
* Gets the {@link BufferedImage BufferedImage} used to accelerate the draw
|
| ... | ... | |
| 1154 | 1164 |
*/ |
| 1155 | 1165 |
public void drawMap(boolean doClear) {
|
| 1156 | 1166 |
cancelDrawing(); |
| 1157 |
// System.out.println("drawMap con doClear=" + doClear);
|
|
| 1167 |
//System.out.println("drawMap con doClear=" + doClear);
|
|
| 1158 | 1168 |
status = DESACTUALIZADO; |
| 1159 | 1169 |
if (doClear) {
|
| 1160 | 1170 |
// image = null; // Se usa para el PAN |
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/gui/DefaultViewPanel.java | ||
|---|---|---|
| 403 | 403 |
ZoomInListener zoomInListener = new ZoomInListener(m_MapControl); |
| 404 | 404 |
m_MapControl.addBehavior("zoomIn", new Behavior[]{
|
| 405 | 405 |
new RectangleBehavior(zoomInListener), |
| 406 |
new PointBehavior(zoomOutListener, PointBehavior.RIGHT)});
|
|
| 406 |
new PointBehavior(zoomOutListener, Behavior.BUTTON_RIGHT)});
|
|
| 407 | 407 |
|
| 408 | 408 |
// pan |
| 409 | 409 |
PanListener panListener = new PanListener(m_MapControl); |
| 410 |
m_MapControl.addBehavior("pan", new Behavior[]{new MoveBehavior(panListener)});
|
|
| 410 |
m_MapControl.addBehavior("pan", new MoveBehavior(panListener,Behavior.BUTTON_LEFT));
|
|
| 411 | 411 |
|
| 412 | 412 |
// Medir |
| 413 | 413 |
MeasureListener mli = new MeasureListener(m_MapControl); |
| ... | ... | |
| 450 | 450 |
|
| 451 | 451 |
m_MapControl.addCombinedBehavior(new MouseMovementBehavior(statusBarListener)); |
| 452 | 452 |
m_MapControl.addCombinedBehavior(new MouseWheelBehavior()); |
| 453 |
m_MapControl.addCombinedBehavior(new MoveBehavior(panListener, MoveBehavior.MIDDLE));
|
|
| 453 |
m_MapControl.addCombinedBehavior(new MoveBehavior(panListener, Behavior.BUTTON_MIDDLE));
|
|
| 454 | 454 |
} |
| 455 | 455 |
|
| 456 | 456 |
public void windowActivated() {
|
Also available in: Unified diff