Allow user to create its own auxiliary field

pblottiere · pblottiere · commit fc0ebb783d63 · 2017-10-09T05:13:59.000+01:00
diff --git a/python/core/qgsproperty.sip b/python/core/qgsproperty.sip
@@ -139,6 +139,11 @@ class QgsPropertyDefinition
  :rtype: str
 %End
 
+    void setDataType( DataType type );
+%Docstring
+ Sets the data type
+%End
+
     DataType dataType() const;
 %Docstring
  Returns the allowable field/value data type for the property.
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -57,6 +57,7 @@
 #include "qgsstyle.h"
 #include "qgsauxiliarystorage.h"
 #include "qgsnewauxiliarylayerdialog.h"
+#include "qgsnewauxiliaryfielddialog.h"
 #include "qgslabelinggui.h"
 #include "qgssymbollayer.h"
 
@@ -90,6 +91,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   , mAuxiliaryLayerActionDelete( nullptr )
   , mAuxiliaryLayerActionExport( nullptr )
   , mAuxiliaryLayerActionDeleteField( nullptr )
+  , mAuxiliaryLayerActionAddField( nullptr )
 {
   setupUi( this );
   connect( mLayerOrigNameLineEdit, &QLineEdit::textEdited, this, &QgsVectorLayerProperties::mLayerOrigNameLineEdit_textEdited );
@@ -382,6 +384,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   mAuxiliaryStorageActions->setMenu( menu );
 
   connect( mAuxiliaryStorageFieldsDeleteBtn, &QPushButton::clicked, this, &QgsVectorLayerProperties::onAuxiliaryLayerDeleteField );
+  connect( mAuxiliaryStorageFieldsAddBtn, &QPushButton::clicked, this, &QgsVectorLayerProperties::onAuxiliaryLayerAddField );
 
   updateAuxiliaryStoragePage();
 }
@@ -1679,6 +1682,19 @@ void QgsVectorLayerProperties::onAuxiliaryLayerDeleteField()
   }
 }
 
+void QgsVectorLayerProperties::onAuxiliaryLayerAddField()
+{
+  QgsAuxiliaryLayer *alayer = mLayer->auxiliaryLayer();
+  if ( !alayer )
+    return;
+
+  QgsNewAuxiliaryFieldDialog dlg( QgsPropertyDefinition(), mLayer, false );
+  if ( dlg.exec() == QDialog::Accepted )
+  {
+    updateAuxiliaryStoragePage();
+  }
+}
+
 void QgsVectorLayerProperties::deleteAuxiliaryField( int index )
 {
   if ( !mLayer->auxiliaryLayer() )
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -164,6 +164,8 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
 
     void onAuxiliaryLayerDeleteField();
 
+    void onAuxiliaryLayerAddField();
+
     void onAuxiliaryLayerExport();
 
   private:
@@ -235,6 +237,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
     QAction *mAuxiliaryLayerActionDelete = nullptr;
     QAction *mAuxiliaryLayerActionExport = nullptr;
     QAction *mAuxiliaryLayerActionDeleteField = nullptr;
+    QAction *mAuxiliaryLayerActionAddField = nullptr;
 
   private slots:
     void openPanel( QgsPanelWidget *panel );
diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp
@@ -81,6 +81,8 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )
       if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )
       {
         def = p;
+        if ( parts.size() == 3 )
+          def.setComment( parts[2] );
         break;
       }
     }
@@ -93,6 +95,8 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )
       if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )
       {
         def = p;
+        if ( parts.size() == 3 )
+          def.setComment( parts[2] );
         break;
       }
     }
@@ -105,17 +109,19 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )
       if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )
       {
         def = p;
+        if ( parts.size() == 3 )
+          def.setComment( parts[2] );
         break;
       }
     }
   }
-
-  if ( parts.size() == 3 )
+  else if ( origin.compare( "user", Qt::CaseInsensitive ) == 0 )
   {
-    def.setComment( parts[2] );
+    def.setOrigin( "user" );
+    def.setComment( propertyName );
   }
 
-  if ( !def.name().isEmpty() )
+  if ( !def.name().isEmpty() || !def.comment().isEmpty() )
   {
     init( def );
     setTypeName( f.typeName() );
@@ -125,7 +131,7 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )
 
 void QgsAuxiliaryField::init( const QgsPropertyDefinition &def )
 {
-  if ( !def.name().isEmpty() )
+  if ( !def.name().isEmpty() || !def.comment().isEmpty() )
   {
     QVariant::Type type;
     QString typeName;
@@ -167,7 +173,10 @@ bool QgsAuxiliaryLayer::clear()
 
 QString QgsAuxiliaryField::nameFromProperty( const QgsPropertyDefinition &def, bool joined )
 {
-  QString fieldName = QString( "%1_%2" ).arg( def.origin(), def.name().toLower() );
+  QString fieldName = def.origin();
+
+  if ( !def.name().isEmpty() )
+    fieldName =  QString( "%1_%2" ).arg( fieldName, def.name().toLower() );
 
   if ( !def.comment().isEmpty() )
     fieldName = QString( "%1_%2" ).arg( fieldName ).arg( def.comment() );
@@ -253,7 +262,7 @@ bool QgsAuxiliaryLayer::exists( const QgsPropertyDefinition &definition ) const
 
 bool QgsAuxiliaryLayer::addAuxiliaryField( const QgsPropertyDefinition &definition )
 {
-  if ( definition.name().isEmpty() || exists( definition ) )
+  if ( ( definition.name().isEmpty() && definition.comment().isEmpty() ) || exists( definition ) )
     return false;
 
   const QgsAuxiliaryField af( definition );
diff --git a/src/core/qgsproperty.h b/src/core/qgsproperty.h
@@ -172,6 +172,11 @@ class CORE_EXPORT QgsPropertyDefinition
      */
     QString helpText() const { return mHelpText; }
 
+    /**
+     * Sets the data type
+     */
+    void setDataType( DataType type ) { mTypes = type; }
+
     /**
      * Returns the allowable field/value data type for the property.
      */
diff --git a/src/gui/qgsnewauxiliaryfielddialog.cpp b/src/gui/qgsnewauxiliaryfielddialog.cpp
@@ -47,13 +47,33 @@ QgsNewAuxiliaryFieldDialog::QgsNewAuxiliaryFieldDialog( const QgsPropertyDefinit
 
   if ( mNameOnly )
     mType->setEnabled( false );
+  else
+    mType->setEnabled( true );
 }
 
 void QgsNewAuxiliaryFieldDialog::accept()
 {
   QgsPropertyDefinition def = mPropertyDefinition;
   def.setComment( mName->text() );
 
+  if ( !mNameOnly )
+  {
+    if ( mType->currentText().compare( tr( "String" ) ) == 0 )
+    {
+      def.setDataType( QgsPropertyDefinition::DataTypeString );
+    }
+    else if ( mType->currentText().compare( tr( "Numeric" ) ) == 0 )
+    {
+      def.setDataType( QgsPropertyDefinition::DataTypeNumeric );
+    }
+    else
+    {
+      def.setDataType( QgsPropertyDefinition::DataTypeBoolean );
+    }
+
+    def.setOrigin( "user" );
+  }
+
   QString fieldName = QgsAuxiliaryField::nameFromProperty( def, true );
   const int idx = mLayer->fields().lookupField( fieldName );
   if ( idx >= 0 )
diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -2153,6 +2153,17 @@ border-radius: 2px;</string>
                    </property>
                   </spacer>
                  </item>
+                 <item>
+                  <widget class="QPushButton" name="mAuxiliaryStorageFieldsAddBtn">
+                   <property name="text">
+                    <string/>
+                   </property>
+                   <property name="icon">
+                    <iconset resource="../../images/images.qrc">
+                     <normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
+                   </property>
+                  </widget>
+                 </item>
                  <item>
                   <widget class="QPushButton" name="mAuxiliaryStorageFieldsDeleteBtn">
                    <property name="text">

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )`
`81`	`81`	`if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )`
`82`	`82`	`{`
`83`	`83`	`def = p;`
	`84`	`+ if ( parts.size() == 3 )`
	`85`	`+ def.setComment( parts[2] );`
`84`	`86`	`break;`
`85`	`87`	`}`
`86`	`88`	`}`
`@@ -93,6 +95,8 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )`
`93`	`95`	`if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )`
`94`	`96`	`{`
`95`	`97`	`def = p;`
	`98`	`+ if ( parts.size() == 3 )`
	`99`	`+ def.setComment( parts[2] );`
`96`	`100`	`break;`
`97`	`101`	`}`
`98`	`102`	`}`
`@@ -105,17 +109,19 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )`
`105`	`109`	`if ( p.name().compare( propertyName, Qt::CaseInsensitive ) == 0 )`
`106`	`110`	`{`
`107`	`111`	`def = p;`
	`112`	`+ if ( parts.size() == 3 )`
	`113`	`+ def.setComment( parts[2] );`
`108`	`114`	`break;`
`109`	`115`	`}`
`110`	`116`	`}`
`111`	`117`	`}`
`112`		`-`
`113`		`- if ( parts.size() == 3 )`
	`118`	`+ else if ( origin.compare( "user", Qt::CaseInsensitive ) == 0 )`
`114`	`119`	`{`
`115`		`- def.setComment( parts[2] );`
	`120`	`+ def.setOrigin( "user" );`
	`121`	`+ def.setComment( propertyName );`
`116`	`122`	`}`
`117`	`123`
`118`		`- if ( !def.name().isEmpty() )`
	`124`	`+ if ( !def.name().isEmpty() \|\| !def.comment().isEmpty() )`
`119`	`125`	`{`
`120`	`126`	`init( def );`
`121`	`127`	`setTypeName( f.typeName() );`
`@@ -125,7 +131,7 @@ QgsAuxiliaryField::QgsAuxiliaryField( const QgsField &f )`
`125`	`131`
`126`	`132`	`void QgsAuxiliaryField::init( const QgsPropertyDefinition &def )`
`127`	`133`	`{`
`128`		`- if ( !def.name().isEmpty() )`
	`134`	`+ if ( !def.name().isEmpty() \|\| !def.comment().isEmpty() )`
`129`	`135`	`{`
`130`	`136`	`QVariant::Type type;`
`131`	`137`	`QString typeName;`
`@@ -167,7 +173,10 @@ bool QgsAuxiliaryLayer::clear()`
`167`	`173`
`168`	`174`	`QString QgsAuxiliaryField::nameFromProperty( const QgsPropertyDefinition &def, bool joined )`
`169`	`175`	`{`
`170`		`- QString fieldName = QString( "%1_%2" ).arg( def.origin(), def.name().toLower() );`
	`176`	`+ QString fieldName = def.origin();`
	`177`	`+`
	`178`	`+ if ( !def.name().isEmpty() )`
	`179`	`+ fieldName = QString( "%1_%2" ).arg( fieldName, def.name().toLower() );`
`171`	`180`
`172`	`181`	`if ( !def.comment().isEmpty() )`
`173`	`182`	`fieldName = QString( "%1_%2" ).arg( fieldName ).arg( def.comment() );`
`@@ -253,7 +262,7 @@ bool QgsAuxiliaryLayer::exists( const QgsPropertyDefinition &definition ) const`
`253`	`262`
`254`	`263`	`bool QgsAuxiliaryLayer::addAuxiliaryField( const QgsPropertyDefinition &definition )`
`255`	`264`	`{`
`256`		`- if ( definition.name().isEmpty() \|\| exists( definition ) )`
	`265`	`+ if ( ( definition.name().isEmpty() && definition.comment().isEmpty() ) \|\| exists( definition ) )`
`257`	`266`	`return false;`
`258`	`267`
`259`	`268`	`const QgsAuxiliaryField af( definition );`