Read the image size only when actually needed

gpxsee.pro

@@ -226,7 +226,6 @@ HEADERS += src/common/config.h \
     src/data/demloader.h \
     src/data/area.h \
     src/data/exifparser.h \
-    src/data/imageinfo.h \
     src/data/csv.h \
     src/data/cupparser.h \
     src/data/gpiparser.h \

src/GUI/thumbnail.cpp

@@ -2,38 +2,37 @@
 #include <QDesktopServices>
 #include <QFileInfo>
 #include <QMouseEvent>
-#include "data/imageinfo.h"
 #include "thumbnail.h"
 
-static QSize thumbnailSize(const ImageInfo &img, int limit)
+static QSize thumbnailSize(const QSize &size, int limit)
 {
 	int width, height;
-	if (img.size().width() > img.size().height()) {
+	if (size.width() > size.height()) {
-		width = qMin(img.size().width(), limit);
+		width = qMin(size.width(), limit);
-		qreal ratio = img.size().width() / (qreal)img.size().height();
+		qreal ratio = size.width() / (qreal)size.height();
 		height = (int)(width / ratio);
 	} else {
-		height = qMin(img.size().height(), limit);
+		height = qMin(size.height(), limit);
-		qreal ratio = img.size().height() / (qreal)img.size().width();
+		qreal ratio = size.height() / (qreal)size.width();
 		width = (int)(height / ratio);
 	}
 
 	return QSize(width, height);
 }
 
-Thumbnail::Thumbnail(const ImageInfo &img, int size, QWidget *parent)
+Thumbnail::Thumbnail(const QString &path, int limit, QWidget *parent)
   : QLabel(parent)
 {
-	QImageReader reader(img.path());
+	QImageReader reader(path);
 	reader.setAutoTransform(true);
-	reader.setScaledSize(thumbnailSize(img, size));
+	reader.setScaledSize(thumbnailSize(reader.size(), limit));
 	setPixmap(QPixmap::fromImage(reader.read()));
 
 	setCursor(Qt::PointingHandCursor);
 
 	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-	_path = QFileInfo(img.path()).absoluteFilePath();
+	_path = QFileInfo(path).absoluteFilePath();
 }
 
 void Thumbnail::mousePressEvent(QMouseEvent *event)

src/GUI/thumbnail.h

@@ -8,7 +8,7 @@ class ImageInfo;
 class Thumbnail : public QLabel
 {
 public:
-	Thumbnail(const ImageInfo &img, int size, QWidget *parent = 0);
+	Thumbnail(const QString &path, int limit, QWidget *parent = 0);
 
 protected:
 	void mousePressEvent(QMouseEvent *event);

src/GUI/tooltip.h

@@ -5,13 +5,12 @@
 #include <QList>
 #include <QVector>
 #include "common/kv.h"
-#include "data/imageinfo.h"
 
 class ToolTip
 {
 public:
 	const QList<KV<QString, QString> > &list() const {return _list;}
-	const QVector<ImageInfo> &images() const {return _images;}
+	const QVector<QString> &images() const {return _images;}
 
 	bool isEmpty() const
 	{
@@ -31,14 +30,14 @@ public:
 	{
 		_list.append(KV<QString, QString>(key, value));
 	}
-	void setImages(const QVector<ImageInfo> &images)
+	void setImages(const QVector<QString> &images)
 	{
 		_images = images;
 	}
 
 private:
 	QList<KV<QString, QString> > _list;
-	QVector<ImageInfo> _images;
+	QVector<QString> _images;
 };
 
 #endif // TOOLTIP_H

src/data/exifparser.cpp

@@ -207,12 +207,9 @@ bool EXIFParser::parseTIFF(QFile *file, QVector<Waypoint> &waypoints)
 		return false;
 	}
 
-	file->reset();
-	ImageInfo img(file->fileName(), QImageReader(file).size());
-
 	Waypoint wp(c);
 	wp.setName(Util::file2name(file->fileName()));
-	wp.addImage(img);
+	wp.addImage(file->fileName());
 	wp.setElevation(altitude(tiff, GPSIFD.value(GPSAltitude),
 	  GPSIFD.value(GPSAltitudeRef)));
 	wp.setTimestamp(QDateTime(QDate::fromString(text(tiff,

src/data/gpiparser.cpp

@@ -434,7 +434,7 @@ static quint32 readImageInfo(DataStream &stream, Waypoint &waypoint,
 		imgFile.write(ba);
 		imgFile.close();
 
-		waypoint.addImage(ImageInfo(imgFile.fileName(), ir.size()));
+		waypoint.addImage(imgFile.fileName());
 	}
 
 	if (size + 5 != rh.size)

src/data/imageinfo.h

@@ -1,29 +0,0 @@
-#ifndef IMAGEINFO_H
-#define IMAGEINFO_H
-
-#include <QString>
-#include <QSize>
-
-class ImageInfo
-{
-public:
-	ImageInfo() {}
-	ImageInfo(const QString &path, const QSize &size)
-	  : _path(path), _size(size) {}
-
-	const QString &path() const {return _path;}
-	const QSize &size() const {return _size;}
-
-	bool isValid() const {return _size.isValid() && !_path.isEmpty();}
-
-	bool operator==(const ImageInfo &other) const
-	{
-		return (_path == other._path);
-	}
-
-private:
-	QString _path;
-	QSize _size;
-};
-
-#endif // IMAGEINFO_H

src/data/waypoint.h

@@ -8,7 +8,6 @@
 #include <QDebug>
 #include "common/config.h"
 #include "common/coordinates.h"
-#include "imageinfo.h"
 #include "link.h"
 
 class Waypoint
@@ -25,7 +24,7 @@ public:
 	const QString &comment() const {return _comment;}
 	const QString &address() const {return _address;}
 	const QString &phone() const {return _phone;}
-	const QVector<ImageInfo> &images() const {return _images;}
+	const QVector<QString> &images() const {return _images;}
 	const QVector<Link> &links() const {return _links;}
 	const QDateTime &timestamp() const {return _timestamp;}
 	qreal elevation() const {return _elevation;}
@@ -42,7 +41,7 @@ public:
 	void setPhone(const QString &phone) {_phone = phone;}
 	void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
 	void setElevation(qreal elevation) {_elevation = elevation;}
-	void addImage(const ImageInfo &image) {_images.append(image);}
+	void addImage(const QString &path) {_images.append(path);}
 	void addLink(const Link &link) {_links.append(link);}
 
 	bool hasElevation() const {return !std::isnan(_elevation);}
@@ -62,7 +61,7 @@ private:
 	QString _comment;
 	QString _address;
 	QString _phone;
-	QVector<ImageInfo> _images;
+	QVector<QString> _images;
 	QVector<Link> _links;
 	QDateTime _timestamp;
 	qreal _elevation;