Merge pull request #9431 from qgis/backport-9421-on-release-3_6

m-kuhn · web-flow · commit e4c85cd81842 · 2019-03-08T14:04:37.000+01:00
Backport #9421 on release-3_6
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -68,6 +68,8 @@ QVector<QgsPointXY> QgsMeasureTool::points() const
 void QgsMeasureTool::activate()
 {
   mDialog->show();
+  mRubberBand->show();
+  mRubberBandPoints->show();
   QgsMapTool::activate();
 
   // ensure that we have correct settings
@@ -98,6 +100,8 @@ void QgsMeasureTool::deactivate()
   mSnapIndicator->setMatch( QgsPointLocator::Match() );
 
   mDialog->hide();
+  mRubberBand->hide();
+  mRubberBandPoints->hide();
   QgsMapTool::deactivate();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ QVector<QgsPointXY> QgsMeasureTool::points() const`
`68`	`68`	`void QgsMeasureTool::activate()`
`69`	`69`	`{`
`70`	`70`	`mDialog->show();`
	`71`	`+ mRubberBand->show();`
	`72`	`+ mRubberBandPoints->show();`
`71`	`73`	`QgsMapTool::activate();`
`72`	`74`
`73`	`75`	`// ensure that we have correct settings`
`@@ -98,6 +100,8 @@ void QgsMeasureTool::deactivate()`
`98`	`100`	`mSnapIndicator->setMatch( QgsPointLocator::Match() );`
`99`	`101`
`100`	`102`	`mDialog->hide();`
	`103`	`+ mRubberBand->hide();`
	`104`	`+ mRubberBandPoints->hide();`
`101`	`105`	`QgsMapTool::deactivate();`
`102`	`106`	`}`
`103`	`107`