867 changes: 633 additions & 234 deletions qgis/src/qgsmapcanvas.cpp

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion qgis/src/qgsmapcanvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@ public slots:
//! Updates the z order for layers on the map
void updateZpos();


//! Zooms to a given center and scale
void zoomByScale(int x, int y, double scaleFactor);

//! detrmines whether the user can interact with the canvas using a mouse
//(useful for locking the overview canvas)
Expand All @@ -414,6 +415,11 @@ public slots:

//! Measure tool
QgsMeasure *mMeasure;

//! Scale factor multiple for default zoom in/out
// TODO Make this customisable by the user
static const double scaleDefaultMultiple = 2.0;

}; // class QgsMapCanvas

#endif