Changeset 7912 in josm for trunk

Timestamp:

2014-12-30T11:22:07+01:00 (10 years ago)

Author:

bastiK

Message:

applied #10894 - Show photo direction arrow for thumbnail (patch by holgermappt)

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• GeoImageLayer.java (modified) (4 diffs)
• ImageDisplay.java (modified) (1 diff)
• ImageEntry.java (modified) (1 diff)
• ImageViewerDialog.java (modified) (1 diff)

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

@@ -6 +6 @@
 
 import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Composite;
@@ -13 +14 @@
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -496 +498 @@
                 Point p = mv.getPoint(e.getPos());
 
+                int imgWidth = 100;
+                int imgHeight = 100;
                 if (useThumbs && e.thumbnail != null) {
                     Dimension d = scaledDimension(e.thumbnail);
+                    imgWidth = d.width;
+                    imgHeight = d.height;
+                }
+                else {
+                    imgWidth = selectedIcon.getIconWidth();
+                    imgHeight = selectedIcon.getIconHeight();
+                }
+
+                if (e.getExifImgDir() != null) {
+                    // Multiplier must be larger than sqrt(2)/2=0.71.
+                    double arrowlength = Math.max(25, Math.max(imgWidth, imgHeight) * 0.85);
+                    double arrowwidth = arrowlength / 1.4;
+
+                    double dir = e.getExifImgDir();
+                    // Rotate 90 degrees CCW
+                    double headdir = ( dir < 90 ) ? dir + 270 : dir - 90;
+                    double leftdir = ( headdir < 90 ) ? headdir + 270 : headdir - 90;
+                    double rightdir = ( headdir > 270 ) ? headdir - 270 : headdir + 90;
+
+                    double ptx = p.x + Math.cos(Math.toRadians(headdir)) * arrowlength;
+                    double pty = p.y + Math.sin(Math.toRadians(headdir)) * arrowlength;
+
+                    double ltx = p.x + Math.cos(Math.toRadians(leftdir)) * arrowwidth/2;
+                    double lty = p.y + Math.sin(Math.toRadians(leftdir)) * arrowwidth/2;
+
+                    double rtx = p.x + Math.cos(Math.toRadians(rightdir)) * arrowwidth/2;
+                    double rty = p.y + Math.sin(Math.toRadians(rightdir)) * arrowwidth/2;
+
+                    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                    g.setColor(new Color(255, 255, 255, 192));
+                    int[] xar = {(int) ltx, (int) ptx, (int) rtx, (int) ltx};
+                    int[] yar = {(int) lty, (int) pty, (int) rty, (int) lty};
+                    g.fillPolygon(xar, yar, 4);
+                    g.setColor(Color.black);
+                    g.setStroke(new BasicStroke(1.2f));
+                    g.drawPolyline(xar, yar, 3);
+                }
+
+                if (useThumbs && e.thumbnail != null) {
                     g.setColor(new Color(128, 0, 0, 122));
-                    g.fillRect(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+                    g.fillRect(p.x - imgWidth / 2, p.y - imgHeight / 2, imgWidth, imgHeight);
                 } else {
-                    if (e.getExifImgDir() != null) {
-                        double arrowlength = 25;
-                        double arrowwidth = 18;
-
-                        double dir = e.getExifImgDir();
-                        // Rotate 90 degrees CCW
-                        double headdir = ( dir < 90 ) ? dir + 270 : dir - 90;
-                        double leftdir = ( headdir < 90 ) ? headdir + 270 : headdir - 90;
-                        double rightdir = ( headdir > 270 ) ? headdir - 270 : headdir + 90;
-
-                        double ptx = p.x + Math.cos(Math.toRadians(headdir)) * arrowlength;
-                        double pty = p.y + Math.sin(Math.toRadians(headdir)) * arrowlength;
-
-                        double ltx = p.x + Math.cos(Math.toRadians(leftdir)) * arrowwidth/2;
-                        double lty = p.y + Math.sin(Math.toRadians(leftdir)) * arrowwidth/2;
-
-                        double rtx = p.x + Math.cos(Math.toRadians(rightdir)) * arrowwidth/2;
-                        double rty = p.y + Math.sin(Math.toRadians(rightdir)) * arrowwidth/2;
-
-                        g.setColor(Color.white);
-                        int[] xar = {(int) ltx, (int) ptx, (int) rtx, (int) ltx};
-                        int[] yar = {(int) lty, (int) pty, (int) rty, (int) lty};
-                        g.fillPolygon(xar, yar, 4);
-                    }
-
                     selectedIcon.paintIcon(mv, g,
-                            p.x - selectedIcon.getIconWidth() / 2,
-                            p.y - selectedIcon.getIconHeight() / 2);
+                            p.x - imgWidth / 2,
+                            p.y - imgHeight / 2);
 
                 }
@@ -576 +594 @@
             e.setPos(null);
             return;
+        }
+
+        try {
+            double speed = dirGps.getDouble(GpsDirectory.TAG_GPS_SPEED);
+            String speedRef = dirGps.getString(GpsDirectory.TAG_GPS_SPEED_REF);
+            if (speedRef != null) {
+                if (speedRef.equalsIgnoreCase("M")) {
+                    // miles per hour
+                    speed *= 1.609344;
+                } else if (speedRef.equalsIgnoreCase("N")) {
+                    // knots == nautical miles per hour
+                    speed *= 1.852;
+                }
+                // default is K (km/h)
+            }
+            e.setSpeed(speed);
+        } catch (Exception ex) {
+            Main.debug(ex.getMessage());
         }
 

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

@@ -469 +469 @@
     public void setOsdText(String text) {
         this.osdText = text;
+        repaint();
     }
 

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

@@ -33 +33 @@
      */
     private CachedLatLon pos;
-    /** Speed in kilometer per second */
+    /** Speed in kilometer per hour */
     private Double speed;
     /** Elevation (altitude) in meters */

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

@@ -303 +303 @@
             }
             if (entry.getSpeed() != null) {
-                osd.append(tr("\n{0} km/h", Math.round(entry.getSpeed())));
+                osd.append(tr("\nSpeed: {0} km/h", Math.round(entry.getSpeed())));
             }
             if (entry.getExifImgDir() != null) {