Small refactor of QgsPropertyOverrideButton

qgis · Dec 2, 2017 · 618baf9 · 618baf9
1 parent 6b23e1f
commit 618baf9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/python/gui/qgspropertyoverridebutton.sip b/python/gui/qgspropertyoverridebutton.sip
@@ -53,6 +53,20 @@ class QgsPropertyOverrideButton: QToolButton
  \param auxiliaryStorageEnabled If true, activate the button to store data defined in auxiliary storage
 %End
 
+    void init( int propertyKey,
+               const QgsProperty &property,
+               const QgsPropertyDefinition &definition,
+               const QgsVectorLayer *layer = 0,
+               bool auxiliaryStorageEnabled = false );
+%Docstring
+ Initialize a newly constructed property button (useful if button was included in a UI layout).
+ \param propertyKey key for corresponding property
+ \param property initial value of associated property to show in widget
+ \param definition properties definition for button
+ \param layer associated vector layer
+ \param auxiliaryStorageEnabled If true, activate the button to store data defined in auxiliary storage
+%End
+
     void init( int propertyKey,
                const QgsAbstractPropertyCollection &collection,
                const QgsPropertiesDefinition &definitions,

diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -88,13 +88,18 @@ QgsPropertyOverrideButton::QgsPropertyOverrideButton( QWidget *parent,
 
 
 void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &property, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer, bool auxiliaryStorageEnabled )
+{
+  init( propertyKey, property, definitions.value( propertyKey ), layer, auxiliaryStorageEnabled );
+}
+
+void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &property, const QgsPropertyDefinition &definition, const QgsVectorLayer *layer, bool auxiliaryStorageEnabled )
 {
   mVectorLayer = layer;
   mAuxiliaryStorageEnabled = auxiliaryStorageEnabled;
   setToProperty( property );
   mPropertyKey = propertyKey;
 
-  mDefinition = definitions.value( propertyKey );
+  mDefinition = definition;
   mDataTypes = mDefinition.dataType();
 
   mInputDescription = mDefinition.helpText();

diff --git a/src/gui/qgspropertyoverridebutton.h b/src/gui/qgspropertyoverridebutton.h
@@ -77,6 +77,20 @@ class GUI_EXPORT QgsPropertyOverrideButton: public QToolButton
                const QgsVectorLayer *layer = nullptr,
                bool auxiliaryStorageEnabled = false );
 
+    /**
+     * Initialize a newly constructed property button (useful if button was included in a UI layout).
+     * \param propertyKey key for corresponding property
+     * \param property initial value of associated property to show in widget
+     * \param definition properties definition for button
+     * \param layer associated vector layer
+     * \param auxiliaryStorageEnabled If true, activate the button to store data defined in auxiliary storage
+     */
+    void init( int propertyKey,
+               const QgsProperty &property,
+               const QgsPropertyDefinition &definition,
+               const QgsVectorLayer *layer = nullptr,
+               bool auxiliaryStorageEnabled = false );
+
     /**
      * Initialize a newly constructed property button (useful if button was included in a UI layout).
      * \param propertyKey key for corresponding property