root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2017-01-20 01:17:22 +01:00
parent 46598a85fc
commit 8ff8d4bf16
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pathview.cpp
View File

@ -57,6 +57,11 @@ qreal mapScale(int zoom)
return ((360.0/(qreal)(1<<zoom))/(qreal)Tile::size()); return ((360.0/(qreal)(1<<zoom))/(qreal)Tile::size());
} }
static QRectF mapBounds()
{
return QRectF(QPointF(-180, -180), QSizeF(360, 360));
}
static qreal zoom2resolution(int zoom, qreal y) static qreal zoom2resolution(int zoom, qreal y)
{ {
return (WGS84_RADIUS * 2 * M_PI / Tile::size() return (WGS84_RADIUS * 2 * M_PI / Tile::size()
@ -119,6 +124,8 @@ PathView::PathView(QWidget *parent)
_routeStyle = Qt::DashLine; _routeStyle = Qt::DashLine;
_plot = false; _plot = false;
_scene->setSceneRect(scaled(mapBounds(), 1.0 / mapScale(_zoom)));
} }
PathView::~PathView() PathView::~PathView()
@ -219,11 +226,8 @@ QList<PathItem *> PathView::loadData(const Data &data)
if (_zoom < zoom) if (_zoom < zoom)
rescale(_zoom); rescale(_zoom);
else { else
_scene->setSceneRect(scaled(QRectF(QPointF(-180, -180),
QSizeF(360, 360)), 1.0 / mapScale(_zoom)));
updatePOIVisibility(); updatePOIVisibility();
}
QPointF center = contentsCenter(); QPointF center = contentsCenter();
centerOn(center); centerOn(center);
@ -304,8 +308,7 @@ void PathView::rescale(int zoom)
_zoom = zoom; _zoom = zoom;
qreal scale = mapScale(zoom); qreal scale = mapScale(zoom);
_scene->setSceneRect(scaled(QRectF(QPointF(-180, -180), QSizeF(360, 360)), _scene->setSceneRect(scaled(mapBounds(), 1.0 / scale));
1.0 / scale));
for (int i = 0; i < _tracks.size(); i++) for (int i = 0; i < _tracks.size(); i++)
_tracks.at(i)->setScale(1.0/scale); _tracks.at(i)->setScale(1.0/scale);