allow reactivation of measurement after deactivation

qgis · Aug 27, 2014 · f28b63497d458a50c9e3c604229229d6138c8bf0 · f28b634
1 parent b3d19d6
commit f28b63497d458a50c9e3c604229229d6138c8bf0
Showing with 3 additions and 5 deletions.

+3 −5 src/app/qgsmeasuretool.cpp
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -46,6 +46,7 @@ QgsMeasureTool::QgsMeasureTool( QgsMapCanvas* canvas, bool measureArea )
   mPoints.append( QgsPoint( 0, 0 ) );
 
   mDialog = new QgsMeasureDialog( this, Qt::WindowStaysOnTopHint );
+  mDialog->restorePosition();
   mSnapper.setMapCanvas( canvas );
 
   connect( canvas, SIGNAL( destinationCrsChanged() ),
@@ -68,7 +69,7 @@ const QList<QgsPoint>& QgsMeasureTool::points()
 
 void QgsMeasureTool::activate()
 {
-  mDialog->restorePosition();
+  mDialog->show();
   QgsMapTool::activate();
 
   // ensure that we have correct settings
@@ -95,13 +96,10 @@ void QgsMeasureTool::activate()
 
 void QgsMeasureTool::deactivate()
 {
-  mDialog->close();
-  mRubberBand->reset();
-  mRubberBandPoints->reset();
+  mDialog->hide();
   QgsMapTool::deactivate();
 }
 
-
 void QgsMeasureTool::restart()
 {
   mPoints.clear();