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

Fixed special cases scene rect computation

Browse Source
This commit is contained in:
Martin Tůma 2016-11-11 23:48:38 +01:00
parent c8a39a607b
commit 5a8250ed63
2 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/pathview.cpp
View File

@ -180,10 +180,13 @@ void PathView::addWaypoints(const QList<Waypoint> &waypoints)
wi->setVisible(_showWaypoints);
_scene->addItem(wi);
if (!_wr.isNull())
if (_wr.isNull()) {
if (_wp.isNull())
_wp = wi->coordinates();
else
_wr = qrectf(_wp, wi->coordinates());
} else
unite(_wr, wi->coordinates());
else if (i > 1)
_wr = qrectf(_waypoints.last()->coordinates(), wi->coordinates());
_waypoints.append(wi);
}
@ -215,14 +218,11 @@ QList<PathItem *> PathView::loadData(const Data &data)
else
updatePOIVisibility();
qreal scale = mapScale(_zoom);
QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
QRectF ba = br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
Tile::size());
_scene->setSceneRect(ba);
centerOn(ba.center());
QRectF sr = contentsSceneRect();
_scene->setSceneRect(sr);
centerOn(sr.center());
_mapScale->setZoom(_zoom, -(br.center().ry() * mapScale(_zoom)));
_mapScale->setZoom(_zoom, -(sr.center().ry() * mapScale(_zoom)));
if (_mapScale->scene() != _scene)
_scene->addItem(_mapScale);
@ -242,6 +242,19 @@ qreal PathView::contentsScale() const
return qMax(sc.x(), sc.y());
}
QRectF PathView::contentsSceneRect() const
{
qreal scale = mapScale(_zoom);
QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
if (br.isNull())
return QRectF(QPointF(_wp.x() / scale - Tile::size()/2,
_wp.y() /scale - Tile::size()/2), QSizeF(Tile::size(), Tile::size()));
else
return br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
Tile::size());
}
void PathView::updatePOIVisibility()
{
QHash<Waypoint, WaypointItem*>::const_iterator it, jt;
@ -395,17 +408,15 @@ void PathView::zoom(int z, const QPoint &pos)
_zoom = z;
rescale(_zoom);
qreal scale = mapScale(_zoom);
QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
QRectF ba = br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
Tile::size());
_scene->setSceneRect(ba);
if (br.width() < viewport()->size().width()
&& br.height() < viewport()->size().height())
centerOn(br.center());
QRectF sr = contentsSceneRect();
_scene->setSceneRect(sr);
if (sr.width() < viewport()->size().width()
&& sr.height() < viewport()->size().height())
centerOn(sr.center());
else
centerOn((spos * (os/scale)) - offset);
centerOn((spos * (os/mapScale(_zoom))) - offset);
_mapScale->setZoom(_zoom);
@ -494,6 +505,7 @@ void PathView::clear()
_zoom = ZOOM_MAX;
_tr = QRectF(); _rr = QRectF(); _wr = QRectF();
_wp = QPointF();
_scene->setSceneRect(QRectF());
}
@ -610,23 +622,20 @@ void PathView::resizeEvent(QResizeEvent *event)
rescale();
qreal scale = mapScale(_zoom);
QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
QRectF ba = br.adjusted(-Tile::size(), -Tile::size(), Tile::size(),
Tile::size());
QRectF sr = contentsSceneRect();
if (ba.width() < event->size().width()) {
qreal diff = event->size().width() - ba.width();
ba.adjust(-diff/2, 0, diff/2, 0);
if (sr.width() < event->size().width()) {
qreal diff = event->size().width() - sr.width();
sr.adjust(-diff/2, 0, diff/2, 0);
}
if (ba.height() < event->size().height()) {
qreal diff = event->size().height() - ba.height();
ba.adjust(0, -diff/2, 0, diff/2);
if (sr.height() < event->size().height()) {
qreal diff = event->size().height() - sr.height();
sr.adjust(0, -diff/2, 0, diff/2);
}
_scene->setSceneRect(ba);
_scene->setSceneRect(sr);
centerOn(sr.center());
centerOn(br.center());
resetCachedContent();
}

2
src/pathview.h
View File

@ -66,6 +66,7 @@ private:
void clearPOI();
qreal contentsScale() const;
QRectF contentsSceneRect() const;
void rescale(int zoom);
void rescale();
void zoom(int z, const QPoint &pos);
@ -87,6 +88,7 @@ private:
int _zoom;
QRectF _tr, _rr, _wr;
QPointF _wp;
Map *_map;
POI *_poi;