Document QgsValueMapFieldFormatter::NullValue

m-kuhn · m-kuhn · commit c6dc31a552ee · 2016-12-20T01:20:08.000+01:00
diff --git a/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp b/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp
@@ -17,6 +17,8 @@
 
 #include "qgsvectorlayer.h"
 
+const QString QgsValueMapFieldFormatter::NullValue = QStringLiteral( "{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" );
+
 QString QgsValueMapFieldFormatter::id() const
 {
   return QStringLiteral( "ValueMap" );
@@ -28,7 +30,7 @@ QString QgsValueMapFieldFormatter::representValue( QgsVectorLayer* layer, int fi
 
   QString valueInternalText;
   if ( value.isNull() )
-    valueInternalText = VALUEMAP_NULL_TEXT;
+    valueInternalText = NullValue;
   else
     valueInternalText = value.toString();
 
diff --git a/src/core/fieldformatter/qgsvaluemapfieldformatter.h b/src/core/fieldformatter/qgsvaluemapfieldformatter.h
@@ -18,11 +18,16 @@
 
 #include "qgsfieldformatter.h"
 
-#define VALUEMAP_NULL_TEXT QStringLiteral( "{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" )
-
 class CORE_EXPORT QgsValueMapFieldFormatter : public QgsFieldFormatter
 {
   public:
+
+    /**
+     * Will be saved in the configuration when a value is NULL.
+     * It's the magic UUID {2839923C-8B7D-419E-B84B-CA2FE9B80EC7}
+     */
+    static const QString NullValue;
+
     virtual QString id() const override;
 
     virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
diff --git a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp
@@ -54,7 +54,7 @@ QVariantMap QgsValueMapConfigDlg::config()
 
     QString ks = ki->text();
     if (( ks == QgsApplication::nullRepresentation() ) && !( ki->flags() & Qt::ItemIsEditable ) )
-      ks = VALUEMAP_NULL_TEXT;
+      ks = QgsValueMapFieldFormatter::NullValue;
 
     if ( !vi || vi->text().isNull() )
     {
@@ -137,7 +137,7 @@ void QgsValueMapConfigDlg::updateMap( const QMap<QString, QVariant> &map, bool i
 
   if ( insertNull )
   {
-    setRow( row, VALUEMAP_NULL_TEXT, QStringLiteral( "<NULL>" ) );
+    setRow( row, QgsValueMapFieldFormatter::NullValue, QStringLiteral( "<NULL>" ) );
     ++row;
   }
 
@@ -156,7 +156,7 @@ void QgsValueMapConfigDlg::setRow( int row, const QString& value, const QString&
   QTableWidgetItem* valueCell;
   QTableWidgetItem* descriptionCell = new QTableWidgetItem( description );
   tableWidget->insertRow( row );
-  if ( value == VALUEMAP_NULL_TEXT )
+  if ( value == QgsValueMapFieldFormatter::NullValue )
   {
     QFont cellFont;
     cellFont.setItalic( true );
@@ -175,7 +175,7 @@ void QgsValueMapConfigDlg::setRow( int row, const QString& value, const QString&
 
 void QgsValueMapConfigDlg::addNullButtonPushed()
 {
-  setRow( tableWidget->rowCount() - 1, VALUEMAP_NULL_TEXT, QStringLiteral( "<NULL>" ) );
+  setRow( tableWidget->rowCount() - 1, QgsValueMapFieldFormatter::NullValue, QStringLiteral( "<NULL>" ) );
 }
 
 void QgsValueMapConfigDlg::loadFromLayerButtonPushed()
@@ -248,7 +248,7 @@ void QgsValueMapConfigDlg::loadFromCSVButtonPushed()
     }
 
     if ( key == QgsApplication::nullRepresentation() )
-      key = VALUEMAP_NULL_TEXT;
+      key = QgsValueMapFieldFormatter::NullValue;
 
     map[ key ] = val;
   }
diff --git a/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
@@ -147,7 +147,7 @@ void QgsValueMapSearchWidgetWrapper::initWidget( QWidget* editor )
 
     while ( it != cfg.constEnd() )
     {
-      if ( it.value() != VALUEMAP_NULL_TEXT )
+      if ( it.value() != QgsValueMapFieldFormatter::NullValue )
         mComboBox->addItem( it.key(), it.value() );
       ++it;
     }
diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp
@@ -33,7 +33,7 @@ QVariant QgsValueMapWidgetWrapper::value() const
   if ( mComboBox )
     v = mComboBox->currentData();
 
-  if ( v == VALUEMAP_NULL_TEXT )
+  if ( v == QgsValueMapFieldFormatter::NullValue )
     v = QVariant( field().type() );
 
   return v;
@@ -79,7 +79,7 @@ void QgsValueMapWidgetWrapper::setValue( const QVariant& value )
 {
   QString v;
   if ( value.isNull() )
-    v = VALUEMAP_NULL_TEXT;
+    v = QgsValueMapFieldFormatter::NullValue;
   else
     v = value.toString();
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ QVariantMap QgsValueMapConfigDlg::config()`
`54`	`54`
`55`	`55`	`QString ks = ki->text();`
`56`	`56`	`if (( ks == QgsApplication::nullRepresentation() ) && !( ki->flags() & Qt::ItemIsEditable ) )`
`57`		`- ks = VALUEMAP_NULL_TEXT;`
	`57`	`+ ks = QgsValueMapFieldFormatter::NullValue;`
`58`	`58`
`59`	`59`	`if ( !vi \|\| vi->text().isNull() )`
`60`	`60`	`{`
`@@ -137,7 +137,7 @@ void QgsValueMapConfigDlg::updateMap( const QMap<QString, QVariant> &map, bool i`
`137`	`137`
`138`	`138`	`if ( insertNull )`
`139`	`139`	`{`
`140`		`- setRow( row, VALUEMAP_NULL_TEXT, QStringLiteral( "<NULL>" ) );`
	`140`	`+ setRow( row, QgsValueMapFieldFormatter::NullValue, QStringLiteral( "<NULL>" ) );`
`141`	`141`	`++row;`
`142`	`142`	`}`
`143`	`143`
`@@ -156,7 +156,7 @@ void QgsValueMapConfigDlg::setRow( int row, const QString& value, const QString&`
`156`	`156`	`QTableWidgetItem* valueCell;`
`157`	`157`	`QTableWidgetItem* descriptionCell = new QTableWidgetItem( description );`
`158`	`158`	`tableWidget->insertRow( row );`
`159`		`- if ( value == VALUEMAP_NULL_TEXT )`
	`159`	`+ if ( value == QgsValueMapFieldFormatter::NullValue )`
`160`	`160`	`{`
`161`	`161`	`QFont cellFont;`
`162`	`162`	`cellFont.setItalic( true );`
`@@ -175,7 +175,7 @@ void QgsValueMapConfigDlg::setRow( int row, const QString& value, const QString&`
`175`	`175`
`176`	`176`	`void QgsValueMapConfigDlg::addNullButtonPushed()`
`177`	`177`	`{`
`178`		`- setRow( tableWidget->rowCount() - 1, VALUEMAP_NULL_TEXT, QStringLiteral( "<NULL>" ) );`
	`178`	`+ setRow( tableWidget->rowCount() - 1, QgsValueMapFieldFormatter::NullValue, QStringLiteral( "<NULL>" ) );`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`void QgsValueMapConfigDlg::loadFromLayerButtonPushed()`
`@@ -248,7 +248,7 @@ void QgsValueMapConfigDlg::loadFromCSVButtonPushed()`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`if ( key == QgsApplication::nullRepresentation() )`
`251`		`- key = VALUEMAP_NULL_TEXT;`
	`251`	`+ key = QgsValueMapFieldFormatter::NullValue;`
`252`	`252`
`253`	`253`	`map[ key ] = val;`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ void QgsValueMapSearchWidgetWrapper::initWidget( QWidget* editor )`
`147`	`147`
`148`	`148`	`while ( it != cfg.constEnd() )`
`149`	`149`	`{`
`150`		`- if ( it.value() != VALUEMAP_NULL_TEXT )`
	`150`	`+ if ( it.value() != QgsValueMapFieldFormatter::NullValue )`
`151`	`151`	`mComboBox->addItem( it.key(), it.value() );`
`152`	`152`	`++it;`
`153`	`153`	`}`