Changeset 26397 in osm for applications/editors/josm/plugins/infomode/src/org

Timestamp:

2011-07-25T13:17:41+02:00 (13 years ago)

Author:

akks

Message:

'InfoMode : link and velocity works, shift=highlight track'

Location:

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode

Files:

• InfoMode.java (modified) (8 diffs)
• InfoPanel.java (added)

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java

@@ -11 +11 @@
 
 import java.awt.AWTEvent;
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Point;
@@ -20 +21 @@
 import java.awt.Cursor;
 import java.awt.Graphics2D;
+import java.awt.Shape;
+import java.awt.Stroke;
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
@@ -68 +71 @@
     @Override
     public void enterMode() {
-        System.out.println("entering mode");
         if (!isEnabled()) return;
         super.enterMode();
-        System.out.println("enter mode");
-        
         
         mv = Main.map.mapView;
-        
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
@@ -91 +90 @@
     public void exitMode() {
         super.exitMode();
-        System.out.println("exit mode");
         Main.map.mapView.removeMouseListener(this);
         Main.map.mapView.removeMouseMotionListener(this);
@@ -123 +121 @@
             GpxLayer gpxL = (GpxLayer )l;
             
-            double minDist=1e9,d,len=0;
+            double minDist=1e9,d;
             WayPoint wp=null,oldWp=null,prevWp=null;
             GpxTrack trk=null;
+            double maxD = mv.getDist100Pixel()/3;
             for (GpxTrack track : gpxL.data.tracks) {
                 for (GpxTrackSegment seg : track.getSegments()) {
+                    oldWp=null;// next segment will have new previous point
                     for (WayPoint S : seg.getWayPoints()) {
                         d = S.getEastNorth().distance(pos);
-                        if (d<minDist && d<100) {
+                        
+                        if (d<minDist && d<maxD) {
                             minDist = d;
                             prevWp=oldWp;
@@ -136 +137 @@
                             trk=track;
                             }
-                        oldWp=wp;
+                        oldWp=S;
                     }
                 }
@@ -145 +146 @@
                 g.setColor(Color.RED);
                 g.fillOval(p.x-10, p.y-10, 20, 20); // mark selected point
+                if (shift) { // highlight track
+                    g.setColor(new Color(255,30,0,128));
+                    Stroke oldStroke = g.getStroke();
+                    g.setStroke( new BasicStroke(10) );
+                    for (GpxTrackSegment seg : trk.getSegments()) {
+                    Point oldP=null,curP=null;// next segment will have new previous point
+                        for (WayPoint S : seg.getWayPoints()) {
+                            curP = mv.getPoint(S.getEastNorth());
+                            if (oldP!=null) g.drawLine(oldP.x, oldP.y, curP.x, curP.y);
+                            oldP = curP;
+                        }
+                    }
+                    g.setStroke(oldStroke);
+                }
+                Point s=mv.getLocationOnScreen();
+                int pcx = s.x+p.x-40;
+                int pcy = s.y+p.y+30;
+                if (shift) {pcx+=40; pcy-=30;}
                 
                 if (wp!=wpOld) {
-                if (oldPopup!=null) oldPopup.hide();
-                double vel=-1;
-                if (prevWp!=null && wp.time!=prevWp.time) {
-                    vel=wp.getCoor().greatCircleDistance(prevWp.getCoor())/
-                            (wp.time-prevWp.time)*3.6;
-                }
-                infoPanel.setData(wp,trk,vel,gpxL.data.tracks);
-                Point s=mv.getLocationOnScreen();
-                Popup pp=PopupFactory.getSharedInstance().getPopup(mv, infoPanel, 
-                        s.x+p.x+10, s.y+p.y+10);
-                pp.show();
-                wpOld=wp;
-                oldPopup=pp;
+                    if (oldPopup!=null) oldPopup.hide();
+                    double vel=-1;
+                    if (prevWp!=null && wp.time!=prevWp.time) {
+                        vel=wp.getCoor().greatCircleDistance(prevWp.getCoor())/
+                                (wp.time-prevWp.time)*3.6;
+                    }
+                    infoPanel.setData(wp,trk,vel,gpxL.data.tracks);
+                    Popup pp=PopupFactory.getSharedInstance().getPopup(mv, infoPanel, 
+                            pcx, pcy);
+                    pp.show();
+                    wpOld=wp;
+                    oldPopup=pp;
                 }
             }
@@ -267 +285 @@
         }
     }
-
-    
-
-    
 }