Changeset 23667 in osm

Timestamp:

2010-10-17T16:29:50+02:00 (14 years ago)

Author:

guardian

Message:

added autocenter, jump to

Location:

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

Files:

• GpsPlayer.java (modified) (2 diffs)
• PositionLayer.java (modified) (3 diffs)
• VideoMappingPlugin.java (modified) (7 diffs)
• video/GPSVideoPlayer.java (modified) (4 diffs)

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

@@ -117 +117 @@
     public void jump(Time GPSAbsTime)
     {
-        goTo(getWaypoint(GPSAbsTime.getTime()-start.getTime().getTime())); //TODO replace Time by Date?
+        Date zero=start.getTime();
+        Time starttime = new Time(zero.getHours(),zero.getMinutes(),zero.getSeconds());
+        long diff=GPSAbsTime.getTime()-starttime.getTime();
+        goTo(getWaypoint(diff)); //TODO replace Time by Date?
     }
     
@@ -339 +342 @@
         int pos = Math.round(relTime/1000);//TODO ugly quick hack   
         goTo(pos);
-        //if (autoCenter) Main.map.mapView.
+        if (autoCenter) Main.map.mapView.zoomTo(curr.getCoor());
     }
     

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

@@ -122 +122 @@
         Point p;
         //TODO Source out redundant calculations
-        //TODO make icon transparent
         //draw all GPS points
         g.setColor(Color.YELLOW); //new Color(0,255,0,128)
@@ -172 +171 @@
                 icon.paintIcon(null, g, p.x-icon.getIconWidth()/2, p.y-icon.getIconHeight()/2);             
                 //g.drawString(mins.format(iconPosition.getTime()),p.x-10,p.y-10); //TODO when synced we might wan't to use a different layout
-                g.drawString(gpsTimeCode.format(iconPosition.getTime()),p.x-10,p.y-10);
+                g.drawString(gpsTimeCode.format(iconPosition.getTime()),p.x-15,p.y-15);
             }
         }
@@ -180 +179 @@
             p=Main.map.mapView.getPoint(gps.getCurr().getEastNorth());
             icon.paintIcon(null, g, p.x-icon.getIconWidth()/2, p.y-icon.getIconHeight()/2);         
-            g.drawString(gpsTimeCode.format(gps.getCurr().getTime()),p.x-10,p.y-10);
+            g.drawString(gpsTimeCode.format(gps.getCurr().getTime()),p.x-15,p.y-15);
             }
         }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.videomapping;
 
+import java.awt.BorderLayout;
+import java.awt.Panel;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -6 +8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import javax.swing.Box;
+import javax.swing.InputVerifier;
+import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JFileChooser;
+import javax.swing.JFormattedTextField;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.JRadioButtonMenuItem;
+import javax.swing.text.MaskFormatter;
 
 import org.openstreetmap.josm.Main;
@@ -46 +57 @@
       private final String VM_JUMPLENGTH="videomapping.jumplength";
       private final String VM_LOOPLENGTH="videomapping.looplength";
+      private String deinterlacer;
       private boolean autocenter;
-      private String deinterlacer;
       private Integer jumplength,looplength;
       private String mru;
@@ -114 +125 @@
                         VRemove.setEnabled(true);
                         layer.getVideoPlayer().setSubtitleAction(VSubTitles);
+                        player=layer.getVideoPlayer();
                     }
                 }
@@ -127 +139 @@
         
         VStart = new JosmAction(tr("Play/Pause"), "audio-playpause", tr("starts/pauses video playback"),
-                Shortcut.registerShortcut("videomapping:startstop","",KeyEvent.VK_NUMPAD5, Shortcut.GROUP_DIRECT), false) {
+                Shortcut.registerShortcut("videomapping:startstop","Video: "+tr("Play/Pause"),KeyEvent.VK_NUMPAD5, Shortcut.GROUP_DIRECT), false) {
             
             public void actionPerformed(ActionEvent e) {                                
@@ -134 +146 @@
         };
         Vbackward = new JosmAction(tr("Backward"), "audio-prev", tr("jumps n sec back"),
-                Shortcut.registerShortcut("videomapping:backward","",KeyEvent.VK_NUMPAD4, Shortcut.GROUP_DIRECT), false) {
+                Shortcut.registerShortcut("videomapping:backward","Video: "+tr("Backward"),KeyEvent.VK_NUMPAD4, Shortcut.GROUP_DIRECT), false) {
             public void actionPerformed(ActionEvent e) {
                 player.backward();
+            }
+        };
+        Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"),
+                Shortcut.registerShortcut("videomapping:forward","Video: "+tr("Forward"),KeyEvent.VK_NUMPAD6, Shortcut.GROUP_DIRECT), false) {
+            
+            public void actionPerformed(ActionEvent e) {
+                player.forward();
+                            
+            }
+        };
+        Vfaster= new JosmAction(tr("Faster"), "audio-faster", tr("faster playback"),
+                Shortcut.registerShortcut("videomapping:faster","Video: "+tr("Faster"),KeyEvent.VK_NUMPAD8, Shortcut.GROUP_DIRECT), false) {
+            
+            public void actionPerformed(ActionEvent e) {
+                player.faster();
+                            
+            }
+        };
+        Vslower= new JosmAction(tr("Slower"), "audio-slower", tr("slower playback"),
+                Shortcut.registerShortcut("videomapping:slower","Video: "+tr("Slower"),KeyEvent.VK_NUMPAD2, Shortcut.GROUP_DIRECT), false) {
+            
+            public void actionPerformed(ActionEvent e) {
+                player.slower();
                             
             }
@@ -142 +177 @@
         VJump= new JosmAction(tr("Jump To"), "jumpto", 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");
-                SimpleDateFormat format= new SimpleDateFormat("hh:mm:ss");
-                Date t;
-                try {
-                    t = format.parse(s);
-                    if (t!=null)
-                        {                           
-                            player.jumpToGPSTime(t.getTime());
-                        }                       
-                } catch (ParseException e1) {
-                    // TODO Auto-generated catch block
-                    e1.printStackTrace();
-                }
-                            
-            }
-        };
-        Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"),
-                Shortcut.registerShortcut("videomapping:forward","",KeyEvent.VK_NUMPAD6, Shortcut.GROUP_DIRECT), false) {
-            
-            public void actionPerformed(ActionEvent e) {
-                player.forward();
-                            
-            }
-        };
-        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) {
-                player.faster();
-                            
-            }
-        };
-        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) {
-                player.slower();
-                            
-            }
+                String s;
+                try {
+                JOptionPane d=new JOptionPane(tr("Jump to"), JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
+                JFormattedTextField inp = new JFormattedTextField(new MaskFormatter("##:##:##"));
+                inp.setText("00:00:01");
+                inp.setInputVerifier(new InputVerifier() {                                      
+                                        @Override
+                                        public boolean verify(JComponent input) {
+                                                // TODO Auto-generated method stub
+                                                return false;
+                                        }
+                                });
+                //TODO here we should show the GPS time range to the user
+                if(d.showConfirmDialog(Main.main.panel,inp, tr("Jump to"),JOptionPane.OK_CANCEL_OPTION)==JOptionPane.OK_OPTION)
+                {
+                        s=inp.getText();
+                        Date t;
+                        SimpleDateFormat sdf= new SimpleDateFormat("hh:mm:ss");
+                        t = sdf.parse(s);
+                        if (t!=null)
+                        {
+                            player.jumpToGPSTime(t.getTime());
+                        }                       
+                }
+                } catch (ParseException e1) {
+                            // TODO Auto-generated catch block
+                            e1.printStackTrace();
+                    }
+
+            }
+                            
+            
         };
         Vloop= new JosmAction(tr("Loop"), "loop", tr("loops n sec around current position"),
-                Shortcut.registerShortcut("videomapping:loop","",KeyEvent.VK_NUMPAD7, Shortcut.GROUP_DIRECT), false) {
+                Shortcut.registerShortcut("videomapping:loop","Video: "+tr("loop"),KeyEvent.VK_NUMPAD7, Shortcut.GROUP_DIRECT), false) {
             
             public void actionPerformed(ActionEvent e) {

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

@@ -4 +4 @@
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.sql.Date;
 import java.sql.Time;
 import java.util.List;
@@ -12 +13 @@
 import javax.swing.JCheckBoxMenuItem;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.plugins.videomapping.GpsPlayer;
@@ -61 +63 @@
             public void playing(long time) {
                 //sync the GPS back
-                if(synced) gps.jump(getGPSTime(time));
+                if(synced) {
+                        gps.jump(getGPSTime(time));
+                }
                 
             }
@@ -148 +152 @@
     public void jumpToGPSTime(long gpsT)
     {
-       /* if(!synced)
+        if(!synced)
         {
             //when not synced we can just move the icon to the right position           
-            gps.jump(new Date(gpsT));
+            gps.jump(new Time(gpsT));
             Main.map.mapView.repaint();
-        }*/
+        }
         video.jump(getVideoTime(gpsT));
     }