Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 3051) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 3052) @@ -16,4 +16,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -120,5 +122,4 @@ JCheckBox cbShowThumbs; JLabel statusBarText; - StatusBarListener statusBarListener; // remember the last number of matched photos @@ -216,5 +217,6 @@ } - /** This action listener is called when the user has a photo of the time of his GPS receiver. It + /** + * This action listener is called when the user has a photo of the time of his GPS receiver. It * displays the list of photos of the layer, and upon selection displays the selected photo. * From that photo, the user can key in the time of the GPS. @@ -433,5 +435,5 @@ } - statusBarListener.updateStatusBar(); + statusBarUpdater.updateStatusBar(); yLayer.updateBufferAndRepaint(); } @@ -446,7 +448,6 @@ Layer cur = iterLayer.next(); if (cur instanceof GpxLayer) { - GpxDataWrapper gdw = new GpxDataWrapper(((GpxLayer) cur).getName(), - ((GpxLayer) cur).data, - ((GpxLayer) cur).data.storageFile); + GpxLayer curGpx = (GpxLayer) cur; + GpxDataWrapper gdw = new GpxDataWrapper(curGpx.getName(), curGpx.data, curGpx.data.storageFile); gpxLst.add(gdw); if (cur == yLayer.gpxLayer) { @@ -473,4 +474,5 @@ cbGpx.setSelectedItem(defaultItem); } + cbGpx.addActionListener(statusBarUpdaterWithRepaint); panelCb.add(cbGpx); @@ -500,5 +502,5 @@ delta = 0; } - delta = delta / 1000; + delta = delta / 1000; // milliseconds -> seconds tfOffset = new JTextField(10); @@ -625,42 +627,13 @@ statusBar.add(statusBarText); - statusBarListener = new StatusBarListener() { - @Override - public void updateStatusBar() { - statusBarText.setText(statusText()); - } - private String statusText() { - try { - timezone = parseTimezone(tfTimezone.getText().trim()); - delta = parseOffset(tfOffset.getText().trim()); - } catch (ParseException e) { - return e.getMessage(); - } - - // Construct a list of images that have a date, and sort them on the date. - ArrayList dateImgLst = getSortedImgList(); - for (ImageEntry ie : dateImgLst) { - ie.cleanTmp(); - } - - GpxDataWrapper selGpx = selectedGPX(false); - if (selGpx == null) - return tr("No gpx selected"); - - final long offset_ms = ((long) (timezone * 3600) + delta) * 1000; // in milliseconds - lastNumMatched = matchGpxTrack(dateImgLst, selGpx.data, offset_ms); - - return trn("Matched {0} of {1} photo to GPX track.", - "Matched {0} of {1} photos to GPX track.", - dateImgLst.size(), lastNumMatched, dateImgLst.size()); - } - }; - - tfTimezone.getDocument().addDocumentListener(statusBarListener); - tfOffset.getDocument().addDocumentListener(statusBarListener); - cbExifImg.addItemListener(statusBarListener); - cbTaggedImg.addItemListener(statusBarListener); - - statusBarListener.updateStatusBar(); + tfTimezone.addFocusListener(repaintTheMap); + tfOffset.addFocusListener(repaintTheMap); + + tfTimezone.getDocument().addDocumentListener(statusBarUpdater); + tfOffset.getDocument().addDocumentListener(statusBarUpdater); + cbExifImg.addItemListener(statusBarUpdaterWithRepaint); + cbTaggedImg.addItemListener(statusBarUpdaterWithRepaint); + + statusBarUpdater.updateStatusBar(); outerPanel = new JPanel(); @@ -784,5 +757,14 @@ } - private static abstract class StatusBarListener implements DocumentListener, ItemListener { + StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false); + StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true); + + private class StatusBarUpdater implements DocumentListener, ItemListener, ActionListener { + private boolean doRepaint; + + public StatusBarUpdater(boolean doRepaint) { + this.doRepaint = doRepaint; + } + public void insertUpdate(DocumentEvent ev) { updateStatusBar(); @@ -796,5 +778,57 @@ updateStatusBar(); } - abstract public void updateStatusBar(); + public void actionPerformed(ActionEvent e) { + updateStatusBar(); + } + + public void updateStatusBar() { + statusBarText.setText(statusText()); + if (doRepaint) { + yLayer.updateBufferAndRepaint(); + } + } + + private String statusText() { + try { + timezone = parseTimezone(tfTimezone.getText().trim()); + delta = parseOffset(tfOffset.getText().trim()); + } catch (ParseException e) { + return e.getMessage(); + } + + // The selection of images we are about to correlate may have changed. + // So reset all images. + for (ImageEntry ie: yLayer.data) { + ie.tmp = null; + } + + // Construct a list of images that have a date, and sort them on the date. + ArrayList dateImgLst = getSortedImgList(); + // Create a temporary copy for each image + for (ImageEntry ie : dateImgLst) { + ie.cleanTmp(); + } + + GpxDataWrapper selGpx = selectedGPX(false); + if (selGpx == null) + return tr("No gpx selected"); + + final long offset_ms = ((long) (timezone * 3600) + delta) * 1000; // in milliseconds + lastNumMatched = matchGpxTrack(dateImgLst, selGpx.data, offset_ms); + + return trn("Matched {0} of {1} photo to GPX track.", + "Matched {0} of {1} photos to GPX track.", + dateImgLst.size(), lastNumMatched, dateImgLst.size()); + } + } + + RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(); + private class RepaintTheMapListener implements FocusListener { + public void focusGained(FocusEvent e) { // do nothing + } + + public void focusLost(FocusEvent e) { + yLayer.updateBufferAndRepaint(); + } } @@ -875,16 +909,16 @@ delta = sldMinutes.getValue()*60 + sldSeconds.getValue(); - tfTimezone.getDocument().removeDocumentListener(statusBarListener); - tfOffset.getDocument().removeDocumentListener(statusBarListener); + tfTimezone.getDocument().removeDocumentListener(statusBarUpdater); + tfOffset.getDocument().removeDocumentListener(statusBarUpdater); tfTimezone.setText(formatTimezone(timezone)); tfOffset.setText(Long.toString(delta + 24*60*60L*dayOffset)); // add the day offset to the offset field - tfTimezone.getDocument().addDocumentListener(statusBarListener); - tfOffset.getDocument().addDocumentListener(statusBarListener); + tfTimezone.getDocument().addDocumentListener(statusBarUpdater); + tfOffset.getDocument().addDocumentListener(statusBarUpdater); lblMatches.setText(statusBarText.getText() + "
" + trn("(Time difference of {0} day)", "Time difference of {0} days", Math.abs(dayOffset), Math.abs(dayOffset))); - statusBarListener.updateStatusBar(); + statusBarUpdater.updateStatusBar(); yLayer.updateBufferAndRepaint(); } @@ -1009,6 +1043,6 @@ System.out.println("offt " + delta);*/ - tfTimezone.getDocument().removeDocumentListener(statusBarListener); - tfOffset.getDocument().removeDocumentListener(statusBarListener); + tfTimezone.getDocument().removeDocumentListener(statusBarUpdater); + tfOffset.getDocument().removeDocumentListener(statusBarUpdater); tfTimezone.setText(formatTimezone(timezone)); @@ -1016,8 +1050,8 @@ tfOffset.requestFocus(); - tfTimezone.getDocument().addDocumentListener(statusBarListener); - tfOffset.getDocument().addDocumentListener(statusBarListener); - - statusBarListener.updateStatusBar(); + tfTimezone.getDocument().addDocumentListener(statusBarUpdater); + tfOffset.getDocument().addDocumentListener(statusBarUpdater); + + statusBarUpdater.updateStatusBar(); yLayer.updateBufferAndRepaint(); }