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

Added 1 tile margins in track view

Browse Source
This commit is contained in:
Martin Tůma 2015-12-06 00:51:02 +01:00
parent f3eb136187
commit 2d9677096d
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/track.cpp
View File

@ -74,7 +74,30 @@ void Track::loadGPX(const GPX &gpx)
if (_trackPaths.size() > 1 && prevScale != _scale) if (_trackPaths.size() > 1 && prevScale != _scale)
rescale(_scale); rescale(_scale);
_scene->setSceneRect(_scene->itemsBoundingRect());
QRectF br = trackBoundingRect();
QRectF ba = br.adjusted(-TILE_SIZE, -TILE_SIZE, TILE_SIZE, TILE_SIZE);
_scene->setSceneRect(ba);
centerOn(ba.center());
}
QRectF Track::trackBoundingRect() const
{
qreal bottom, top, left, right;
bottom = _trackPaths.at(0)->sceneBoundingRect().bottom();
top = _trackPaths.at(0)->sceneBoundingRect().top();
left = _trackPaths.at(0)->sceneBoundingRect().left();
right = _trackPaths.at(0)->sceneBoundingRect().right();
for (int i = 1; i < _trackPaths.size(); i++) {
bottom = qMax(bottom, _trackPaths.at(i)->sceneBoundingRect().bottom());
top = qMin(top, _trackPaths.at(i)->sceneBoundingRect().top());
right = qMax(right, _trackPaths.at(i)->sceneBoundingRect().right());
left = qMin(left, _trackPaths.at(i)->sceneBoundingRect().left());
}
return QRectF(QPointF(left, top), QPointF(right, bottom));
} }
qreal Track::trackScale() const qreal Track::trackScale() const
@ -138,6 +161,9 @@ void Track::loadPOI(const POI &poi)
{ {
QHash<Entry, POIItem*>::const_iterator it,jt; QHash<Entry, POIItem*>::const_iterator it,jt;
if (!_tracks.size())
return;
for (int i = 0; i < _tracks.size(); i++) { for (int i = 0; i < _tracks.size(); i++) {
QVector<Entry> p = poi.points(_tracks.at(i)); QVector<Entry> p = poi.points(_tracks.at(i));
@ -162,8 +188,6 @@ void Track::loadPOI(const POI &poi)
jt.value()->hide(); jt.value()->hide();
} }
} }
_scene->setSceneRect(_scene->itemsBoundingRect());
} }
void Track::setMap(Map *map) void Track::setMap(Map *map)
@ -188,8 +212,16 @@ void Track::wheelEvent(QWheelEvent *event)
qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN); qMin(_zoom + 1, ZOOM_MAX) : qMax(_zoom - 1, ZOOM_MIN);
rescale(mapScale()); rescale(mapScale());
_scene->setSceneRect(_scene->itemsBoundingRect()); QRectF br = trackBoundingRect();
centerOn(pos * scale/_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());
else
centerOn(pos * scale/_scale);
resetCachedContent(); resetCachedContent();
} }
@ -210,7 +242,7 @@ void Track::setTrackLineWidth(qreal width)
void Track::plot(QPainter *painter, const QRectF &target) void Track::plot(QPainter *painter, const QRectF &target)
{ {
QRectF orig = sceneRect(); QRectF orig = _scene->itemsBoundingRect();
QRectF adj; QRectF adj;
qreal ratio, diff; qreal ratio, diff;

1
src/track.h
View File

@ -41,6 +41,7 @@ private slots:
void redraw(); void redraw();
private: private:
QRectF trackBoundingRect() const;
qreal trackScale() const; qreal trackScale() const;
qreal mapScale() const; qreal mapScale() const;
void rescale(qreal scale); void rescale(qreal scale);