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

Some more code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2017-12-01 21:27:12 +01:00
parent 90b780a444
commit 6c6e384862
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/GUI/mapview.cpp
View File

@ -273,7 +273,7 @@ void MapView::setMap(Map *map)
_map->load(); _map->load();
connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap())); connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
resetDigitalZoom(); digitalZoom(0);
_map->zoomFit(resolution, center); _map->zoomFit(resolution, center);
_scene->setSceneRect(_map->bounds()); _scene->setSceneRect(_map->bounds());
@ -374,31 +374,17 @@ void MapView::clearMapCache()
resetCachedContent(); resetCachedContent();
} }
void MapView::resetDigitalZoom()
{
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
_digitalZoom = 0;
resetTransform();
for (int i = 0; i < _tracks.size(); i++)
_tracks.at(i)->setDigitalZoom(0);
for (int i = 0; i < _routes.size(); i++)
_routes.at(i)->setDigitalZoom(0);
for (int i = 0; i < _waypoints.size(); i++)
_waypoints.at(i)->setDigitalZoom(0);
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
it.value()->setDigitalZoom(0);
_mapScale->setDigitalZoom(0);
}
void MapView::digitalZoom(int zoom) void MapView::digitalZoom(int zoom)
{ {
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it; QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
_digitalZoom += zoom; if (zoom) {
scale(pow(2, zoom), pow(2, zoom)); _digitalZoom += zoom;
scale(pow(2, zoom), pow(2, zoom));
} else {
_digitalZoom = 0;
resetTransform();
}
for (int i = 0; i < _tracks.size(); i++) for (int i = 0; i < _tracks.size(); i++)
_tracks.at(i)->setDigitalZoom(_digitalZoom); _tracks.at(i)->setDigitalZoom(_digitalZoom);
@ -472,7 +458,7 @@ void MapView::keyPressEvent(QKeyEvent *event)
else if (event->matches(ZOOM_OUT)) else if (event->matches(ZOOM_OUT))
z = -1; z = -1;
else if (_digitalZoom && event->key() == Qt::Key_Escape) { else if (_digitalZoom && event->key() == Qt::Key_Escape) {
resetDigitalZoom(); digitalZoom(0);
return; return;
} else { } else {
QGraphicsView::keyPressEvent(event); QGraphicsView::keyPressEvent(event);
@ -575,7 +561,7 @@ void MapView::clear()
_rr = RectC(); _rr = RectC();
_wr = RectC(); _wr = RectC();
resetDigitalZoom(); digitalZoom(0);
resetCachedContent(); resetCachedContent();
QPixmapCache::clear(); QPixmapCache::clear();
} }

1
src/GUI/mapview.h
View File

@ -83,7 +83,6 @@ private:
void centerOn(const QPointF &pos); void centerOn(const QPointF &pos);
void zoom(int zoom, const QPoint &pos, const Coordinates &c); void zoom(int zoom, const QPoint &pos, const Coordinates &c);
void digitalZoom(int zoom); void digitalZoom(int zoom);
void resetDigitalZoom();
void updatePOIVisibility(); void updatePOIVisibility();
void mouseDoubleClickEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event);