root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' of https://github.com/tumic0/GPXSee

Browse Source
This commit is contained in:
Martin Tůma 2020-03-12 09:37:55 +01:00
commit 98cd3c3922
15 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/gpxsee_pl.ts
View File

@ -1890,7 +1890,7 @@
<message>
<location filename="../src/GUI/waypointitem.cpp" line="44"/>
<source>Address</source>
<translation type="unfinished"></translation>
<translation>Adres</translation>
</message>
<message>
<location filename="../src/GUI/waypointitem.cpp" line="55"/>

3
src/GUI/routeitem.cpp
View File

@ -15,6 +15,8 @@ QString RouteItem::info() const
tt.insert(tr("Name"), _name);
if (!_desc.isEmpty())
tt.insert(tr("Description"), _desc);
if (!_comment.isEmpty() && _comment != _desc)
tt.insert(tr("Comment"), _comment);
tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
_units));
if (!_links.isEmpty()) {
@ -43,6 +45,7 @@ RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
_name = route.name();
_desc = route.description();
_comment = route.comment();
_links = route.links();
_coordinatesFormat = DecimalDegrees;
}

1
src/GUI/routeitem.h
View File

@ -29,6 +29,7 @@ public:
private:
QString _name;
QString _desc;
QString _comment;
QVector<Link> _links;
CoordinatesFormat _coordinatesFormat;

3
src/GUI/trackitem.cpp
View File

@ -13,6 +13,8 @@ QString TrackItem::info() const
tt.insert(tr("Name"), _name);
if (!_desc.isEmpty())
tt.insert(tr("Description"), _desc);
if (!_comment.isEmpty() && _comment != _desc)
tt.insert(tr("Comment"), _comment);
tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
_units));
if (_time > 0)
@ -41,6 +43,7 @@ TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)
{
_name = track.name();
_desc = track.description();
_comment = track.comment();
_links = track.links();
_date = track.date();
_time = track.time();

1
src/GUI/trackitem.h
View File

@ -22,6 +22,7 @@ public:
private:
QString _name;
QString _desc;
QString _comment;
QVector<Link> _links;
QDateTime _date;
qreal _time;

4
src/GUI/waypointitem.cpp
View File

@ -30,6 +30,10 @@ QString WaypointItem::info() const
if (!_waypoint.description().isEmpty())
tt.insert(qApp->translate("WaypointItem", "Description"),
_waypoint.description());
if (!_waypoint.comment().isEmpty()
&& _waypoint.comment() != _waypoint.description())
tt.insert(qApp->translate("WaypointItem", "Comment"),
_waypoint.comment());
if (_waypoint.address().isValid()) {
QString addr("<address>");
addr += _waypoint.address().street();

8
src/data/gpiparser.cpp
View File

@ -282,14 +282,14 @@ static quint32 readNotes(QDataStream &stream, QTextCodec *codec,
if (s1 & 0x1) {
QList<TranslatedString> obj;
ds += readTranslatedObjects(stream, codec, obj);
if (!obj.isEmpty() && waypoint.description().isNull())
waypoint.setDescription(obj.first().str());
if (!obj.isEmpty())
waypoint.setComment(obj.first().str());
}
if (s1 & 0x2) {
QString str;
ds += readString(stream, codec, str);
if (!str.isEmpty() && waypoint.description().isNull())
waypoint.setDescription(str);
if (!str.isEmpty())
waypoint.setComment(str);
}
if (ds != rh.size)

6
src/data/gpxparser.cpp
View File

@ -192,6 +192,8 @@ void GPXParser::waypointData(Waypoint &waypoint, SegmentData *autoRoute)
waypoint.setName(_reader.readElementText());
else if (_reader.name() == QLatin1String("desc"))
waypoint.setDescription(_reader.readElementText());
else if (_reader.name() == QLatin1String("cmt"))
waypoint.setComment(_reader.readElementText());
else if (_reader.name() == QLatin1String("ele"))
waypoint.setElevation(number());
else if (_reader.name() == QLatin1String("geoidheight"))
@ -244,6 +246,8 @@ void GPXParser::routepoints(RouteData &route, QList<TrackData> &tracks)
route.setName(_reader.readElementText());
else if (_reader.name() == QLatin1String("desc"))
route.setDescription(_reader.readElementText());
else if (_reader.name() == QLatin1String("cmt"))
route.setComment(_reader.readElementText());
else if (_reader.name() == QLatin1String("link")) {
Link l(link());
if (!l.URL().isEmpty())
@ -278,6 +282,8 @@ void GPXParser::track(TrackData &track)
track.setName(_reader.readElementText());
else if (_reader.name() == QLatin1String("desc"))
track.setDescription(_reader.readElementText());
else if (_reader.name() == QLatin1String("cmt"))
track.setComment(_reader.readElementText());
else if (_reader.name() == QLatin1String("link")) {
Link l(link());
if (!l.URL().isEmpty())

1
src/data/route.h
View File

@ -21,6 +21,7 @@ public:
const QString &name() const {return _data.name();}
const QString &description() const {return _data.description();}
const QString &comment() const {return _data.comment();}
const QVector<Link> &links() const {return _data.links();}
bool isValid() const {return _data.size() >= 2;}

3
src/data/routedata.h
View File

@ -11,15 +11,18 @@ class RouteData : public QVector<Waypoint>
public:
const QString &name() const {return _name;}
const QString &description() const {return _desc;}
const QString &comment() const {return _comment;}
const QVector<Link> &links() const {return _links;}
void setName(const QString &name) {_name = name;}
void setDescription(const QString &desc) {_desc = desc;}
void setComment(const QString &comment) {_comment = comment;}
void addLink(const Link &link) {_links.append(link);}
private:
QString _name;
QString _desc;
QString _comment;
QVector<Link> _links;
};

1
src/data/track.h
View File

@ -32,6 +32,7 @@ public:
const QString &name() const {return _data.name();}
const QString &description() const {return _data.description();}
const QString &comment() const {return _data.comment();}
const QVector<Link> &links() const {return _data.links();}
bool isValid() const;

3
src/data/trackdata.h
View File

@ -14,15 +14,18 @@ class TrackData : public QList<SegmentData>
public:
const QString &name() const {return _name;}
const QString &description() const {return _desc;}
const QString &comment() const {return _comment;}
const QVector<Link> &links() const {return _links;}
void setName(const QString &name) {_name = name;}
void setDescription(const QString &desc) {_desc = desc;}
void setComment(const QString &comment) {_comment = comment;}
void addLink(const Link &link) {_links.append(link);}
private:
QString _name;
QString _desc;
QString _comment;
QVector<Link> _links;
};

3
src/data/waypoint.h
View File

@ -21,6 +21,7 @@ public:
const Coordinates &coordinates() const {return _coordinates;}
const QString &name() const {return _name;}
const QString &description() const {return _description;}
const QString &comment() const {return _comment;}
const Address &address() const {return _address;}
const QVector<ImageInfo> &images() const {return _images;}
const QVector<Link> &links() const {return _links;}
@ -32,6 +33,7 @@ public:
void setName(const QString &name) {_name = name;}
void setDescription(const QString &description)
{_description = description;}
void setComment(const QString &comment) {_comment = comment;}
void setAddress(const Address &address) {_address = address;}
void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
void setElevation(qreal elevation) {_elevation = elevation;}
@ -48,6 +50,7 @@ private:
Coordinates _coordinates;
QString _name;
QString _description;
QString _comment;
Address _address;
QVector<ImageInfo> _images;
QVector<Link> _links;

11
src/map/imgmap.cpp
View File

@ -260,13 +260,6 @@ void IMGMap::unload()
_data->clear();
}
QRectF IMGMap::bounds()
{
RectD prect(_data->bounds(), _projection);
return QRectF(_transform.proj2img(prect.topLeft()),
_transform.proj2img(prect.bottomRight()));
}
int IMGMap::zoomFit(const QSize &size, const RectC &rect)
{
if (rect.isValid()) {
@ -320,6 +313,10 @@ Transform IMGMap::transform(int zoom) const
void IMGMap::updateTransform()
{
_transform = transform(_zoom);
RectD prect(_data->bounds(), _projection);
_bounds = QRectF(_transform.proj2img(prect.topLeft()),
_transform.proj2img(prect.bottomRight()));
}
QPointF IMGMap::ll2xy(const Coordinates &c)

3
src/map/imgmap.h
View File

@ -18,7 +18,7 @@ public:
QString name() const {return _data->name();}
QRectF bounds();
QRectF bounds() {return _bounds;}
virtual int zoom() const {return _zoom;}
virtual void setZoom(int zoom);
@ -62,6 +62,7 @@ private:
int _zoom;
Projection _projection;
Transform _transform;
QRectF _bounds;
bool _valid;
QString _errorString;