Index: /applications/editors/josm/plugins/turbopen/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java =================================================================== --- /applications/editors/josm/plugins/turbopen/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (revision 26162) +++ /applications/editors/josm/plugins/turbopen/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (revision 26163) @@ -5,5 +5,5 @@ * Licence: GPL v2 or later * Author: Alexei Kasatkin, 2011 - * Thanks to authors of BuildingTools, ImproveWayAccuracy and LakeWalker + * Thanks to authors of BuildingTools, ImproveWayAccuracy and LakeWalker * for good sample code */ @@ -53,8 +53,8 @@ AWTEventListener { private static final String SIMPLIFYMODE_MESSAGE= - "Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to tune simplification"; + tr("Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to tune simplification"); private static final String DRAWINGMODE_MESSAGE= - "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"; - + tr("Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line"); + private Color COLOR_FIXED; private Color COLOR_NORMAL; @@ -62,5 +62,5 @@ private Color COLOR_SELECTEDFRAGMENT; private Color COLOR_EDITEDFRAGMENT; - + private double maxDist; private double epsilonMult; @@ -70,5 +70,5 @@ /// Initial tolerance for Douglas-Pecker algorithm private double startingEps; - + private DrawnPolyLine line; private MapView mv; @@ -92,5 +92,5 @@ private Stroke strokeForDelete; private int dragNode=-1; - + FastDrawingMode(MapFrame mapFrame) { @@ -121,11 +121,11 @@ mv = Main.map.mapView; line.setMv(mv); - + if (getCurrentDataSet() == null) return; - + Main.map.mapView.addMouseListener(this); Main.map.mapView.addMouseMotionListener(this); Main.map.mapView.addTemporaryLayer(this); - + Main.map.mapView.setCursor(cursorDraw); @@ -166,10 +166,10 @@ ////////// Event listener methods - + @Override public void paint(Graphics2D g, MapView mv, Bounds bbox) { LinkedList pts=line.getPoints(); if (pts.isEmpty()) return; - + if (line.wasSimplified()) { // we are drawing simplified version, that exists @@ -178,5 +178,5 @@ g.setStroke(strokeForOriginal); } - + Point p1, p2; LatLon pp1, pp2; @@ -246,6 +246,6 @@ if (!isEnabled()) return; if (e.getButton() != MouseEvent.BUTTON1) return; - - + + int idx=line.findClosestPoint(e.getPoint(),maxDist); if (idx==0 && !line.isClosed()) { @@ -256,10 +256,10 @@ updateCursor(); return; - } - + } + if (ctrl && shift) newDrawing(); if (!ctrl && shift) { if (idx>=0) {line.deleteNode(idx); nearestIdx=-1;} - else line.tryToDeleteSegment(e.getPoint()); + else line.tryToDeleteSegment(e.getPoint()); return; } @@ -267,5 +267,5 @@ if (ctrl) { // toggle fixed point - line.toggleFixed(idx); + line.toggleFixed(idx); } // node dragging @@ -276,5 +276,5 @@ //if (line.isClosed()) { setStatusLine(tr(SIMPLIFYMODE_MESSAGE));return; } drawing = true; - + LatLon p = getLatLon(e); Node nd1 = getNearestNode(e.getPoint(), maxDist); @@ -284,15 +284,15 @@ p=nd1.getCoor(); line.fixPoint(p); - } - + } + line.addLast(p); if (ctrl) line.fixPoint(p); line.clearSimplifiedVersion(); - + setStatusLine(tr("Please move the mouse to draw new way")); repaint(); } - + @Override public void mouseReleased(MouseEvent e) { @@ -302,5 +302,5 @@ drawing = false; highlighted=null; - if (!line.isClosed()) setStatusLine(tr(DRAWINGMODE_MESSAGE)); + if (!line.isClosed()) setStatusLine(DRAWINGMODE_MESSAGE); repaint(); } @@ -315,9 +315,9 @@ if (!isEnabled()) return; Node nd1 = getNearestNode(e.getPoint(), maxDist); - boolean nearpoint2=nd1!=null; + boolean nearpoint2=nd1!=null; if (nearpoint!=nearpoint2) {nearpoint=nearpoint2;updateCursor();} - + nearestIdx=line.findClosestPoint(e.getPoint(),maxDist); - + if (!drawing) { if (dragNode>=0) { @@ -333,20 +333,20 @@ highlighted=h2; repaint(); - } + } } return; } - if (line.isClosed()) setStatusLine(tr(SIMPLIFYMODE_MESSAGE)); - + if (line.isClosed()) setStatusLine(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) { line.addFixed(nd1.getCoor()); // snap to node coords repaint(); - } + } } else { if (Math.hypot(e.getX() - lastP.x, e.getY() - lastP.y) > minPixelsBetweenPoints) { @@ -355,5 +355,5 @@ } } - + //statusText = getLatLon(e).toString(); updateStatusLine(); } @@ -373,5 +373,5 @@ if (!line.wasSimplified()) { line.simplify(eps); - setStatusLine(tr(SIMPLIFYMODE_MESSAGE)); + setStatusLine(SIMPLIFYMODE_MESSAGE); } else saveAsWay(); } @@ -391,5 +391,5 @@ line.moveToTheEnd(); } - + } @@ -421,5 +421,5 @@ int n = pts.size(); if (n == 0) return; - + Collection cmds = new LinkedList(); int i = 0; @@ -427,5 +427,5 @@ LatLon first=pts.get(0); Node firstNode=null; - + for (LatLon p : pts) { Node nd=null; @@ -482,9 +482,9 @@ //System.out.println(tr("Eps={0}", eps)); eps*=k; - setStatusLine(tr("Eps={0}", eps)); + /* I18N: Eps = Epsilon, the tolerance parameter */ setStatusLine(tr("Eps={0}", eps)); line.simplify(eps); repaint(); } - + private void setStatusLine(String tr) { statusText=tr; @@ -509,5 +509,5 @@ }*/ - + void loadPrefs() { COLOR_DELETE = Main.pref.getColor("fastdraw.color.delete", Color.red); @@ -523,5 +523,5 @@ eps=startingEps; } - + void savePrefs() { Main.pref.putColor("fastdraw.color.delete", COLOR_DELETE ); @@ -546,14 +546,14 @@ if (nearpoint) Main.map.mapView.setCursor(cursorCtrl); else Main.map.mapView.setCursor(cursorDraw); - - + + } // // - + private Node getNearestNode(Point point, double maxDist) { Node nd = Main.map.mapView.getNearestNode(point, OsmPrimitive.isUsablePredicate); - if (nd!=null && line.getPoint(nd.getCoor()).distance(point)<=maxDist) return nd; + if (nd!=null && line.getPoint(nd.getCoor()).distance(point)<=maxDist) return nd; else return null; } @@ -563,4 +563,4 @@ } // - + }