Expose changed attributes in QgsFeatureAction and QgsVectorLayerTools

qgis · Nov 30, 2015 · d2b506c · d2b506c
1 parent 66b9b0d
commit d2b506c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/python/gui/qgsvectorlayertools.sip b/python/gui/qgsvectorlayertools.sip
@@ -13,8 +13,7 @@ class QgsVectorLayerTools
      * @param defaultGeometry A default geometry to add to the feature
      * @return                True in case of success, False if the operation failed/was aborted
      */
-    virtual bool addFeature( QgsVectorLayer* layer, const QgsAttributeMap& defaultValues = QgsAttributeMap(), const QgsGeometry& defaultGeometry = QgsGeometry() ) const = 0;
-
+    virtual bool addFeature( QgsVectorLayer* laye, const QgsAttributeMap& defaultValues = QgsAttributeMap(), const QgsGeometry& defaultGeometry = QgsGeometry(), QgsFeature* feature /Out/ = 0 ) const = 0;
 
     /**
      * This will be called, whenever a vector layer should be switched to edit mode. Check the providers

diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -218,6 +218,9 @@ void QgsFeatureAction::onFeatureSaved( const QgsFeature& feature )
   Q_UNUSED( form ) // only used for Q_ASSERT
   Q_ASSERT( form );
 
+  // Assign provider generated values
+  mFeature = feature;
+
   mFeatureSaved = true;
 
   QSettings settings;

diff --git a/src/app/qgsguivectorlayertools.cpp b/src/app/qgsguivectorlayertools.cpp
@@ -32,12 +32,19 @@ QgsGuiVectorLayerTools::QgsGuiVectorLayerTools()
     : QObject( NULL )
 {}
 
-bool QgsGuiVectorLayerTools::addFeature( QgsVectorLayer* layer, const QgsAttributeMap& defaultValues, const QgsGeometry& defaultGeometry ) const
+bool QgsGuiVectorLayerTools::addFeature( QgsVectorLayer* layer, const QgsAttributeMap& defaultValues, const QgsGeometry& defaultGeometry, QgsFeature* feat ) const
 {
-  QgsFeature f;
-  f.setGeometry( defaultGeometry );
-  QgsFeatureAction a( tr( "Add feature" ), f, layer );
-  return a.addFeature( defaultValues );
+  QgsFeature* f = feat;
+  if ( !feat )
+    f = new QgsFeature();
+
+  feat->setGeometry( defaultGeometry );
+  QgsFeatureAction a( tr( "Add feature" ), *f, layer );
+  bool added = a.addFeature( defaultValues );
+  if ( !feat )
+    delete f;
+
+  return added;
 }
 
 bool QgsGuiVectorLayerTools::startEditing( QgsVectorLayer* layer ) const

diff --git a/src/app/qgsguivectorlayertools.h b/src/app/qgsguivectorlayertools.h
@@ -39,7 +39,7 @@ class QgsGuiVectorLayerTools : public QObject, public QgsVectorLayerTools
      *
      * @return                True in case of success, False if the operation failed/was aborted
      */
-    bool addFeature( QgsVectorLayer *layer, const QgsAttributeMap& defaultValues, const QgsGeometry &defaultGeometry ) const override;
+    bool addFeature( QgsVectorLayer *layer, const QgsAttributeMap& defaultValues, const QgsGeometry &defaultGeometry, QgsFeature* feat = 0 ) const override;
 
     /**
      * This should be called, whenever a vector layer should be switched to edit mode. If successful

diff --git a/src/gui/qgsvectorlayertools.h b/src/gui/qgsvectorlayertools.h
@@ -45,10 +45,10 @@ class GUI_EXPORT QgsVectorLayerTools
      * @param layer           The layer to which the feature should be added
      * @param defaultValues   Default values for the feature to add
      * @param defaultGeometry A default geometry to add to the feature
+     * @param feature         Updated feature after adding will be written back to this
      * @return                True in case of success, False if the operation failed/was aborted
      */
-    virtual bool addFeature( QgsVectorLayer* layer, const QgsAttributeMap& defaultValues = QgsAttributeMap(), const QgsGeometry& defaultGeometry = QgsGeometry() ) const = 0;
-
+    virtual bool addFeature( QgsVectorLayer* layer, const QgsAttributeMap& defaultValues = QgsAttributeMap(), const QgsGeometry& defaultGeometry = QgsGeometry(), QgsFeature* feature = 0 ) const = 0;
 
     /**
      * This will be called, whenever a vector layer should be switched to edit mode. Check the providers