Add a method for creating a QgsDataDefined from a QgsDataDefinedButton

qgis · May 8, 2015 · d970daa · d970daa
1 parent 2c38552
commit d970daa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/python/gui/qgsdatadefinedbutton.sip b/python/gui/qgsdatadefinedbutton.sip
@@ -70,6 +70,13 @@ class QgsDataDefinedButton : QToolButton
      */
     void updateDataDefined( QgsDataDefined* dd ) const;
 
+    /** Returns a QgsDataDefined which reflects the current settings from the
+     * button.
+     * @note added in QGIS 2.9
+     * @see updateDataDefined
+     */
+    QgsDataDefined currentDataDefined() const;
+
     /**
      * Whether the current data definition or expression is to be used
      */

diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -204,6 +204,13 @@ void QgsDataDefinedButton::updateDataDefined( QgsDataDefined *dd ) const
   dd->setField( getField() );
 }
 
+QgsDataDefined QgsDataDefinedButton::currentDataDefined() const
+{
+  QgsDataDefined dd;
+  updateDataDefined( &dd );
+  return dd;
+}
+
 void QgsDataDefinedButton::mouseReleaseEvent( QMouseEvent *event )
 {
   // Ctrl-click to toggle activated state

diff --git a/src/gui/qgsdatadefinedbutton.h b/src/gui/qgsdatadefinedbutton.h
@@ -92,9 +92,17 @@ class GUI_EXPORT QgsDataDefinedButton: public QToolButton
     /** Updates a QgsDataDefined with the current settings from the button
      * @param dd QgsDataDefined to update
      * @note added in QGIS 2.9
+     * @see currentDataDefined
      */
     void updateDataDefined( QgsDataDefined* dd ) const;
 
+    /** Returns a QgsDataDefined which reflects the current settings from the
+     * button.
+     * @note added in QGIS 2.9
+     * @see updateDataDefined
+     */
+    QgsDataDefined currentDataDefined() const;
+
     /**
      * Whether the current data definition or expression is to be used
      */