Changeset 2662 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

Timestamp:

2009-12-19T18:56:45+01:00 (16 years ago)

Author:

bastiK

Message:

geoimage: reworked image correlation dialog. Might still have some quirks here and there. New: displays and updates the number of matched images in the status bar while you type.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -79 +79 @@
     private int currentPhoto = -1;
 
-    // These are used by the auto-guess function to store the result,
-    // so when the dialig is re-opened the users modifications don't
-    // get overwritten
-    public boolean hasTimeoffset = false;
-    public long timeoffset = 0;
-
     boolean useThumbs = false;
     ThumbsLoader thumbsloader;
+    boolean thumbsLoaded = false;
     private BufferedImage offscreenBuffer;
     boolean updateOffscreenBuffer = true;
-
-    /*
-     * Stores info about each image
-     */
-
-    static final class ImageEntry implements Comparable<ImageEntry> {
-        File file;
-        Date time;
-        LatLon exifCoor;
-        CachedLatLon pos;
-        Image thumbnail;
-        /** Speed in kilometer per second */
-        Double speed;
-        /** Elevation (altitude) in meters */
-        Double elevation;
-
-        public void setCoor(LatLon latlon)
-        {
-            pos = new CachedLatLon(latlon);
-        }
-        public int compareTo(ImageEntry image) {
-            if (time != null && image.time != null)
-                return time.compareTo(image.time);
-            else if (time == null && image.time == null)
-                return 0;
-            else if (time == null)
-                return -1;
-            else
-                return 1;
-        }
-    }
 
     /** Loads a set of images, while displaying a dialog that indicates what the plugin is currently doing.
@@ -277 +241 @@
                     boolean noGeotagFound = true;
                     for (ImageEntry e : layer.data) {
-                        if (e.pos != null) {
+                        if (e.getPos() != null) {
                             noGeotagFound = false;
                         }
@@ -344 +308 @@
         int i = 0;
         for (ImageEntry e : data)
-            if (e.pos != null) {
+            if (e.getPos() != null) {
                 i++;
             }
@@ -397 +361 @@
     private Dimension scaledDimension(Image thumb) {
         final double d = Main.map.mapView.getDist100Pixel();
-        final double size = 40 /*meter*/;     /* size of the photo on the map */
+        final double size = 10 /*meter*/;     /* size of the photo on the map */
         double s = size * 100 /*px*/ / d;
 
@@ -441 +405 @@
 
                 for (ImageEntry e : data) {
-                    if (e.pos == null) {
+                    if (e.getPos() == null) {
                         continue;
                     }
-                    Point p = mv.getPoint(e.pos);
+                    Point p = mv.getPoint(e.getPos());
                     if (e.thumbnail != null) {
                         Dimension d = scaledDimension(e.thumbnail);
@@ -464 +428 @@
         else {
             for (ImageEntry e : data) {
-                if (e.pos == null) {
+                if (e.getPos() == null) {
                     continue;
                 }
-                Point p = mv.getPoint(e.pos);
+                Point p = mv.getPoint(e.getPos());
                 icon.paintIcon(mv, g,
                         p.x - icon.getIconWidth() / 2,
@@ -477 +441 @@
             ImageEntry e = data.get(currentPhoto);
 
-            if (e.pos != null) {
-                Point p = mv.getPoint(e.pos);
+            if (e.getPos() != null) {
+                Point p = mv.getPoint(e.getPos());
 
                 if (e.thumbnail != null) {
@@ -496 +460 @@
     public void visitBoundingBox(BoundingXYVisitor v) {
         for (ImageEntry e : data) {
-            v.visit(e.pos);
+            v.visit(e.getPos());
         }
     }
@@ -549 +513 @@
 
             e.setCoor(new LatLon(lat, lon));
-            e.exifCoor = e.pos;
+            e.exifCoor = e.getPos();
 
         } catch (Exception p) {
-            e.pos = null;
+            e.exifCoor = null;
+            e.setPos(null);
         }
     }
@@ -614 +579 @@
                     new String[] {tr("Cancel"), tr("Delete")})
                 .setButtonIcons(new String[] {"cancel.png", "dialogs/delete.png"})
-                .setContent(new JLabel(tr("<html><h3>Delete the file {0}  from the disk?<p>The image file will be permanently lost!"
+                .setContent(new JLabel(tr("<html><h3>Delete the file {0}  from disk?<p>The image file will be permanently lost!"
                     ,toDelete.file.getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT))
                 .toggleEnable("geoimage.deleteimagefromdisk")
@@ -674 +639 @@
                 for (int i = data.size() - 1; i >= 0; --i) {
                     ImageEntry e = data.get(i);
-                    if (e.pos == null) {
+                    if (e.getPos() == null) {
                         continue;
                     }
-                    Point p = Main.map.mapView.getPoint(e.pos);
+                    Point p = Main.map.mapView.getPoint(e.getPos());
                     Rectangle r;
                     if (e.thumbnail != null) {
@@ -744 +709 @@
         }
     }
+    
+    public void loadThumbs() {    
+        if (useThumbs && !thumbsLoaded) {
+            thumbsLoaded = true;
+            thumbsloader = new ThumbsLoader(this);
+            Thread t = new Thread(thumbsloader);
+            t.setPriority(Thread.MIN_PRIORITY);
+            t.start();
+        }
+    }
+    
+    public void updateBufferAndRepaint() {
+        updateOffscreenBuffer = true;
+        Main.map.mapView.repaint();
+    }
 }