Changeset 4241 in josm for trunk

Timestamp:

2011-07-14T17:00:22+02:00 (13 years ago)

Author:

bastiK

Message:

applied #5605 - Geotagged image viewer should rotate images according to EXIF orientation tag (patch by m.zdila, some modifications)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (3 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (8 diffs)
• gui/layer/geoimage/ImageDisplay.java (modified) (7 diffs)
• gui/layer/geoimage/ImageEntry.java (modified) (3 diffs)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (2 diffs)
• tools/ExifReader.java (modified) (2 diffs)

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

@@ -33 +33 @@
 import java.util.Comparator;
 import java.util.Date;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 
@@ -348 +346 @@
                 public void valueChanged(ListSelectionEvent arg0) {
                     int index = imgList.getSelectedIndex();
-                    imgDisp.setImage(yLayer.data.get(index).getFile());
+                    Integer orientation = null;
+                    try {
+                        orientation = ExifReader.readOrientation(yLayer.data.get(index).getFile());
+                    } catch (Exception e) {
+                    }
+                    imgDisp.setImage(yLayer.data.get(index).getFile(), orientation);
                     Date date = yLayer.data.get(index).getExifTime();
                     if (date != null) {
@@ -380 +383 @@
                         return;
 
-                    imgDisp.setImage(sel);
+                    Integer orientation = null;
+                    try {
+                        orientation = ExifReader.readOrientation(sel);
+                    } catch (Exception e) {
+                    }
+                    imgDisp.setImage(sel, orientation);
 
                     Date date = null;

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

@@ -63 +63 @@
 import com.drew.metadata.Directory;
 import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.exif.ExifDirectory;
 import com.drew.metadata.exif.GpsDirectory;
 
@@ -509 +511 @@
         double lon, lat;
         Metadata metadata = null;
-        Directory dir = null;
+        Directory dirExif = null, dirGps = null;
 
         try {
             metadata = JpegMetadataReader.readMetadata(e.getFile());
-            dir = metadata.getDirectory(GpsDirectory.class);
+            dirExif = metadata.getDirectory(ExifDirectory.class);
+            dirGps = metadata.getDirectory(GpsDirectory.class);
         } catch (CompoundException p) {
             e.setExifCoor(null);
@@ -521 +524 @@
 
         try {
+            int orientation = dirExif.getInt(ExifDirectory.TAG_ORIENTATION);
+            e.setExifOrientation(orientation);
+        } catch (MetadataException ex) {
+        }
+        
+        try {
             // longitude
 
-            Rational[] components = dir.getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
+            Rational[] components = dirGps.getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
 
             deg = components[0].doubleValue();
@@ -534 +543 @@
             lon = (Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600)));
 
-            if (dir.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF).charAt(0) == 'W') {
+            if (dirGps.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF).charAt(0) == 'W') {
                 lon = -lon;
             }
@@ -540 +549 @@
             // latitude
 
-            components = dir.getRationalArray(GpsDirectory.TAG_GPS_LATITUDE);
+            components = dirGps.getRationalArray(GpsDirectory.TAG_GPS_LATITUDE);
 
             deg = components[0].doubleValue();
@@ -554 +563 @@
                 throw new IllegalArgumentException();
 
-            if (dir.getString(GpsDirectory.TAG_GPS_LATITUDE_REF).charAt(0) == 'S') {
+            if (dirGps.getString(GpsDirectory.TAG_GPS_LATITUDE_REF).charAt(0) == 'S') {
                 lat = -lat;
             }
@@ -566 +575 @@
             // Try to read lon/lat as double value (Nonstandard, created by some cameras -> #5220)
             try {
-                Double longitude = dir.getDouble(GpsDirectory.TAG_GPS_LONGITUDE);
-                Double latitude = dir.getDouble(GpsDirectory.TAG_GPS_LATITUDE);
+                Double longitude = dirGps.getDouble(GpsDirectory.TAG_GPS_LONGITUDE);
+                Double latitude = dirGps.getDouble(GpsDirectory.TAG_GPS_LATITUDE);
                 if (longitude == null || latitude == null)
                     throw new CompoundException("");
@@ -590 +599 @@
 
         try {
-            direction = dir.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
+            direction = dirGps.getRational(GpsDirectory.TAG_GPS_IMG_DIRECTION);
             if (direction != null) {
                 e.setExifImgDir(direction.doubleValue());

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

@@ -10 +10 @@
 import java.awt.FontMetrics;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.MediaTracker;
@@ -20 +21 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
 import java.io.File;
 
@@ -34 +37 @@
     /** The image currently displayed */
     private Image image = null;
-
+    
     /** The image currently displayed */
     private boolean errorLoading = false;
@@ -56 +59 @@
     private class LoadImageRunnable implements Runnable {
 
-        File file = null;
-
-        public LoadImageRunnable(File file) {
+        private File file;
+        private int orientation;
+
+        public LoadImageRunnable(File file, Integer orientation) {
             this.file = file;
+            this.orientation = orientation == null ? -1 : orientation;
         }
 
@@ -90 +95 @@
                     return;
                 }
+
                 ImageDisplay.this.image = img;
                 visibleRect = new Rectangle(0, 0, img.getWidth(null), img.getHeight(null));
+
+                final int w = (int) visibleRect.getWidth();
+                final int h = (int) visibleRect.getHeight();
+
+                outer: {
+                    final int hh, ww, q;
+                    final double ax, ay;
+                    switch (orientation) {
+                    case 8:
+                        q = -1;
+                        ax = w / 2;
+                        ay = w / 2;
+                        ww = h;
+                        hh = w;
+                        break;
+                    case 3:
+                        q = 2;
+                        ax = w / 2;
+                        ay = h / 2;
+                        ww = w;
+                        hh = h;
+                        break;
+                    case 6:
+                        q = 1;
+                        ax = h / 2;
+                        ay = h / 2;
+                        ww = h;
+                        hh = w;
+                        break;
+                    default:
+                        break outer;
+                    }
+
+                    final BufferedImage rot = new BufferedImage(ww, hh, BufferedImage.TYPE_INT_RGB);
+                    final AffineTransform xform = AffineTransform.getQuadrantRotateInstance(q, ax, ay);
+                    final Graphics2D g = rot.createGraphics();
+                    g.drawImage(image, xform, null);
+                    g.dispose();
+
+                    visibleRect.setSize(ww, hh);
+                    image.flush();
+                    ImageDisplay.this.image = rot;
+                }
+
                 selectedRect = null;
                 errorLoading = error;
@@ -394 +444 @@
     }
 
-    public void setImage(File file) {
+    public void setImage(File file, Integer orientation) {
         synchronized(this) {
             this.file = file;
@@ -403 +453 @@
         repaint();
         if (file != null) {
-            new Thread(new LoadImageRunnable(file)).start();
+            new Thread(new LoadImageRunnable(file, orientation)).start();
         }
     }

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

@@ -19 +19 @@
 final public class ImageEntry implements Comparable<ImageEntry>, Cloneable {
     private File file;
+    private Integer exifOrientation;
     private LatLon exifCoor;
     private Double exifImgDir;
@@ -73 +74 @@
         return file;
     }
+    public Integer getExifOrientation() {
+        return exifOrientation;
+    }
     public Date getExifTime() {
         return exifTime;
@@ -100 +104 @@
     void setFile(File file) {
         this.file = file;
+    }
+    void setExifOrientation(Integer exifOrientation) {
+        this.exifOrientation = exifOrientation;
     }
     void setExifTime(Date exifTime) {

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

@@ -230 +230 @@
 
         if (entry != null) {
-            imgDisplay.setImage(entry.getFile());
+            imgDisplay.setImage(entry.getFile(), entry.getExifOrientation());
             setTitle("Geotagged Images" + (entry.getFile() != null ? " - " + entry.getFile().getName() : ""));
             StringBuffer osd = new StringBuffer(entry.getFile() != null ? entry.getFile().getName() : "");
@@ -253 +253 @@
             imgDisplay.setOsdText(osd.toString());
         } else {
-            imgDisplay.setImage(null);
+            imgDisplay.setImage(null, null);
             imgDisplay.setOsdText("");
         }

trunk/src/org/openstreetmap/josm/tools/ExifReader.java

@@ -8 +8 @@
 
 import com.drew.imaging.jpeg.JpegMetadataReader;
+import com.drew.imaging.jpeg.JpegProcessingException;
 import com.drew.metadata.Directory;
 import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
 import com.drew.metadata.Tag;
+import com.drew.metadata.exif.ExifDirectory;
 
 /**
@@ -38 +41 @@
         return date;
     }
+
+    @SuppressWarnings("unchecked") public static Integer readOrientation(File filename) throws ParseException {
+        Integer orientation = null;
+        try {
+            final Metadata metadata = JpegMetadataReader.readMetadata(filename);
+            final Directory dir = metadata.getDirectory(ExifDirectory.class);
+            orientation = dir.getInt(ExifDirectory.TAG_ORIENTATION);
+        } catch (JpegProcessingException e) {
+            e.printStackTrace();
+        } catch (MetadataException e) {
+            e.printStackTrace();
+        }
+        return orientation;
+    }
+
 }