Changeset 26101 in osm

Timestamp:

2011-06-05T21:44:03+02:00 (14 years ago)

Author:

akks

Message:

FastDraw plugin source - delete/improve line fragment features, restructuring of the code

Location:

applications/editors/josm/plugins/turbopen/src/org/openstreetmap/josm/plugins/fastdraw

Files:

• DrawnPolyLine.java (added)
• FastDrawingMode.java (modified) (25 diffs)

applications/editors/josm/plugins/turbopen/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java

@@ -15 +15 @@
 import java.awt.Point;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseWheelEvent;
 import org.openstreetmap.josm.data.coor.LatLon;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -27 +26 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.MouseWheelListener;
 import java.io.IOException;
 import java.util.*;
 import javax.swing.JOptionPane;
-import javax.swing.plaf.basic.BasicArrowButton;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.SimplifyWayAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.command.AddCommand;
@@ -40 +36 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -49 +44 @@
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -59 +53 @@
     private static final String DRAWINGMODE_MESSAGE=
     "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click to start new line";
+    
+    private static final Color COLOR_FIXED = Color.green;
+    private static final Color COLOR_NORMAL = Color.white;
+    private static final Color COLOR_DELETE = Color.red;
+    private static final Color COLOR_SELECTEDFRAGMENT = Color.red;
+    private static final Color COLOR_EDITEDFRAGMENT = Color.orange;
     
     private double maxDist;
@@ -68 +68 @@
     private double startingEps;
     
+    private DrawnPolyLine line;
     private MapView mv;
-    private ArrayList<LatLon> points = new ArrayList<LatLon>(100);
-    private ArrayList<LatLon> simplePoints = new ArrayList<LatLon>(100);
     private String statusText;
     private boolean drawing;
@@ -77 +76 @@
     private boolean oldCtrl;
     private boolean oldShift;
-    Set<LatLon> used;
-    Set<LatLon> fixed = new HashSet<LatLon>();
-    private double eps=startingEps;
+    private double eps;
     private final Stroke strokeForSimplified;
     private final Stroke strokeForOriginal;
@@ -89 +86 @@
     private final Cursor cursorNode;
     private boolean nearpoint;
+    private LatLon highlighted;
+    private int nearestIdx;
+    private Stroke strokeForDelete;
     
 
@@ -96 +96 @@
                 tr("Mode: {0}", tr("Fast drawing mode")),
                 KeyEvent.VK_T, Shortcut.GROUP_EDIT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+        line=new DrawnPolyLine();
         strokeForOriginal = new BasicStroke();
+        strokeForDelete = new BasicStroke(3);
         strokeForSimplified = new BasicStroke(1,BasicStroke.CAP_ROUND,BasicStroke.JOIN_BEVEL,5f,
                 new float[]{5.f,5f},0f);
@@ -107 +109 @@
     }
 
+// <editor-fold defaultstate="collapsed" desc="Event listeners">
+
     @Override
     public void enterMode() {
@@ -113 +117 @@
         loadPrefs();
         mv = Main.map.mapView;
-
+        line.setMv(mv);
+        
         if (getCurrentDataSet() == null) return;
         
@@ -144 +149 @@
         savePrefs();
         Main.map.mapView.setCursor(cursorDraw);
-        Main.map.mapView.repaint();
+        repaint();
     }
 
@@ -161 +166 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds bbox) {
-        if (points.size() == 0) return;
-        List<LatLon> pts=points;
-        if (simplePoints!=null && simplePoints.size()>0) {
+        LinkedList<LatLon> pts=line.getPoints();
+        if (pts.isEmpty()) return;
+        
+        if (line.wasSimplified()) {
             // we are drawing simplified version, that exists
-            pts=simplePoints;
             g.setStroke(strokeForSimplified);
         } else {
@@ -172 +177 @@
         
         Point p1, p2;
-        LatLon pp2;
-        p1 = getPoint(pts.get(0));
-        g.setColor(Color.green);
+        LatLon pp1, pp2;
+        p1 = line.getPoint(pts.get(0));
+        g.setColor(COLOR_FIXED);
         g.fillOval(p1.x - 3, p1.y - 3, 7, 7);
+        Color lineColor=COLOR_NORMAL;
         if (pts.size() > 1) {
+        Iterator<LatLon> it1,it2;
+        it1=pts.listIterator(0);
+        it2=pts.listIterator(1);
             for (int i = 0; i < pts.size() - 1; i++) {
-                g.setColor(Color.red);
-                p1 = getPoint(pts.get(i));
-                pp2 = pts.get(i + 1);
-                p2 = getPoint(pts.get(i + 1));
-
+                pp1 = it1.next();
+                p1 = line.getPoint(pp1);
+                pp2 = it2.next();
+                p2 = line.getPoint(pp2);
+                if (highlighted==pp1) {lineColor=COLOR_SELECTEDFRAGMENT;}
+                if (line.isLastPoint(i)) { lineColor=COLOR_EDITEDFRAGMENT; }
+                g.setColor(lineColor);
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
-                if (fixed.contains(pp2)) {
-                    g.setColor(Color.green);
+  //                  g.fillOval(p2.x - 5, p2.y - 5, 11, 11);
+                if (line.isFixed(pp2)) {
+                    lineColor=COLOR_NORMAL;
+                    g.setColor(COLOR_FIXED);
                     g.fillOval(p2.x - 3, p2.y - 3, 7, 7);
                 } else {
                     g.fillRect(p2.x - 1, p2.y - 1, 3, 3);
                 }
+                if (shift && !line.wasSimplified() && nearestIdx==i+1 ) {
+                    // highlight node to delete
+                    g.setStroke(strokeForDelete);
+                    g.setColor(COLOR_DELETE);
+                    g.drawLine(p2.x - 5, p2.y - 5,p2.x + 5, p2.y + 5);
+                    g.drawLine(p2.x - 5, p2.y + 5,p2.x + 5, p2.y - 5);
+                    g.setStroke(strokeForOriginal);
+                }
+                if (ctrl && !line.wasSimplified() && nearestIdx==i+1 ) {
+                    // highlight node to delete
+                    g.setStroke(strokeForDelete);
+                    g.setColor( line.isFixed(pp2) ? COLOR_NORMAL: COLOR_FIXED);
+                    g.drawOval(p2.x - 5, p2.y - 5, 11, 11);
+                    g.setStroke(strokeForOriginal);
+                }
             }
         }
@@ -206 +234 @@
         updateCursor();
 //        updateStatusLine();
-        Main.map.mapView.repaint();
+        repaint();
     }
 
@@ -214 +242 @@
         if (e.getButton() != MouseEvent.BUTTON1) return;
         
-        int idx = findClosestPoint(e.getX(),e.getY(),maxDist);
+        
+        int idx=line.findClosestPoint(e.getPoint(),maxDist);
         if (idx==0) {
+            line.closeLine();
             // the way should become closed
-            points.add(points.get(idx));
             drawing=false;
             ready=true;
@@ -224 +253 @@
         } 
         
-        if (shift) newDrawing();
-        if (ready) {
-            setStatusLine(tr(SIMPLIFYMODE_MESSAGE));
+        if (ctrl && shift) newDrawing();
+        if (!ctrl && shift) {
+            if (idx>=0) {line.deleteNode(idx); nearestIdx=-1;}
+            else line.tryToDeleteSegment(e.getPoint()); 
             return;
         }
+        if (idx>=0) {
+            if (ctrl) {
+                // toggle fixed point
+                line.toggleFixed(idx);                
+            }
+            return;
+        }
+        
+        if (ready) { setStatusLine(tr(SIMPLIFYMODE_MESSAGE)); return;  }
+        drawing = true;
         
         LatLon p = getLatLon(e);
         Node nd1 = getNearestNode(e.getPoint(), maxDist);
-
         if (nd1!=null) {
             // found node, make it fixed point of the line
             //System.out.println("node "+nd1);
             p=nd1.getCoor();
-            fixed.add(p);
+            line.fixPoint(p);
         }         
         
-        drawing = true;
-        points.add(p);
-        if (ctrl) fixed.add(p);
-        simplePoints=null;
+        line.addLast(p);
+        if (ctrl) line.fixPoint(p);
+        line.clearSimplifiedVersion();
                
         setStatusLine(tr("Please move the mouse to draw new way"));
-        Main.map.mapView.repaint();
-
-    }
-    
-    
-
+        repaint();
+
+    }
+ 
     @Override
     public void mouseReleased(MouseEvent e) {
@@ -259 +295 @@
         if (!ready) setStatusLine(tr(DRAWINGMODE_MESSAGE)
                         + tr(SIMPLIFYMODE_MESSAGE));
-        Main.map.mapView.repaint();
+        repaint();
     }
 
@@ -274 +310 @@
         if (nearpoint!=nearpoint2) {nearpoint=nearpoint2;updateCursor();}
         
-        if (!drawing) return;
-        if (ready) {
-            setStatusLine(tr(SIMPLIFYMODE_MESSAGE));
-        }
-        
-        Point lastP = getPoint(points.get(points.size() - 1));
-
+        nearestIdx=line.findClosestPoint(e.getPoint(),maxDist);
+        
+        if (!drawing) {
+            if (shift) {
+                // find line fragment to highlight
+                LatLon h2=line.findBigSegment(e.getPoint());
+                if (highlighted!=h2) {
+                    highlighted=h2;
+                    repaint();
+                } 
+            }
+            return;
+        }
+        if (ready) setStatusLine(tr(SIMPLIFYMODE_MESSAGE));
+        
+        // do not draw points close to existing points - we do not want self-intersections
+        if (nearestIdx>=0) { return; }
+        
+        Point lastP = line.getLastPoint(); // last point of line fragment being edited
+                
         if (nearpoint){
             if ( Math.hypot(e.getX() - lastP.x, e.getY() - lastP.y) > 1e-2) {
-                points.add(nd1.getCoor());
-                fixed.add(nd1.getCoor());
-                Main.map.mapView.repaint();
+                line.addFixed(nd1.getCoor()); // snap to node coords
+                repaint();
             } 
         } else {
             if (Math.hypot(e.getX() - lastP.x, e.getY() - lastP.y) > minPixelsBetweenPoints) {
-                points.add(getLatLon(e));
-                Main.map.mapView.repaint();
+                line.addLast(getLatLon(e)); // free mouse-drawing
+                repaint();
             }
         }
@@ -297 +345 @@
     }
 
-    @Override
-    protected void updateStatusLine() {
-        Main.map.statusLine.setHelpText(statusText);
-        Main.map.statusLine.repaint();
-
-    }
-
-    LatLon getLatLon(MouseEvent e) {
-        return mv.getLatLon(e.getX(), e.getY());
-    }
-
-    Point getPoint(LatLon p) {
-        return mv.getPoint(p);
-    }
-
-    public void newDrawing() {
-        points.clear();
-        used=null;
-        fixed.clear();
-        eps=startingEps;
-        ready=false;
-        simplePoints=null;
-    }
-
-    public void back() {
-        if (points.size() == 0) {
-            return;
-        }
-        points.remove(points.size() - 1);
-        Main.map.mapView.repaint();
+    private void doKeyEvent(KeyEvent e) {
+        ///  System.out.println(e);
+        if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
+            if (line.wasSimplified()) {
+                line.clearSimplifiedVersion();
+                repaint();
+                eps=startingEps;
+            }
+            back();
+        }
+        if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+            // first Enter = simplify, second = save the way
+            if (!line.wasSimplified()) {
+                line.simplify(eps);
+                setStatusLine(tr(SIMPLIFYMODE_MESSAGE));
+            } else saveAsWay();
+        }
+        if (e.getKeyCode() == KeyEvent.VK_DOWN) {
+            // more details
+            e.consume();
+            changeEpsilon(epsilonMult);
+        }
+        if (e.getKeyCode() == KeyEvent.VK_UP) {
+            // less details
+            e.consume();
+            changeEpsilon(1/epsilonMult);
+        }
+        if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+            // less details
+            e.consume();
+            line.moveToTheEnd();
+        }
+              
+
     }
 
@@ -339 +391 @@
     }
 
-    private void doKeyEvent(KeyEvent e) {
-        ///  System.out.println(e);
-        if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE) {
-            if (simplePoints!=null) {
-                simplePoints=null;
-                Main.map.mapView.repaint();
-                eps=startingEps;
-            }
-            back();
-        }
-        if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-            // first Enter = simplify, second = save the way
-            if (simplePoints==null) {
-                simplify(eps);
-                setStatusLine(tr(SIMPLIFYMODE_MESSAGE));
-            } else saveAsWay();
-        }
-        if (e.getKeyCode() == KeyEvent.VK_DOWN) {
-            // more details
-            e.consume();
-            changeEpsilon(epsilonMult);
-        }
-        if (e.getKeyCode() == KeyEvent.VK_UP) {
-            // less details
-            e.consume();
-            changeEpsilon(1/epsilonMult);
-        }
-    }
-
-    
-    void changeEpsilon(double k) {
-        //System.out.println(tr("Eps={0}", eps));
-        eps*=k;
-        setStatusLine(tr("Eps={0}", eps));
-        simplify(eps);
-        Main.map.mapView.repaint();
-    }
-    
-    /**
-     * Simplified drawn line, not touching the nodes includes in "fixed" set.
-     */
-    private void simplify(double epsilon) {
-        //System.out.println("Simplify polyline...");
-        int n = points.size();
-        if (n < 3) return;
-        used = new HashSet<LatLon>(n);
-        int start = 0;
-        for (int i = 0; i < n; i++) {
-            LatLon p = points.get(i);
-            if (fixed.contains(p) || i == n - 1) {
-                if (start < 0) {
-                    start = i;
-                } else {
-                    douglasPeucker(start, i, epsilon, 0);
-                }
-            }
-        }
-        simplePoints = new ArrayList<LatLon>(n);
-        simplePoints.addAll(points);
-        simplePoints.retainAll(used);
-        Main.map.mapView.repaint();
-        used = null;
-    }
-
-    /**
-     * Simplification of the line specified by "points" field.
-     * Remainin points are included to "used" set.
-     * @param start - starting index
-     * @param end - ending index
-     * @param epsilon - min point-to line distance in pixels (tolerance)
-     * @param depth - recursion level
-     */
-    private void douglasPeucker(int start, int end, double epsilon, int depth) {
-        if (depth > 500) return;
-        if (end - start < 1) return; // incorrect invocation
-        LatLon first = points.get(start);
-        LatLon last = points.get(end);
-        Point firstp = getPoint(first);
-        Point lastp = getPoint(last);
-        used.add(first);
-        used.add(last);
-
-        if (end - start < 2) return;
-        
-        int farthest_node = -1;
-        double farthest_dist = 0;
-
-        ArrayList<double[]> new_nodes = new ArrayList<double[]>();
-
-        double d = 0;
-
-        for (int i = start + 1; i < end; i++) {
-            d = pointLineDistance(getPoint(points.get(i)), firstp, lastp);
-            if (d > farthest_dist) {
-                farthest_dist = d;
-                farthest_node = i;
-            }
-        }
-
-        if (farthest_dist > epsilon) {
-            douglasPeucker(start, farthest_node, epsilon, depth + 1);
-            douglasPeucker(farthest_node, end, epsilon, depth + 1);
-        }
-    }
-
-    /** Modfified funclion from LakeWalker
-     * Gets distance from point p1 to line p2-p3
-     */
-    public double pointLineDistance(Point p1, Point p2, Point p3) {
-        double x0 = p1.x;        double y0 = p1.y;
-        double x1 = p2.x;        double y1 = p2.y;
-        double x2 = p3.x;        double y2 = p3.y;
-        if (x2 == x1 && y2 == y1) {
-            return Math.hypot(x1 - x0, y1 - y0);
-        } else {
-            return Math.abs((x2-x1)*(y1-y0)-(x1-x0)*(y2-y1))/Math.hypot(x2 - x1,y2 - y1);
-        }
-    }
-
+    @Override
+    protected void updateStatusLine() {
+        Main.map.statusLine.setHelpText(statusText);
+        Main.map.statusLine.repaint();
+    }
+// </editor-fold>
+
+// <editor-fold defaultstate="collapsed" desc="Different action helper methods">
+    public void newDrawing() {
+        eps=startingEps;
+        ready=false;
+        line.clear();
+    }
     private void saveAsWay() {
-        List<LatLon> pts=points;
-        if (simplePoints!=null && simplePoints.size()>0) {
-            // we are drawig simplified version, that exists
-            pts=simplePoints;
-        }
-            
+        List<LatLon> pts=line.getPoints();
         int n = pts.size();
         if (n == 0) return;
@@ -476 +417 @@
         for (LatLon p : pts) {
             Node nd=null;
-            if (fixed.contains(p)) {
+            if (line.isFixed(p)) {
                 // there may be a node with same ccoords!
-                nd = Main.map.mapView.getNearestNode(getPoint(p), OsmPrimitive.isUsablePredicate);
+                nd = Main.map.mapView.getNearestNode(line.getPoint(p), OsmPrimitive.isUsablePredicate);
             }
             if (nd==null) {
@@ -505 +446 @@
     }
 
-    private int findClosestPoint(double x, double y, double d) {
-        int n=points.size();
-        int idx=-1;
-        double dist,minD=1e10;
-        for (int i=0;i<n;i++) {
-            dist = Math.sqrt(getPoint(points.get(i)).distanceSq(x,y));
-            if (dist<d && dist<minD) {
-                idx=i;
-                minD=dist;
-            };
-        }
-        return idx;
-    }
-
+    private void repaint() {
+        Main.map.mapView.repaint();
+    }
+
+    public void back() {
+        line.undo();
+        repaint();
+    }
+
+    void changeEpsilon(double k) {
+        //System.out.println(tr("Eps={0}", eps));
+        eps*=k;
+        setStatusLine(tr("Eps={0}", eps));
+        line.simplify(eps);
+        repaint();
+    }
+    
     private void setStatusLine(String tr) {
         statusText=tr;
@@ -548 +492 @@
         minPixelsBetweenPoints = Main.pref.getDouble("fastdraw.mindelta", 20);
         startingEps = Main.pref.getDouble("fastdraw.startingEps", 20);
+        eps=startingEps;
     }
     
@@ -570 +515 @@
         
     }
-
+// </editor-fold>
+
+// <editor-fold defaultstate="collapsed" desc="Helper functions">
+    
     private Node getNearestNode(Point point, double maxDist) {
        Node nd = Main.map.mapView.getNearestNode(point, OsmPrimitive.isUsablePredicate);
-       if (nd!=null && getPoint(nd.getCoor()).distance(point)<=maxDist) return nd; 
+       if (nd!=null && line.getPoint(nd.getCoor()).distance(point)<=maxDist) return nd; 
        else return null;
     }
 
+    LatLon getLatLon(MouseEvent e) {
+        return mv.getLatLon(e.getX(), e.getY());
+    }
+// </editor-fold>
+    
 }