Add ability to fetch MapToolNodeTool's currently selected feature from within python

python/CMakeLists.txt

@@ -67,6 +67,8 @@ ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
 # additional gui includes
 INCLUDE_DIRECTORIES(
     ../src/gui
+    ../src/app
+    ../src/app/nodetool/
     ../src/gui/symbology-ng
     ../src/plugins
     ${CMAKE_BINARY_DIR}/src/gui

python/gui/gui.sip

@@ -24,6 +24,9 @@
 %Include qgsmaptoolemitpoint.sip
 %Include qgsmaptoolpan.sip
 %Include qgsmaptoolzoom.sip
+%Include qgsmaptooledit.sip
+%Include qgsmaptoolvertexedit.sip
+%Include qgsmaptoolnodetool.sip
 %Include qgsmapoverviewcanvas.sip
 %Include qgsmessageviewer.sip
 %Include qgsprojectbadlayerguihandler.sip

python/gui/qgsmaptool.sip

@@ -6,6 +6,9 @@
 #include <qgsmaptoolzoom.h>
 #include <qgsmaptoolpan.h>
 #include <qgsmaptoolemitpoint.h>
+#include <qgsmaptooledit.h>
+#include <qgsmaptoolvertexedit.h>
+#include <qgsmaptoolnodetool.h>
 %End
 
 class QgsMapTool : QObject
@@ -21,6 +24,12 @@ class QgsMapTool : QObject
     sipClass = sipClass_QgsMapToolPan;
   else if (dynamic_cast<QgsMapToolEmitPoint*>(sipCpp) != NULL)
     sipClass = sipClass_QgsMapToolEmitPoint;
+  else if (dynamic_cast<QgsMapToolEdit*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsMapToolEdit;
+  else if (dynamic_cast<QgsMapToolVertexEdit*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsMapToolVertexEdit;
+  else if (dynamic_cast<QgsMapToolNodeTool*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsMapToolNodeTool;
   else
     sipClass = NULL;
 %End

python/gui/qgsmaptooledit.sip

@@ -0,0 +1,26 @@
+
+class QgsMapToolEdit : QgsMapTool
+{
+%TypeHeaderCode
+#include <qgsmaptooledit.h>
+%End
+
+%ConvertToSubClassCode
+  if (dynamic_cast<QgsMapToolVertexEdit*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsMapToolVertexEdit;
+  else if (dynamic_cast<QgsMapToolNodeTool*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsMapToolNodeTool;
+  else
+    sipClass = NULL;
+%End
+
+  public:
+    //! constructor
+    QgsMapToolEdit(QgsMapCanvas* canvas);
+
+    virtual ~QgsMapToolEdit();
+
+    virtual bool isEditTool();
+
+};
+

python/gui/qgsmaptoolnodetool.sip

@@ -0,0 +1,20 @@
+class QgsMapToolNodeTool : QgsMapToolVertexEdit
+{
+%TypeHeaderCode
+#include <qgsmaptoolnodetool.h>
+%End
+
+  public:
+    //! constructor
+    QgsMapToolNodeTool(QgsMapCanvas* canvas);
+
+    virtual ~QgsMapToolNodeTool();
+
+    virtual bool isEditTool();
+
+    // SelectionFeature* selectionFeature();
+
+    int featureId();
+
+};
+

python/gui/qgsmaptoolvertexedit.sip

@@ -0,0 +1,13 @@
+class QgsMapToolVertexEdit : QgsMapToolEdit
+{
+%TypeHeaderCode
+#include <qgsmaptoolvertexedit.h>
+%End
+
+  public:
+    //! constructor
+    QgsMapToolVertexEdit(QgsMapCanvas* canvas);
+
+    virtual ~QgsMapToolVertexEdit();
+};
+

src/app/nodetool/qgsmaptoolnodetool.cpp

@@ -44,6 +44,19 @@ QgsMapToolNodeTool::~QgsMapToolNodeTool()
   removeRubberBands();
 }
 
+QgsSelectedFeature* QgsMapToolNodeTool::selectedFeature()
+{
+  return mSelectedFeature;
+}
+
+QgsFeatureId QgsMapToolNodeTool::featureId()
+{
+  if ( mSelectedFeature != NULL ) {
+    return mSelectedFeature->featureId();
+  }
+  return NULL;
+}
+
 void QgsMapToolNodeTool::createMovingRubberBands()
 {
   int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
@@ -595,6 +608,7 @@ void QgsMapToolNodeTool::canvasReleaseEvent( QMouseEvent * e )
   mExcludePoint.clear();
 }
 
+
 void QgsMapToolNodeTool::deactivate()
 {
   removeRubberBands();

src/app/nodetool/qgsmaptoolnodetool.h

@@ -57,6 +57,10 @@ class QgsMapToolNodeTool: public QgsMapToolVertexEdit
      */
     QgsPoint closestVertex( QgsPoint point );
 
+    QgsSelectedFeature* selectedFeature();
+
+    QgsFeatureId featureId();
+
   public slots:
     void selectedFeatureDestroyed();