root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-27 03:29:16 +02:00
Code Issues Projects Releases Activity

Read the image size only when actually needed

Browse Source
This commit is contained in:
Martin Tůma
2021-10-04 21:00:29 +02:00
parent 06dac47550
commit 3cfa5456e9
8 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/data/exifparser.cpp
View File

@ -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,

2
src/data/gpiparser.cpp
View File

@ -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)

29
src/data/imageinfo.h
View File

@ -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

7
src/data/waypoint.h
View File

@ -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;