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

Now drawing path segments > 1 arc minute as great circle curves instead of rhumb lines

Browse Source
This commit is contained in:
Martin Tůma
2018-09-13 00:43:28 +02:00
parent 8d1be76043
commit 9957e1834e
5 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/GUI/pathitem.cpp
View File

@ -2,6 +2,7 @@
#include <QApplication>
#include <QCursor>
#include <QPainter>
#include "common/greatcircle.h"
#include "map/map.h"
#include "tooltip.h"
#include "nicenum.h"
@ -44,8 +45,27 @@ void PathItem::updatePainterPath(Map *map)
_painterPath = QPainterPath();
_painterPath.moveTo(map->ll2xy(_path.first().coordinates()));
for (int i = 1; i < _path.size(); i++)
_painterPath.lineTo(map->ll2xy(_path.at(i).coordinates()));
for (int i = 1; i < _path.size(); i++) {
Coordinates c1(_path.at(i-1).coordinates());
Coordinates c2(_path.at(i).coordinates());
unsigned n = qAbs(c1.lon() - c2.lon());
if (n) {
if (n > 180)
n = n - 180;
double prev = c1.lon();
for (unsigned j = 1; j <= n * 60; j++) {
Coordinates c(GreatCircle::pointAt(c1, c2, j/(n * 60.0)));
double current = c.lon();
if (fabs(current - prev) > 180.0)
_painterPath.moveTo(map->ll2xy(c));
else
_painterPath.lineTo(map->ll2xy(c));
prev = current;
}
} else
_painterPath.lineTo(map->ll2xy(c2));
}
}
void PathItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
@ -141,19 +161,23 @@ QPointF PathItem::position(qreal x) const
return _map->ll2xy(_path.at(mid).coordinates());
}
QLineF l;
Coordinates c1, c2;
qreal p1, p2;
if (_path.at(mid).distance() < x) {
l = QLineF(_map->ll2xy(_path.at(mid).coordinates()),
_map->ll2xy(_path.at(mid+1).coordinates()));
c1 = _path.at(mid).coordinates(); c2 = _path.at(mid+1).coordinates();
p1 = _path.at(mid).distance(); p2 = _path.at(mid+1).distance();
} else {
l = QLineF(_map->ll2xy(_path.at(mid-1).coordinates()),
_map->ll2xy(_path.at(mid).coordinates()));
c1 = _path.at(mid-1).coordinates(); c2 = _path.at(mid).coordinates();
p1 = _path.at(mid-1).distance(); p2 = _path.at(mid).distance();
}
return l.pointAt((x - p1) / (p2 - p1));
if ((unsigned)qAbs(c1.lon() - c2.lon()))
return _map->ll2xy(GreatCircle::pointAt(c1, c2, (x - p1) / (p2 - p1)));
else {
QLineF l(_map->ll2xy(c1), _map->ll2xy(c2));
return l.pointAt((x - p1) / (p2 - p1));
}
}
void PathItem::moveMarker(qreal distance)