Changeset 23988 in osm for applications/editors/josm

Timestamp:

2010-11-01T13:12:05+01:00 (14 years ago)

Author:

guardian

Message:

Refactoring times #1

Location:

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

Files:

• GpsPlayer.java (modified) (5 diffs)
• PositionLayer.java (modified) (1 diff)

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/GpsPlayer.java

@@ -90 +90 @@
     }
     
+    //select the k-th waypoint
+    public void goTo(int k)
+    {
+        if (k>0)
+        {
+            if ((ls.indexOf(curr)+k>0)&&(ls.indexOf(curr)<ls.size())) //check range
+            {
+                goTo(ls.get(k));
+            }
+            Main.map.mapView.repaint();
+        }
+    }
+    
     //walk k waypoints forward/backward
     public void move(int k)
@@ -100 +113 @@
         Main.map.mapView.repaint(); //seperate modell and view logic...
     }
-    
-    //select the k-th waypoint
-    public void goTo(int k)
-    {
-        if (k>0)
-        {
-            if ((ls.indexOf(curr)+k>0)&&(ls.indexOf(curr)<ls.size())) //check range
-            {
-                goTo(ls.get(k));
-            }
-            Main.map.mapView.repaint();
-        }
-    }
-    
     //go to the position at the timecode e.g.g "14:00:01";
-    public void jump(Time GPSAbsTime)
+    public void jump(Date GPSAbsTime)
     {
         Date zero=start.getTime();
-        Time starttime = new Time(zero.getHours(),zero.getMinutes(),zero.getSeconds());
+        Date starttime = new Date(zero.getHours(),zero.getMinutes(),zero.getSeconds());
         long diff=GPSAbsTime.getTime()-starttime.getTime();
         goTo(getWaypoint(diff)); //TODO replace Time by Date?
     }
-    
-    /*
-    //go to the position at 
-    public void jump(Date GPSDate)
-    {
-        long s,m,h,diff;
-        //calculate which waypoint is at the offset
-        System.out.println(start.getTime());
-        System.out.println(start.getTime().getHours()+":"+start.getTime().getMinutes()+":"+start.getTime().getSeconds());
-        s=GPSDate.getSeconds()-start.getTime().getSeconds();
-        m=GPSDate.getMinutes()-start.getTime().getMinutes();
-        h=GPSDate.getHours()-start.getTime().getHours();
-        diff=s*1000+m*60*1000+h*60*60*1000; //FIXME ugly hack but nothing else works right
-        goTo(getWaypoint(diff)); 
-    }
-    */
+ 
     //gets only points on the line of the GPS track (between waypoints) nearby the point m
     private Point getInterpolated(Point m)
@@ -340 +324 @@
     //jumps to a specific time
     public void jump(long relTime) {
-        int pos = Math.round(relTime/1000);//TODO ugly quick hack   
+        int pos = Math.round(relTime/1000);//TODO assumes the time is constant
         goTo(pos);
         if (autoCenter) Main.map.mapView.zoomTo(curr.getCoor());
@@ -346 +330 @@
     
     //toggles walking along the track
-    public void play()
-    { /*
+    /* public void play(){
+    
         if (t==null)
         {
@@ -370 +354 @@
             t.cancel();
             t=null;                 
-        }*/
-    }
+        }
+    }*/
 
     public long getLength() {

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java

@@ -50 +50 @@
         gps= new GpsPlayer(ls);
         icon = new ImageIcon("images/videomapping.png");
-        gpsTimeCode= new SimpleDateFormat("hh:mm:ss");
+        gpsTimeCode= new SimpleDateFormat("hh:mm:ss");//TODO replace with DF small
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);