Fixed broken returning from print mode

src/GUI/mapview.cpp

@@ -497,7 +497,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 	QRect orig, adj;
 	qreal ratio, diff, q;
 	QPointF origScene, origPos;
-	RectC origC;
+	int zoom;
 
 
 	// Enter plot mode
@@ -521,8 +521,8 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 
 	// Adjust the view for printing
 	if (hires) {
+		zoom = _map->zoom();
 		QRectF vr(mapToScene(orig).boundingRect());
-		origC = RectC(_map->xy2ll(vr.topLeft()), _map->xy2ll(vr.bottomRight()));
 		origScene = vr.center();
 
 		QPointF s(painter->device()->logicalDpiX()
@@ -553,11 +553,11 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale,
 
 	// Revert view changes to display mode
 	if (hires) {
-		_map->zoomFit(orig.size(), origC);
+		_map->setZoom(zoom);
 		rescale();
 		centerOn(origScene);
 	}
-	_mapScale->setDigitalZoom(0);
+	_mapScale->setDigitalZoom(_digitalZoom);
 	_mapScale->setPos(origPos);
 
 	// Exit plot mode

src/map/atlas.cpp

@@ -208,6 +208,12 @@ int Atlas::zoomFit(const QSize &size, const RectC &br)
 	return _zoom;
 }
 
+void Atlas::setZoom(int zoom)
+{
+	_mapIndex = -1;
+	_zoom = zoom;
+}
+
 int Atlas::zoomIn()
 {
 	_zoom = qMin(_zoom + 1, _zooms.size() - 1);

src/map/atlas.h

@@ -18,6 +18,7 @@ public:
 	qreal resolution(const QRectF &rect) const;
 
 	int zoom() const {return _zoom;}
+	void setZoom(int zoom);
 	int zoomFit(const QSize &size, const RectC &br);
 	int zoomIn();
 	int zoomOut();

src/map/emptymap.h

@@ -16,6 +16,7 @@ public:
 	qreal resolution(const QRectF &rect) const;
 
 	int zoom() const {return _zoom;}
+	void setZoom(int zoom) {_zoom = zoom;}
 	int zoomFit(const QSize &size, const RectC &rect);
 	int zoomIn();
 	int zoomOut();

src/map/map.h

@@ -24,6 +24,7 @@ public:
 	virtual qreal resolution(const QRectF &rect) const = 0;
 
 	virtual int zoom() const = 0;
+	virtual void setZoom(int zoom) = 0;
 	virtual int zoomFit(const QSize &size, const RectC &rect) = 0;
 	virtual int zoomIn() = 0;
 	virtual int zoomOut() = 0;

src/map/offlinemap.h

@@ -24,6 +24,7 @@ public:
 	qreal resolution(const QRectF &rect) const;
 
 	int zoom() const {return _zoom;}
+	void setZoom(int zoom) {_zoom = zoom;}
 	int zoomFit(const QSize &size, const RectC &rect);
 	int zoomIn();
 	int zoomOut();

src/map/onlinemap.h

@@ -21,6 +21,7 @@ public:
 	qreal resolution(const QRectF &rect) const;
 
 	int zoom() const {return _zoom;}
+	void setZoom(int zoom) {_zoom = zoom;}
 	int zoomFit(const QSize &size, const RectC &rect);
 	int zoomIn();
 	int zoomOut();

src/map/wmsmap.cpp

@@ -163,6 +163,12 @@ int WMSMap::zoomFit(const QSize &size, const RectC &rect)
 	return _zoom;
 }
 
+void WMSMap::setZoom(int zoom)
+{
+	_zoom = zoom;
+	updateTransform();
+}
+
 int WMSMap::zoomIn()
 {
 	_zoom = qMin(_zoom + 1, _zooms.size() - 1);

src/map/wmsmap.h

@@ -21,6 +21,7 @@ public:
 	qreal resolution(const QRectF &rect) const;
 
 	int zoom() const {return _zoom;}
+	void setZoom(int zoom);
 	int zoomFit(const QSize &size, const RectC &rect);
 	int zoomIn();
 	int zoomOut();

src/map/wmtsmap.cpp

@@ -143,6 +143,12 @@ qreal WMTSMap::resolution(const QRectF &rect) const
 	return ds/ps;
 }
 
+void WMTSMap::setZoom(int zoom)
+{
+	_zoom = zoom;
+	updateTransform();
+}
+
 int WMTSMap::zoomIn()
 {
 	_zoom = qMin(_zoom + 1, _zooms.size() - 1);

src/map/wmtsmap.h

@@ -21,6 +21,7 @@ public:
 	qreal resolution(const QRectF &rect) const;
 
 	int zoom() const {return _zoom;}
+	void setZoom(int zoom);
 	int zoomFit(const QSize &size, const RectC &rect);
 	int zoomIn();
 	int zoomOut();