Changeset 5815 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-03-30T20:21:20+01:00 (11 years ago)

Author:

akks

Message:

Improved filtering tracks by date: more convenient (see #8416)
allow sorting track table, ignore broken timestamps for filtering and colorizing
DateEditorWithSlider widget can be reused

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/GpxLayer.java (modified) (4 diffs)
• layer/gpx/ChooseTrackVisibilityAction.java (modified) (11 diffs)
• layer/gpx/DateFilterPanel.java (added)
• widgets/DateEditorWithSlider.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -115 +115 @@
     
     /**
-    * returns minimum and maximum timestamps for all tracks
+    * Returns minimum and maximum timestamps for all tracks
+    * Warning: there are lot of track with broken timestamps,
+    * so we just ingore points from future and from year before 1970 in this method
+    * works correctly @since 5815
     */
     public Date[] getMinMaxTimeForAllTracks() {
-        double min=Double.MIN_VALUE, max=Double.MAX_VALUE, t;
+        double min=1e100, max=-1e100, t;
+        double now = new Date().getTime()/1000.0;
         for (GpxTrack trk: data.tracks) {
             for (GpxTrackSegment seg : trk.getSegments()) {
                 for (WayPoint pnt : seg.getWayPoints()) {
                     t = pnt.time;
-                    if (t!=0) {
+                    if (t>0 && t<=now) {
                         if (t>max) max=t;
                         if (t<min) min=t;
@@ -130 +134 @@
             }
         }
-        if (min==Double.MIN_VALUE || max==Double.MAX_VALUE) return null;
+        //System.out.println("scanning "+data.tracks.size()+" tracks, found min,max"+min+"--"+max);
+        if (min==1e100 || max==-1e100) return null;
         return new Date[]{new Date((long) (min * 1000)), new Date((long) (max * 1000)), };
     }
@@ -528 +533 @@
                 oldWp = null;
             }
+            double now = new Date().getTime()/1000.0;
             if (colored == colorModes.time) {
-                for (GpxTrack trk : data.tracks) {
-                    for (GpxTrackSegment segment : trk.getSegments()) {
-                        for (WayPoint trkPnt : segment.getWayPoints()) {
-                            double t=trkPnt.time;
-                            if (t==0) {
-                                continue; // skip non-dated trackpoints
-                            }
-                            if(t > maxval) {
-                                maxval = t;
-                            }
-                            if(t < minval) {
-                                minval = t;
-                            }
-                        }
-                    }
-                }
-            }
-
+                Date bounds[] = getMinMaxTimeForAllTracks();
+                if (bounds!=null) {
+                    minval = bounds[0].getTime()/1000.0;
+                    maxval = bounds[1].getTime()/1000.0;
+                } else {
+                    minval = 0; maxval=now;
+                }
+            }
+            
             for (GpxTrack trk : data.tracks) {
                 for (GpxTrackSegment segment : trk.getSegments()) {
@@ -592 +589 @@
                                 break;
                             case time:
-                                if (trkPnt.time>0){
-                                    int tColor = (int) Math.round((trkPnt.time-minval)*255/(maxval-minval));
+                                double t=trkPnt.time;
+                                if (t>0 && t<=now){ // skip bad timestamps
+                                    int tColor = (int) Math.round((t-minval)*255/(maxval-minval));
                                     trkPnt.customColoring = colors[tColor];
                                 } else {

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -6 +6 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.Map;
 import javax.swing.AbstractAction;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JSlider;
-import javax.swing.JSpinner;
 import javax.swing.JTable;
+import javax.swing.JToggleButton;
 import javax.swing.ListSelectionModel;
-import javax.swing.SpinnerDateModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -50 +41 @@
     private final GpxLayer layer;
  
+    DateFilterPanel dateFilter;
     JTable table;
-    JDateWithSlider dateFrom = new JDateWithSlider(tr("From"));
-    JDateWithSlider dateTo = new JDateWithSlider(tr("To"));
-    JCheckBox checkBox  = new JCheckBox(tr("No timestamp"));
-    private boolean showNoTimestamp;
     
     public ChooseTrackVisibilityAction(final GpxLayer layer) {
@@ -84 +72 @@
      * Builds an non-editable table whose 5th column will open a browser when double clicked.
      * The table will fill its parent. */
-    private JTable buildTable(String[] headers, Object[][] content) {
+    private JTable buildTable(Object[][] content) {
+        final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")};
         final JTable t = new JTable(content, headers) {
             @Override
@@ -127 +116 @@
             }
         };
+        t.setAutoCreateRowSorter(true);
         t.addMouseListener(urlOpener);
         t.setFillsViewportHeight(true);
@@ -134 +124 @@
     boolean noUpdates=false;
     
-    private void filterTracksByDate() {
-        layer.filterTracksByDate(dateFrom.getDate(), dateTo.getDate(), checkBox.isSelected());
-    }
-    
-    /** selects all rows (=tracks) in the table that are currently visible */
+    /** selects all rows (=tracks) in the table that are currently visible on the layer*/
     private void selectVisibleTracksInTable() {
         // don't select any tracks if the layer is not visible
@@ -158 +144 @@
             @Override
             public void valueChanged(ListSelectionEvent e) {
-                if (!(e.getSource() instanceof ListSelectionModel)) {
-                    return;
-                }
-                if (!noUpdates) updateVisibilityFromTable();
+                if (noUpdates || !(e.getSource() instanceof ListSelectionModel)) {
+                    return;
+                }
+                updateVisibilityFromTable();
             }
         });
@@ -169 +155 @@
         ListSelectionModel s = (ListSelectionModel) table.getSelectionModel();
         for (int i = 0; i < layer.trackVisibility.length; i++) {
-            layer.trackVisibility[i] = s.isSelectedIndex(i);
-            System.out.printf("changed %d:=%s", i, ""+layer.trackVisibility[i]);
+            layer.trackVisibility[table.convertRowIndexToModel(i)] = s.isSelectedIndex(i);
         }
         Main.map.mapView.preferenceChanged(null);
         Main.map.repaint(100);
     }
-    
-    private static final String PREF_DATE0 = "gpx.traces.showzerotimestamp";
-    private static final String PREF_DATE1 = "gpx.traces.mintime";
-    private static final String PREF_DATE2 = "gpx.traces.maxtime";
     
     @Override
@@ -184 +165 @@
         final JPanel msg = new JPanel(new GridBagLayout());
         
-        final Date startTime, endTime;
-        Date[] bounds = layer.getMinMaxTimeForAllTracks();
+        dateFilter = new DateFilterPanel(layer, "gpx.traces", false);
+        dateFilter.setFilterAppliedListener(new ActionListener(){
+            @Override public void actionPerformed(ActionEvent e) {
+                noUpdates = true;
+                selectVisibleTracksInTable();
+                noUpdates = false;
+                Main.map.mapView.preferenceChanged(null);
+                Main.map.repaint(100);
+            }
+        });
+        dateFilter.loadFromPrefs();
         
-        startTime = (bounds==null) ? new GregorianCalendar(2000, 1, 1).getTime():bounds[0];
-        endTime = (bounds==null) ? new Date() : bounds[2];
-
-        long d1 = Main.pref.getLong(PREF_DATE1, 0);
-        if (d1==0) d1=new GregorianCalendar(2000, 1, 1).getTime().getTime();
-        long d2 = Main.pref.getLong(PREF_DATE2, 0);
-        if (d2==0) d2=System.currentTimeMillis();
+        final JToggleButton b = new JToggleButton(new AbstractAction(tr("Select by date")) {
+            @Override public void actionPerformed(ActionEvent e) {
+                if (((JToggleButton) e.getSource()).isSelected()) {
+                    dateFilter.setEnabled(true);
+                    dateFilter.applyFilter();
+                } else {
+                    dateFilter.setEnabled(false);
+                }
+            }
+        });
+        dateFilter.setEnabled(false);
+        msg.add(b, GBC.std().insets(0,0,5,0));
+        msg.add(dateFilter, GBC.eol().insets(0,0,10,0).fill(GBC.HORIZONTAL));
         
-        dateFrom.setValue(new Date(d1)); 
-        dateTo.setValue(new Date(d2)); 
-        dateFrom.setRange(startTime, endTime); 
-        dateTo.setRange(startTime, endTime); 
-        checkBox.setSelected(Main.pref.getBoolean(PREF_DATE0, true));
-        
-        JButton selectDate = new JButton();
-        msg.add(selectDate, GBC.std().grid(1,1).insets(0, 0, 20, 0));
-        msg.add(checkBox, GBC.std().grid(2,1).insets(0, 0, 20, 0));
-        msg.add(dateFrom, GBC.std().grid(3,1).fill(GBC.HORIZONTAL));
-        msg.add(dateTo, GBC.eol().grid(4,1).fill(GBC.HORIZONTAL));
-        msg.add(new JLabel(tr("<html>Select all tracks that you want to be displayed. You can drag select a " + "range of tracks or use CTRL+Click to select specific ones. The map is updated live in the " + "background. Open the URLs by double clicking them.</html>")), GBC.eol().fill(GBC.HORIZONTAL));
+        msg.add(new JLabel(tr("<html>Select all tracks that you want to be displayed. You can drag select a " + "range of tracks or use CTRL+Click to select specific ones. The map is updated live in the " + "background. Open the URLs by double clicking them.</html>")), GBC.eop().fill(GBC.HORIZONTAL));
         // build table
         final boolean[] trackVisibilityBackup = layer.trackVisibility.clone();
-        final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")};
-        table = buildTable(headers, buildTableContents());
+        table = buildTable(buildTableContents());
         selectVisibleTracksInTable();
         listenToSelectionChanges();
@@ -216 +200 @@
         JScrollPane scrollPane = new JScrollPane(table);
         msg.add(scrollPane, GBC.eol().fill(GBC.BOTH));
-        
-        selectDate.setAction(new AbstractAction(tr("Select by date")) {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                Main.pref.putLong(PREF_DATE1, dateFrom.getDate().getTime());
-                Main.pref.putLong(PREF_DATE2, dateTo.getDate().getTime());
-                Main.pref.put(PREF_DATE0, checkBox.isSelected());
-                noUpdates = true;
-                filterTracksByDate();
-                selectVisibleTracksInTable();
-                noUpdates = false;
-                updateVisibilityFromTable();
-            }
-        });
-        
+
         // build dialog
         ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Set track visibility for {0}", layer.getName()), new String[]{tr("Show all"), tr("Show selected only"), tr("Cancel")});
@@ -240 +210 @@
         ed.setRememberWindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent, new Dimension(1000, 500)));
         ed.showDialog();
+        dateFilter.saveInPrefs();
         int v = ed.getValue();
         // cancel for unknown buttons and copy back original settings
@@ -254 +225 @@
         final boolean all = v == 1 || s.isSelectionEmpty();
         for (int i = 0; i < layer.trackVisibility.length; i++) {
-            layer.trackVisibility[i] = all || s.isSelectedIndex(i);
+            layer.trackVisibility[table.convertRowIndexToModel(i)] = all || s.isSelectedIndex(i);
         }
         // ...sync with layer visibility instead to avoid having two ways to hide everything
         layer.setVisible(v == 1 || !s.isSelectionEmpty());
+
+        Main.map.mapView.preferenceChanged(null);
         Main.map.repaint();
     }
     
-    
-    public static class JDateWithSlider extends JPanel {
-        private JSpinner spinner;
-        private JSlider slider;
-        private Date dateMin;
-        private Date dateMax;
-        private static final int MAX_SLIDER=300;
-
-        public JDateWithSlider(String msg) {
-            super(new GridBagLayout());
-            spinner = new JSpinner( new SpinnerDateModel() );
-            String pattern = ((SimpleDateFormat)DateFormat.getDateInstance()).toPattern();
-            JSpinner.DateEditor timeEditor = new JSpinner.DateEditor(spinner,pattern);
-            spinner.setEditor(timeEditor);
-            slider = new JSlider(0,MAX_SLIDER);
-            slider.addChangeListener(new ChangeListener() {
-                public void stateChanged(ChangeEvent e) {
-                    spinner.setValue(dateFromInt(slider.getValue()));
-                }
-            });
-            add(new JLabel(msg),GBC.std());
-            add(spinner,GBC.std().insets(10,0,0,0));
-            add(slider,GBC.eol().insets(10,0,0,0).fill(GBC.HORIZONTAL));
-            
-            dateMin = new Date(0); dateMax =new Date();
-        }
-
-        private Date dateFromInt(int value) {
-            double k = 1.0*value/MAX_SLIDER;
-            return new Date((long)(dateMax.getTime()*k+ dateMin.getTime()*(1-k)));
-        }
-        private int intFromDate(Date date) {
-            return (int)(300.0*(date.getTime()-dateMin.getTime()) /
-                    (dateMax.getTime()-dateMin.getTime()));
-        }
-
-        private void setRange(Date dateMin, Date dateMax) {
-            this.dateMin = dateMin;
-            this.dateMax = dateMax;
-        }
-        
-        private void setValue(Date date) {
-            spinner.setValue(date);
-        }
-
-        private Date getDate() {
-            return (Date) spinner.getValue();
-        }
-    }
-   
 }