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 waypoint icons

Browse Source
This commit is contained in:
Martin Tůma
2021-10-10 08:38:38 +02:00
parent 5fdbf2e5d6
commit fb8f0c4372
184 changed files with 854 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/data/gpiparser.cpp
View File

@ -10,6 +10,7 @@
#include <QTemporaryDir>
#include "common/garmin.h"
#include "common/textcodec.h"
#include "common/color.h"
#include "address.h"
#include "gpiparser.h"
@ -36,6 +37,14 @@ private:
QString _str;
};
#ifndef QT_NO_DEBUG
QDebug operator<<(QDebug dbg, const TranslatedString &ts)
{
dbg.nospace() << "TS(" << ts.lang() << ", " << ts.str() << ")";
return dbg.space();
}
#endif // QT_NO_DEBUG
class CryptDevice : public QIODevice
{
public:
@ -530,8 +539,22 @@ static quint32 readCamera(DataStream &stream, QVector<Waypoint> &waypoints,
return rs + rh.size;
}
static quint32 readIconId(DataStream &stream, quint16 &id)
{
RecordHeader rh;
quint8 rs;
rs = stream.readRecordHeader(rh);
stream >> id;
if (2 != rh.size)
stream.setStatus(QDataStream::ReadCorruptData);
return rs + rh.size;
}
static quint32 readPOI(DataStream &stream, QVector<Waypoint> &waypoints,
const QString &fileName, int &imgId)
const QString &fileName, int &imgId, QVector<QPair<int, quint16> > &icons)
{
RecordHeader rh;
quint8 rs;
@ -551,7 +574,13 @@ static quint32 readPOI(DataStream &stream, QVector<Waypoint> &waypoints,
waypoints.last().setName(obj.first().str());
while (stream.status() == QDataStream::Ok && ds < rh.size) {
switch(stream.nextHeaderType()) {
quint16 type = stream.nextHeaderType();
switch(type) {
case 4:
{quint16 id;
ds += readIconId(stream, id);
icons.append(QPair<int, quint16>(waypoints.size() - 1, id));}
break;
case 10:
ds += readDescription(stream, waypoints.last());
break;
@ -579,7 +608,8 @@ static quint32 readPOI(DataStream &stream, QVector<Waypoint> &waypoints,
}
static quint32 readSpatialIndex(DataStream &stream, QVector<Waypoint> &waypoints,
QList<Area> &polygons, const QString &fileName, int &imgId)
QList<Area> &polygons, const QString &fileName, int &imgId,
QVector<QPair<int, quint16> > &icons)
{
RecordHeader rh;
quint32 ds, s5;
@ -595,11 +625,12 @@ static quint32 readSpatialIndex(DataStream &stream, QVector<Waypoint> &waypoints
while (stream.status() == QDataStream::Ok && ds < rh.size) {
switch(stream.nextHeaderType()) {
case 2:
ds += readPOI(stream, waypoints, fileName, imgId);
ds += readPOI(stream, waypoints, fileName, imgId,
icons);
break;
case 8:
ds += readSpatialIndex(stream, waypoints, polygons,
fileName, imgId);
fileName, imgId, icons);
break;
case 19:
ds += readCamera(stream, waypoints, polygons);
@ -616,31 +647,89 @@ static quint32 readSpatialIndex(DataStream &stream, QVector<Waypoint> &waypoints
return rs + rh.size;
}
static quint32 readSymbol(DataStream &stream, QPixmap &pixmap)
{
RecordHeader rh;
quint8 rs, u8, bpp, transparent;
quint32 ds = 36, u32, imageSize, paletteSize, bgColor;
quint16 id, height, width, lineSize;
QByteArray data;
QVector<QRgb> palette;
QImage img;
rs = stream.readRecordHeader(rh);
stream >> id >> height >> width >> lineSize >> bpp >> u8 >> u8 >> u8
>> imageSize >> u32 >> paletteSize >> bgColor >> transparent >> u8 >> u8
>> u8 >> u32;
if (imageSize) {
data.resize(imageSize);
stream.readRawData(data.data(), data.size());
ds += data.size();
}
if (paletteSize) {
quint32 rgb;
palette.resize(paletteSize);
for (quint32 i = 0; i < paletteSize; i++) {
stream >> rgb;
palette[i] = (transparent && rgb == bgColor)
? QRgb(0)
: Color::rgb((rgb & 0x000000FF), (rgb & 0x0000FF00) >> 8,
(rgb & 0x00FF0000) >> 16);
}
ds += paletteSize * 4;
}
if (paletteSize) {
img = QImage((uchar*)data.data(), width, height, lineSize,
QImage::Format_Indexed8);
img.setColorTable(palette);
} else
img = QImage((uchar*)data.data(), width, height, lineSize,
QImage::Format_RGB32);
pixmap = QPixmap::fromImage(img);
if (ds != rh.size)
stream.setStatus(QDataStream::ReadCorruptData);
return rs + rh.size;
}
static void readPOIDatabase(DataStream &stream, QVector<Waypoint> &waypoints,
QList<Area> &polygons, const QString &fileName, int &imgId)
{
RecordHeader rh;
QList<TranslatedString> obj;
quint32 ds;
QVector<QPair<int, quint16> > il;
QVector<QPixmap> icons;
stream.readRecordHeader(rh);
ds = stream.readTranslatedObjects(obj);
ds += readSpatialIndex(stream, waypoints, polygons, fileName, imgId);
ds += readSpatialIndex(stream, waypoints, polygons, fileName, imgId, il);
if (rh.flags & 0x8) {
while (stream.status() == QDataStream::Ok && ds < rh.size) {
switch(stream.nextHeaderType()) {
quint16 type = stream.nextHeaderType();
switch(type) {
case 5:
icons.append(QPixmap());
ds += readSymbol(stream, icons.last());
break;
case 8:
ds += readSpatialIndex(stream, waypoints, polygons,
fileName, imgId);
fileName, imgId, il);
break;
case 5: // symbol
case 7: // category
default:
ds += stream.skipRecord();
}
}
}
for (int i = 0; i < il.size(); i++) {
const QPair<int, quint16> &e = il.at(i);
if (e.second < icons.size())
waypoints[e.first].setIcon(icons.at(e.second));
}
if (ds != rh.size)
stream.setStatus(QDataStream::ReadCorruptData);
}
@ -652,7 +741,7 @@ bool GPIParser::readData(DataStream &stream, QVector<Waypoint> &waypoints,
while (stream.status() == QDataStream::Ok) {
switch (stream.nextHeaderType()) {
case 0x09: // POI database
case 0x09:
readPOIDatabase(stream, waypoints, polygons, fileName,
imgId);
break;
@ -661,8 +750,6 @@ bool GPIParser::readData(DataStream &stream, QVector<Waypoint> &waypoints,
if (stream.status() == QDataStream::Ok)
return true;
break;
case 0x16: // route
case 0x15: // info header
default:
stream.skipRecord();
}

2
src/data/gpxparser.cpp
View File

@ -205,6 +205,8 @@ void GPXParser::waypointData(Waypoint &waypoint, SegmentData *autoRoute)
link10.setText(_reader.readElementText());
else if (_reader.name() == QLatin1String("extensions"))
waypointExtensions(waypoint, autoRoute);
else if (_reader.name() == QLatin1String("sym"))
waypoint.setSymbol(_reader.readElementText());
else
_reader.skipCurrentElement();
}

26
src/data/waypoint.cpp
View File

@ -1,8 +1,11 @@
#include <QDir>
#include <QFileInfo>
#include "dem.h"
#include "waypoint.h"
bool Waypoint::_useDEM = false;
bool Waypoint::_show2ndElevation = false;
QHash<QString, QPixmap> Waypoint::_symbolIcons;
QPair<qreal, qreal> Waypoint::elevations() const
{
@ -21,3 +24,26 @@ QPair<qreal, qreal> Waypoint::elevations() const
return QPair<qreal, qreal>(DEM::elevation(coordinates()), NAN);
}
}
void Waypoint::loadSymbolIcons(const QString &dir)
{
QDir d(dir);
QFileInfoList files(d.entryInfoList(QDir::Files | QDir::Readable));
for (int i = 0; i < files.size(); i++) {
QPixmap pm(files.at(i).absoluteFilePath());
if (pm.isNull())
qWarning("%s: error loading image",
qPrintable(files.at(i).absoluteFilePath()));
else
_symbolIcons.insert(files.at(i).baseName(), pm);
}
}
const QPixmap *Waypoint::symbolIcon(const QString &symbol)
{
if (symbol.isEmpty())
return 0;
QHash<QString, QPixmap>::const_iterator it(_symbolIcons.find(symbol));
return (it == _symbolIcons.constEnd()) ? 0 : &*it;
}

11
src/data/waypoint.h
View File

@ -5,6 +5,7 @@
#include <QDateTime>
#include <QHash>
#include <QVector>
#include <QPixmap>
#include <QDebug>
#include "common/config.h"
#include "common/coordinates.h"
@ -24,10 +25,12 @@ public:
const QString &comment() const {return _comment;}
const QString &address() const {return _address;}
const QString &phone() const {return _phone;}
const QString &symbol() const {return _symbol;}
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;}
const QPixmap &icon() const {return _icon;}
QPair<qreal, qreal> elevations() const;
@ -39,10 +42,12 @@ public:
void setComment(const QString &comment) {_comment = comment;}
void setAddress(const QString &address) {_address = address;}
void setPhone(const QString &phone) {_phone = phone;}
void setSymbol(const QString &symbol) {_symbol = symbol;}
void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
void setElevation(qreal elevation) {_elevation = elevation;}
void addImage(const QString &path) {_images.append(path);}
void addLink(const Link &link) {_links.append(link);}
void setIcon(const QPixmap &icon) {_icon = icon;}
bool hasElevation() const {return !std::isnan(_elevation);}
@ -54,6 +59,9 @@ public:
static void showSecondaryElevation(bool show)
{_show2ndElevation = show;}
static const QPixmap *symbolIcon(const QString &symbol);
static void loadSymbolIcons(const QString &dir);
private:
Coordinates _coordinates;
QString _name;
@ -61,13 +69,16 @@ private:
QString _comment;
QString _address;
QString _phone;
QString _symbol;
QVector<QString> _images;
QVector<Link> _links;
QDateTime _timestamp;
qreal _elevation;
QPixmap _icon;
static bool _useDEM;
static bool _show2ndElevation;
static QHash<QString, QPixmap> _symbolIcons;
};
inline HASH_T qHash(const Waypoint &key)