Changeset 25861 in osm

Timestamp:

2011-04-16T21:03:42+02:00 (14 years ago)

Author:

guardian

Message:

adding sync

Location:

applications/editors/josm/plugins/videomapping

Files:

• .settings/org.eclipse.core.resources.prefs (modified) (1 diff)
• lib/vlcj-1.1.5.1-javadoc.jar (added)
• src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/Video.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java (modified) (3 diffs)
• uml/oldConcept.uml (added)
• uml/oldConcept.umlclass (added)
• uml/rendering.uml (added)
• uml/rendering.umlseq (added)

applications/editors/josm/plugins/videomapping/.settings/org.eclipse.core.resources.prefs

@@ -1 @@
-#Tue Mar 22 11:01:15 CET 2011
+#Fri Apr 15 18:36:49 CEST 2011
 eclipse.preferences.version=1
+encoding//uml/oldConcept.uml=UTF-8
+encoding//uml/oldConcept.umlclass=UTF-8
 encoding//uml/refactoring.uml=UTF-8
 encoding//uml/refactoring.umlclass=UTF-8
+encoding//uml/rendering.uml=UTF-8
+encoding//uml/rendering.umlseq=UTF-8

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

@@ -207 +207 @@
         if(fc.showOpenDialog(Main.main.parent)!=JFileChooser.CANCEL_OPTION)
         {
-//              mostRecentFolder=fc.getSelectedFile().getAbsolutePath();
-//              saveProperties();
+                mostRecentFolder=fc.getSelectedFile().getAbsolutePath();
+                saveProperties();
                 VideoPositionLayer videoPositionLayer= new VideoPositionLayer(gpsLayer);
+                GPSVideoPlayer gpsVideoPlayer = new GPSVideoPlayer(new SimpleDateFormat("hh:mm:ss") ,videoPositionLayer);
+                gpsVideoPlayer.addVideo(fc.getSelectedFile());
         }
                 

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

@@ -138 +138 @@
         }
         
-        private WayPoint getWayPointBefore(Date GPSTime)
+        public WayPoint getWayPointBefore(Date GPSTime)
         {
                 assert GPSTime.after(getFirstWayPoint().getTime())==true;
@@ -196 +196 @@
         if(p1.getCoor().lon()>p2.getCoor().lon()) return p1; else return p2;
     }
+    
+    public Date getGPSDate()
+    {
+        return iconPosition.getTime();
+    }
 
         public void mouseReleased(MouseEvent e) {

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.videomapping.video;
+import java.awt.Canvas;
 import java.io.File;
 
+import javax.swing.JComponent;
+
 // a specific synced video
-public class GPSVideo {
+public class GPSVideo extends Video{
+        public JComponent SyncComponent;
+        public GPSVideo(File filename, Canvas canvas) {
+                super(filename, canvas);
+        }
    
 

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.videomapping.video;
+import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.HeadlessException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -7 +10 @@
 import java.sql.Date;
 import java.sql.Time;
+import java.text.DateFormat;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Timer;
@@ -13 +19 @@
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JPanel;
 
 import org.openstreetmap.josm.Main;
@@ -18 +25 @@
 import org.openstreetmap.josm.plugins.videomapping.GpsPlayer;
 import org.openstreetmap.josm.plugins.videomapping.VideoObserver;
+import org.openstreetmap.josm.plugins.videomapping.VideoPositionLayer;
+
+import static org.openstreetmap.josm.tools.I18n.*;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 //extends video playback, major control has the video player
-public class GPSVideoPlayer
+public class GPSVideoPlayer extends VideoPlayer
 {
+        private JPanel syncPanel;
+        private List<GPSVideo> videos;
+        private List<JButton> syncButtons;
+        private VideoPositionLayer videoPositionLayer;
+
+        public GPSVideoPlayer(DateFormat videoTimeFormat,VideoPositionLayer videoPositionLayer) throws HeadlessException {
+                super(videoTimeFormat);
+                extendUI();
+                syncButtons=new LinkedList<JButton>();
+                this.videoPositionLayer=videoPositionLayer;
+        }
+
+        @Override
+        public GPSVideo addVideo(File Videofile) {
+                
+                GPSVideo video=(GPSVideo) super.addVideo(Videofile);
+                videos.add(video);
+                JButton syncButton= new JButton(tr("Sync"));
+                syncButton.setBackground(Color.RED);
+                syncPanel.add(syncButton);
+                syncButton.addActionListener(new ActionListener() {
+            //do a sync
+            public void actionPerformed(ActionEvent e) {
+                GPSVideo v=findVideo((JButton)e.getSource());
+                doSync(v,videoPositionLayer);
+            }
+                });
+                return video;
+        }
+
+        protected void doSync(GPSVideo v, VideoPositionLayer layer) {
+                WayPoint first=getFirstGPS(v.getTime(),layer.getGPSDate());
+                
+        }
+
+        //make sure we don't leave the GPS track
+        private WayPoint getFirstGPS(long videoTime, java.util.Date gpsDate) {
+                Date start=new Date(gpsDate.getTime()-videoTime);
+                if(start.before(videoPositionLayer.getFirstWayPoint().getTime()))
+                {
+                        return videoPositionLayer.getFirstWayPoint();
+                }
+                else
+                {
+                        return videoPositionLayer.getWayPointBefore(start);
+                }
+        }
+        
+        //make sure we don't leave the GPS track
+        private WayPoint getLastGPS(long videoTime, java.util.Date gpsDate) {
+                Date end=new Date(gpsDate.getTime()-videoTime);
+                if(end.after(videoPositionLayer.getLastWayPoint().getTime()))
+                {
+                        return videoPositionLayer.getLastWayPoint();
+                }
+                else
+                {
+                        return videoPositionLayer.getWayPointBefore(end);
+                }
+        }
+
+        protected GPSVideo findVideo(JButton source) {
+                for (GPSVideo v : videos) {
+                        if (v.SyncComponent==source) return v;
+                }
+                return null;
+        }
+
+        private void extendUI() {
+                syncPanel=new JPanel(new FlowLayout());
+                screenPanel.add(syncPanel,BorderLayout.EAST);
+                                
+        }
+        
+        
+        
     
     

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/Video.java

@@ -16 +16 @@
         }
         
+        public long getTime()
+        {
+                return player.getTime();
+        }
+        
 
 }

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java

@@ -61 +61 @@
 public class VideoPlayer extends JFrame implements WindowListener, VideosObserver, VideoPlayerObserver{
         private static final int notificationIntervall = 1000;
-        private JPanel screenPanel,controlsPanel,canvasPanel;
+        protected JPanel screenPanel,controlsPanel,canvasPanel;
     private JSlider timeline;
     private JButton play,back,forward;
@@ -94 +94 @@
         }
         
-        public void addVideo(File Videofile)
+        public Video addVideo(File Videofile)
         {
                 Video video = new Video(Videofile,new Canvas());
@@ -102 +102 @@
         pack();
         startNotificationTimer();
+        return video;
         }