Highlight the selected feature

sbrunner · sbrunner · commit d73ef5b189bc · 2015-11-07T11:53:13.000+01:00
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -212,13 +212,15 @@ void QgsMapToolNodeTool::canvasPressEvent( QgsMapMouseEvent* e )
 	// remove previous warning
 	emit messageDiscarded();
 	mSelectedFeature = new QgsSelectedFeature( feature.id(), vlayer, mCanvas );
+	updateSelectFeature();
       }
     }
     else {
       // remove previous warning
       emit messageDiscarded();
 
       mSelectedFeature = new QgsSelectedFeature( snapResults[0].snappedAtGeometry, vlayer, mCanvas );
+      updateSelectFeature();
     }
     connect( QgisApp::instance()->layerTreeView(), SIGNAL( currentLayerChanged( QgsMapLayer* ) ), this, SLOT( currentLayerChanged( QgsMapLayer* ) ) );
     connect( mSelectedFeature, SIGNAL( destroyed() ), this, SLOT( selectedFeatureDestroyed() ) );
@@ -350,6 +352,21 @@ void QgsMapToolNodeTool::canvasPressEvent( QgsMapMouseEvent* e )
   }
 }
 
+void QgsMapToolNodeTool::updateSelectFeature()
+{
+  if (mSelectRubberBand != NULL) {
+    delete mSelectRubberBand;
+  }
+  mSelectRubberBand = new QgsGeometryRubberBand( mCanvas, mSelectedFeature->geometry()->type() );
+  mSelectRubberBand->setBrushStyle( Qt::SolidPattern );
+  mSelectRubberBand->setFillColor( QColor( 255, 0, 0, 50 ) );
+  QgsAbstractGeometryV2* rbGeom = mSelectedFeature->geometry()->geometry()->clone();
+  QgsVectorLayer *vlayer = mSelectedFeature->vlayer();
+  if ( mCanvas->mapSettings().layerTransform( vlayer ) )
+    rbGeom->transform( *mCanvas->mapSettings().layerTransform( vlayer ) );
+  mSelectRubberBand->setGeometry( rbGeom );
+}
+
 void QgsMapToolNodeTool::selectedFeatureDestroyed()
 {
   QgsDebugCall;
@@ -396,6 +413,7 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QgsMapMouseEvent* e )
     {
       // select another feature
       mSelectedFeature->setSelectedFeature( mAnother, vlayer, mCanvas );
+      updateSelectFeature();
       mIsPoint = vlayer->geometryType() == QGis::Point;
       mSelectAnother = false;
     }
@@ -494,6 +512,10 @@ void QgsMapToolNodeTool::cleanTool( bool deleteSelectedFeature )
 {
   removeRubberBands();
 
+  if ( mSelectRubberBand != NULL ) {
+    delete mSelectRubberBand;
+    mSelectRubberBand = NULL;
+  }
   if ( mSelectedFeature )
   {
     QgsVectorLayer *vlayer = mSelectedFeature->vlayer();
@@ -504,7 +526,7 @@ void QgsMapToolNodeTool::cleanTool( bool deleteSelectedFeature )
     disconnect( vlayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
 
     if ( deleteSelectedFeature ) delete mSelectedFeature;
-    mSelectedFeature = 0;
+    mSelectedFeature = NULL;
   }
   if ( mNodeEditor )
   {
diff --git a/src/app/nodetool/qgsmaptoolnodetool.h b/src/app/nodetool/qgsmaptoolnodetool.h
@@ -66,6 +66,11 @@ class QgsMapToolNodeTool: public QgsMapToolEdit
      */
     QgsFeature getFeatureAtPoint( QgsMapMouseEvent* e );
 
+    /**
+     * Update select feature rubber band
+     */
+    void updateSelectFeature();
+
     /**
      * Deletes the rubber band pointers and clears mRubberBands
      */
@@ -121,6 +126,9 @@ class QgsMapToolNodeTool: public QgsMapToolEdit
     /** Rubber bands during node move */
     QMap<QgsFeatureId, QgsGeometryRubberBand*> mMoveRubberBands;
 
+    /** Rubber band for selected feature */
+    QgsGeometryRubberBand* mSelectRubberBand;
+
     /** Vertices of features to move */
     QMap<QgsFeatureId, QList< QPair<QgsVertexId, QgsPointV2> > > mMoveVertices;
 

Original file line number	Diff line number	Diff line change
`@@ -212,13 +212,15 @@ void QgsMapToolNodeTool::canvasPressEvent( QgsMapMouseEvent* e )`
`212`	`212`	`// remove previous warning`
`213`	`213`	`emit messageDiscarded();`
`214`	`214`	`mSelectedFeature = new QgsSelectedFeature( feature.id(), vlayer, mCanvas );`
	`215`	`+ updateSelectFeature();`
`215`	`216`	`}`
`216`	`217`	`}`
`217`	`218`	`else {`
`218`	`219`	`// remove previous warning`
`219`	`220`	`emit messageDiscarded();`
`220`	`221`
`221`	`222`	`mSelectedFeature = new QgsSelectedFeature( snapResults[0].snappedAtGeometry, vlayer, mCanvas );`
	`223`	`+ updateSelectFeature();`
`222`	`224`	`}`
`223`	`225`	`connect( QgisApp::instance()->layerTreeView(), SIGNAL( currentLayerChanged( QgsMapLayer* ) ), this, SLOT( currentLayerChanged( QgsMapLayer* ) ) );`
`224`	`226`	`connect( mSelectedFeature, SIGNAL( destroyed() ), this, SLOT( selectedFeatureDestroyed() ) );`
`@@ -350,6 +352,21 @@ void QgsMapToolNodeTool::canvasPressEvent( QgsMapMouseEvent* e )`
`350`	`352`	`}`
`351`	`353`	`}`
`352`	`354`
	`355`	`+void QgsMapToolNodeTool::updateSelectFeature()`
	`356`	`+{`
	`357`	`+ if (mSelectRubberBand != NULL) {`
	`358`	`+ delete mSelectRubberBand;`
	`359`	`+ }`
	`360`	`+ mSelectRubberBand = new QgsGeometryRubberBand( mCanvas, mSelectedFeature->geometry()->type() );`
	`361`	`+ mSelectRubberBand->setBrushStyle( Qt::SolidPattern );`
	`362`	`+ mSelectRubberBand->setFillColor( QColor( 255, 0, 0, 50 ) );`
	`363`	`+ QgsAbstractGeometryV2* rbGeom = mSelectedFeature->geometry()->geometry()->clone();`
	`364`	`+ QgsVectorLayer *vlayer = mSelectedFeature->vlayer();`
	`365`	`+ if ( mCanvas->mapSettings().layerTransform( vlayer ) )`
	`366`	`+ rbGeom->transform( *mCanvas->mapSettings().layerTransform( vlayer ) );`
	`367`	`+ mSelectRubberBand->setGeometry( rbGeom );`
	`368`	`+}`
	`369`	`+`
`353`	`370`	`void QgsMapToolNodeTool::selectedFeatureDestroyed()`
`354`	`371`	`{`
`355`	`372`	`QgsDebugCall;`
`@@ -396,6 +413,7 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QgsMapMouseEvent* e )`
`396`	`413`	`{`
`397`	`414`	`// select another feature`
`398`	`415`	`mSelectedFeature->setSelectedFeature( mAnother, vlayer, mCanvas );`
	`416`	`+ updateSelectFeature();`
`399`	`417`	`mIsPoint = vlayer->geometryType() == QGis::Point;`
`400`	`418`	`mSelectAnother = false;`
`401`	`419`	`}`
`@@ -494,6 +512,10 @@ void QgsMapToolNodeTool::cleanTool( bool deleteSelectedFeature )`
`494`	`512`	`{`
`495`	`513`	`removeRubberBands();`
`496`	`514`
	`515`	`+ if ( mSelectRubberBand != NULL ) {`
	`516`	`+ delete mSelectRubberBand;`
	`517`	`+ mSelectRubberBand = NULL;`
	`518`	`+ }`
`497`	`519`	`if ( mSelectedFeature )`
`498`	`520`	`{`
`499`	`521`	`QgsVectorLayer *vlayer = mSelectedFeature->vlayer();`
`@@ -504,7 +526,7 @@ void QgsMapToolNodeTool::cleanTool( bool deleteSelectedFeature )`
`504`	`526`	`disconnect( vlayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );`
`505`	`527`
`506`	`528`	`if ( deleteSelectedFeature ) delete mSelectedFeature;`
`507`		`- mSelectedFeature = 0;`
	`529`	`+ mSelectedFeature = NULL;`
`508`	`530`	`}`
`509`	`531`	`if ( mNodeEditor )`
`510`	`532`	`{`