Changeset 29263 in osm for applications/editors/josm

Timestamp:

2013-02-18T18:42:49+01:00 (12 years ago)

Author:

akks

Message:

'JOSM/FastDraw: add option (Q) to draw closed polygons'

Location:

applications/editors/josm/plugins/FastDraw

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fastdraw/DrawnPolyLine.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (modified) (6 diffs)

applications/editors/josm/plugins/FastDraw/build.xml

@@ -30 +30 @@
 <project name="FastDraw" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="FastDraw: better shortcut handling after core changes"/>
+    <property name="commit.message" value="JOSM/FastDraw: add option (Q) to draw closed polygons"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5035"/>

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/DrawnPolyLine.java

@@ -8 +8 @@
 import java.util.ListIterator;
 import java.util.Set;
-import javax.xml.stream.events.StartDocument;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -380 +379 @@
     }
 
+    int getPointCount() {
+        return points.size();
+    }
+
 }

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FDSettings.java

@@ -33 +33 @@
     // option for simplifiction: 0="Autosimplify and wait",
     //1="Simplify and wait", 2="Save as is"
+
+    public boolean drawClosed;
     public int simplifyMode;
     public float lineWidth;
@@ -54 +56 @@
         fixedClick = Main.pref.getBoolean("fastdraw.fixedclick", false);
         fixedSpacebar = Main.pref.getBoolean("fastdraw.fixedspacebar", false);
+        drawClosed =  Main.pref.getBoolean("fastdraw.drawclosed", false);
         simplifyMode = Main.pref.getInteger("fastdraw.simplifymode", 0);
         lineWidth = (float) Main.pref.getDouble("fastdraw.linewidth", 2);
@@ -76 +79 @@
          Main.pref.put("fastdraw.fixedclick", fixedClick);
          Main.pref.put("fastdraw.fixedspacebar", fixedSpacebar);
+         Main.pref.put("fastdraw.drawclosed", drawClosed);
          Main.pref.putInteger("fastdraw.simplifymode", simplifyMode);
          Main.pref.putDouble("fastdraw.linewidth",(double)lineWidth);

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java

@@ -5 +5 @@
 package org.openstreetmap.josm.plugins.fastdraw;
 
-import org.openstreetmap.josm.tools.GBC;
+import java.awt.Component;
 import java.awt.GridBagLayout;
 import javax.swing.JOptionPane;
+import org.openstreetmap.josm.tools.GBC;
 import java.text.NumberFormat;
 import java.text.ParseException;
@@ -42 +43 @@
         JCheckBox fixedClickCb = new JCheckBox(tr("Add fixed points on click"));
         JCheckBox fixedSpaceCb = new JCheckBox(tr("Add fixed points on spacebar"));
+        JCheckBox drawClosedCb = new JCheckBox(tr("Draw closed polygons only"));
+        
         all.add(label1,GBC.std().insets(10,0,0,0));
         all.add(text1, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
@@ -54 +57 @@
         all.add(fixedClickCb,GBC.eop().insets(20,0,0,0));
         all.add(fixedSpaceCb,GBC.eop().insets(20,0,0,0));
+        all.add(drawClosedCb,GBC.eop().insets(20,0,0,0));
         
         text1.setValue(settings.epsilonMult);
@@ -61 +65 @@
         fixedClickCb.setSelected(settings.fixedClick);
         fixedSpaceCb.setSelected(settings.fixedSpacebar);
+        drawClosedCb.setSelected(settings.drawClosed);
         combo1.setSelectedIndex(settings.simplifyMode);
-
+        
         ExtendedDialog dialog = new ExtendedDialog(Main.parent,
                 tr("FastDraw settings"),
@@ -84 +89 @@
             settings.fixedClick=fixedClickCb.isSelected();
             settings.fixedSpacebar=fixedSpaceCb.isSelected();
+            settings.drawClosed=drawClosedCb.isSelected();
             settings.simplifyMode=combo1.getSelectedIndex();
             settings.savePrefs();

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

@@ -127 +127 @@
         mv = Main.map.mapView;
         line.setMv(mv);
-
+        
         if (getCurrentDataSet() == null) return;
 
@@ -195 +195 @@
             g.setStroke(strokeForOriginal);
         }
-
+        
         Point p1, p2;
         LatLon pp1, pp2;
@@ -308 +308 @@
             return;
         }
+        autoCloseIfNeeded();
 
         if (ctrl && shift) {newDrawing();repaint();return;}
@@ -427 +428 @@
             }
         }
-        //statusText = getLatLon(e).toString();        updateStatusLine();
+        autoCloseIfNeeded();
     }
 
@@ -721 +722 @@
         Main.map.mapView.repaint();
     }
-// </editor-fold>
-
-// <editor-fold defaultstate="collapsed" desc="Helper functions">
-
-    private Node getNearestNode(Point point, double maxDist) {
-       Node nd = Main.map.mapView.getNearestNode(point, OsmPrimitive.isSelectablePredicate);
-       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>
-
+    
     private void tryToLoadWay() {
         updateCursor();
@@ -749 +736 @@
     }
 
+    private void autoCloseIfNeeded() {
+        if (settings.drawClosed && line.getPointCount()>1 && !line.isClosed()) {
+            line.closeLine();
+        }
+    }
+// </editor-fold>
+
+// <editor-fold defaultstate="collapsed" desc="Helper functions">
+
+    private Node getNearestNode(Point point, double maxDist) {
+       Node nd = Main.map.mapView.getNearestNode(point, OsmPrimitive.isSelectablePredicate);
+       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>
 
 }