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

Added support for multiple images

Browse Source
This commit is contained in:
Martin Tůma
2019-11-15 22:10:55 +01:00
parent 475eb6185a
commit e4d8ab1feb
6 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/exifparser.cpp
View File

@ -209,7 +209,7 @@ bool EXIFParser::parseTIFF(QFile *file, QVector<Waypoint> &waypoints)
Waypoint wp(c);
wp.setName(QFileInfo(file->fileName()).baseName());
wp.setImage(img);
wp.addImage(img);
wp.setElevation(altitude(tiff, GPSIFD.value(GPSAltitude),
GPSIFD.value(GPSAltitudeRef)));
wp.setTimestamp(QDateTime(QDate::fromString(text(tiff,

2
src/data/gpiparser.cpp
View File

@ -413,7 +413,7 @@ static quint32 readImageInfo(QDataStream &stream, Waypoint &waypoint,
imgFile.write(ba);
imgFile.close();
waypoint.setImage(ImageInfo(imgFile.fileName(), ir.size()));
waypoint.addImage(ImageInfo(imgFile.fileName(), ir.size()));
if (size + 5 != rh.size)
stream.setStatus(QDataStream::ReadCorruptData);

6
src/data/waypoint.h
View File

@ -21,7 +21,7 @@ public:
const QString &name() const {return _name;}
const QString &description() const {return _description;}
const Address &address() const {return _address;}
const ImageInfo &image() const {return _image;}
const QVector<ImageInfo> &images() const {return _images;}
const QVector<Link> &links() const {return _links;}
const QDateTime &timestamp() const {return _timestamp;}
qreal elevation() const {return _elevation;}
@ -34,7 +34,7 @@ public:
void setAddress(const Address &address) {_address = address;}
void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
void setElevation(qreal elevation) {_elevation = elevation;}
void setImage(const ImageInfo &image) {_image = image;}
void addImage(const ImageInfo &image) {_images.append(image);}
void addLink(const Link &link) {_links.append(link);}
bool hasElevation() const {return !std::isnan(_elevation);}
@ -48,7 +48,7 @@ private:
QString _name;
QString _description;
Address _address;
ImageInfo _image;
QVector<ImageInfo> _images;
QVector<Link> _links;
QDateTime _timestamp;
qreal _elevation;