Changeset 23173 in osm for applications/editors/josm/plugins

Timestamp:

2010-09-15T12:51:36+02:00 (14 years ago)

Author:

guardian

Message:

minor UI changes

Location:

applications/editors/josm/plugins/videomapping

Files:

• images/jumpto.png (added)
• images/loop.png (added)
• resources/icon_jumpto.svg (added)
• resources/icon_loop.svg (added)
• src/org/openstreetmap/josm/plugins/videomapping/GpsPlayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java (modified) (9 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java (modified) (3 diffs)

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

@@ -347 +347 @@
         public void jump(long relTime) {
                 int pos = Math.round(relTime/1000);//TODO ugly quick hack       
-                jump(pos);                              
+                jump(pos);
+                //if (autoCenter) Main.map.mapView.
         }
         

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

@@ -268 +268 @@
                                 {
                                         player.jump(wp);
-                                        if(gps!=null) notifyObservers(player.getRelativeTime()); //call videoplayer to set rigth position
+                                        //jump if we know position
+                                        if(wp.attr.containsKey("synced"))
+                                        {                                               
+                                                if(gps!=null) notifyObservers(player.getRelativeTime()); //call videoplayers to set right position
+                                        }
                                 }
                         }

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

@@ -147 +147 @@
                 };
                 
-                VStart = new JosmAction(tr("play/pause"), "audio-playpause", tr("starts/pauses video playback"),
-                                Shortcut.registerShortcut("videomapping:startstop","",KeyEvent.VK_SPACE, Shortcut.GROUP_DIRECT), false) {
+                VStart = new JosmAction(tr("Play/Pause"), "audio-playpause", tr("starts/pauses video playback"),
+                                Shortcut.registerShortcut("videomapping:startstop","",KeyEvent.VK_NUMPAD5, Shortcut.GROUP_DIRECT), false) {
                         
                         public void actionPerformed(ActionEvent e) {                                                            
@@ -154 +154 @@
                         }
                 };
-                Vbackward = new JosmAction(tr("backward"), "audio-prev", tr("jumps n sec back"),
+                Vbackward = new JosmAction(tr("Backward"), "audio-prev", tr("jumps n sec back"),
                                 Shortcut.registerShortcut("videomapping:backward","",KeyEvent.VK_NUMPAD4, Shortcut.GROUP_DIRECT), false) {
-                        
-                        /**
-                                         * 
-                                         */
-                                        private static final long serialVersionUID = -1060444361541900464L;
-
                         public void actionPerformed(ActionEvent e) {
                                 player.backward();
@@ -167 +161 @@
                         }
                 };
-                Vbackward = new JosmAction(tr("jump"), null, tr("jumps to the entered gps time"),null, false) {                 
+                Vbackward = new JosmAction(tr("Jump To"), null, tr("jumps to the entered gps time"),null, false) {                      
                         public void actionPerformed(ActionEvent e) {
                                 String s =JOptionPane.showInputDialog(tr("please enter GPS timecode"),"10:07:57");
@@ -185 +179 @@
                         }
                 };
-                Vforward= new JosmAction(tr("forward"), "audio-next", tr("jumps n sec forward"),
+                Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"),
                                 Shortcut.registerShortcut("videomapping:forward","",KeyEvent.VK_NUMPAD6, Shortcut.GROUP_DIRECT), false) {
                         
@@ -193 +187 @@
                         }
                 };
-                Vfaster= new JosmAction(tr("faster"), "audio-faster", tr("faster playback"),
-                                Shortcut.registerShortcut("videomapping:faster","",KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT), false) {
+                Vfaster= new JosmAction(tr("Faster"), "audio-faster", tr("faster playback"),
+                                Shortcut.registerShortcut("videomapping:faster","",KeyEvent.VK_NUMPAD8, Shortcut.GROUP_DIRECT), false) {
                         
                         public void actionPerformed(ActionEvent e) {
@@ -201 +195 @@
                         }
                 };
-                Vslower= new JosmAction(tr("slower"), "audio-slower", tr("slower playback"),
-                                Shortcut.registerShortcut("videomapping:slower","",KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), false) {
+                Vslower= new JosmAction(tr("Slower"), "audio-slower", tr("slower playback"),
+                                Shortcut.registerShortcut("videomapping:slower","",KeyEvent.VK_NUMPAD2, Shortcut.GROUP_DIRECT), false) {
                         
                         public void actionPerformed(ActionEvent e) {
@@ -209 +203 @@
                         }
                 };
-                Vloop= new JosmAction(tr("loop"), "clock", tr("loops n sec around current position"),
-                                Shortcut.registerShortcut("videomapping:loop","",KeyEvent.VK_NUMPAD5, Shortcut.GROUP_DIRECT), false) {
+                Vloop= new JosmAction(tr("Loop"), null, tr("loops n sec around current position"),
+                                Shortcut.registerShortcut("videomapping:loop","",KeyEvent.VK_NUMPAD7, Shortcut.GROUP_DIRECT), false) {
                         
                         public void actionPerformed(ActionEvent e) {
@@ -219 +213 @@
                 
                 //now the options menu
-                VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), "cursor/crosshair", tr("follows the video icon automaticly"),null, false) {
+                VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), null, tr("follows the video icon automaticly"),null, false) {
                         
                         public void actionPerformed(ActionEvent e) {
                                 autocenter=VCenterIcon.isSelected();
+                                player.setAutoCenter(autocenter);
                                 applySettings();
                                 saveSettings();
@@ -229 +224 @@
                 });
                 //now the options menu
-                VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), "cursor/crosshair", tr("Show subtitles in video"),null, false) {
+                VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), null, tr("Show subtitles in video"),null, false) {
                         
                         public void actionPerformed(ActionEvent e) {

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

@@ -23 +23 @@
 public class GPSVideoPlayer implements PlayerObserver{
         Timer t;
-        TimerTask syncGPSTrack;
+        TimerTask updateGPSTrack;
         private GpsPlayer gps;
         private SimpleVideoPlayer video;
@@ -64 +64 @@
                         public void playing(long time) {
                                 //sync the GPS back
-                                if(synced) gps.jump(getGPSTime(time));                  
+                                if(synced) gps.jump(getGPSTime(time));
+                                
                         }
 
@@ -187 +188 @@
                 
         }
+        
+        public boolean isSynced()
+        {
+                return isSynced();
+        }
 
         public void loop() {