store valuemap as QList instead of QMap

signedav · 3nids · commit 481b6247377b · 2018-01-22T04:59:23.000-09:00
because with QMap it loses the order. the two values (key and value) are in an one dimensional QMap stored.
this because QPair is not a QVariant. we desided not to stor it as DataStream, because then less powerfull platforms couldn't use it from the configuration.
diff --git a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp
@@ -43,7 +43,7 @@ QgsValueMapConfigDlg::QgsValueMapConfigDlg( QgsVectorLayer *vl, int fieldIdx, QW
 
 QVariantMap QgsValueMapConfigDlg::config()
 {
-  QList<QPair<QString, QVariant>> valueList;
+  QList<QVariant> valueList;
 
   //store data to map
   for ( int i = 0; i < tableWidget->rowCount() - 1; i++ )
@@ -58,22 +58,21 @@ QVariantMap QgsValueMapConfigDlg::config()
     if ( ( ks == QgsApplication::nullRepresentation() ) && !( ki->flags() & Qt::ItemIsEditable ) )
       ks = QgsValueMapFieldFormatter::NULL_VALUE;
 
+    QVariantMap value;
+
     if ( !vi || vi->text().isNull() )
     {
-      valueList.append( qMakePair( ks, ks ) );
+      value.insert( ks, ks );
     }
     else
     {
-      valueList.append( qMakePair( vi->text(), ks ) );
+      value.insert( vi->text(), ks );
     }
+    valueList.append( value );
   }
 
-  QByteArray ba;
-  QDataStream data( &ba, QIODevice::WriteOnly );
-  data << valueList;
-
   QVariantMap cfg;
-  cfg.insert( QStringLiteral( "map" ), ba );
+  cfg.insert( QStringLiteral( "map" ), valueList );
   return cfg;
 }
 
@@ -85,17 +84,13 @@ void QgsValueMapConfigDlg::setConfig( const QVariantMap &config )
     tableWidget->removeRow( i );
   }
 
-  QList<QPair<QString, QVariant>> valueList;
-
-  QByteArray ba = config.value( QStringLiteral( "map" ) ).toByteArray();
-  QDataStream data( &ba, QIODevice::ReadOnly );
-  data >> valueList;
+  QList<QVariant> valueList = config.value( QStringLiteral( "map" ) ).toList();
 
   if ( valueList.count() > 0 )
   {
     for ( int i = 0, row = 0; i < valueList.count(); i++, row++ )
     {
-      setRow( row, valueList[i].second.toString(), valueList[i].first );
+      setRow( row, valueList[i].toMap().constBegin().value().toString(), valueList[i].toMap().constBegin().key() );
     }
   }
   else
diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp
@@ -58,17 +58,13 @@ void QgsValueMapWidgetWrapper::initWidget( QWidget *editor )
 
   if ( mComboBox )
   {
-    QList<QPair<QString, QVariant>> valueList;
-
-    QByteArray ba = config().value( QStringLiteral( "map" ) ).toByteArray();
-    QDataStream data( &ba, QIODevice::ReadOnly );
-    data >> valueList;
+    QList<QVariant> valueList = config().value( QStringLiteral( "map" ) ).toList();
 
     if ( valueList.count() > 0 )
     {
-      for ( int i = 0; i < valueList.count(); i++ )
+      for ( int i = 0, row = 0; i < valueList.count(); i++, row++ )
       {
-        mComboBox->addItem( valueList[i].first, valueList[i].second );
+        mComboBox->addItem( valueList[i].toMap().constBegin().key(), valueList[i].toMap().constBegin().value() );
       }
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ QgsValueMapConfigDlg::QgsValueMapConfigDlg( QgsVectorLayer *vl, int fieldIdx, QW`
`43`	`43`
`44`	`44`	`QVariantMap QgsValueMapConfigDlg::config()`
`45`	`45`	`{`
`46`		`- QList<QPair<QString, QVariant>> valueList;`
	`46`	`+ QList<QVariant> valueList;`
`47`	`47`
`48`	`48`	`//store data to map`
`49`	`49`	`for ( int i = 0; i < tableWidget->rowCount() - 1; i++ )`
`@@ -58,22 +58,21 @@ QVariantMap QgsValueMapConfigDlg::config()`
`58`	`58`	`if ( ( ks == QgsApplication::nullRepresentation() ) && !( ki->flags() & Qt::ItemIsEditable ) )`
`59`	`59`	`ks = QgsValueMapFieldFormatter::NULL_VALUE;`
`60`	`60`
	`61`	`+ QVariantMap value;`
	`62`	`+`
`61`	`63`	`if ( !vi \|\| vi->text().isNull() )`
`62`	`64`	`{`
`63`		`- valueList.append( qMakePair( ks, ks ) );`
	`65`	`+ value.insert( ks, ks );`
`64`	`66`	`}`
`65`	`67`	`else`
`66`	`68`	`{`
`67`		`- valueList.append( qMakePair( vi->text(), ks ) );`
	`69`	`+ value.insert( vi->text(), ks );`
`68`	`70`	`}`
	`71`	`+ valueList.append( value );`
`69`	`72`	`}`
`70`	`73`
`71`		`- QByteArray ba;`
`72`		`- QDataStream data( &ba, QIODevice::WriteOnly );`
`73`		`- data << valueList;`
`74`		`-`
`75`	`74`	`QVariantMap cfg;`
`76`		`- cfg.insert( QStringLiteral( "map" ), ba );`
	`75`	`+ cfg.insert( QStringLiteral( "map" ), valueList );`
`77`	`76`	`return cfg;`
`78`	`77`	`}`
`79`	`78`
`@@ -85,17 +84,13 @@ void QgsValueMapConfigDlg::setConfig( const QVariantMap &config )`
`85`	`84`	`tableWidget->removeRow( i );`
`86`	`85`	`}`
`87`	`86`
`88`		`- QList<QPair<QString, QVariant>> valueList;`
`89`		`-`
`90`		`- QByteArray ba = config.value( QStringLiteral( "map" ) ).toByteArray();`
`91`		`- QDataStream data( &ba, QIODevice::ReadOnly );`
`92`		`- data >> valueList;`
	`87`	`+ QList<QVariant> valueList = config.value( QStringLiteral( "map" ) ).toList();`
`93`	`88`
`94`	`89`	`if ( valueList.count() > 0 )`
`95`	`90`	`{`
`96`	`91`	`for ( int i = 0, row = 0; i < valueList.count(); i++, row++ )`
`97`	`92`	`{`
`98`		`- setRow( row, valueList[i].second.toString(), valueList[i].first );`
	`93`	`+ setRow( row, valueList[i].toMap().constBegin().value().toString(), valueList[i].toMap().constBegin().key() );`
`99`	`94`	`}`
`100`	`95`	`}`
`101`	`96`	`else`
Original file line number	Diff line number	Diff line change
`@@ -58,17 +58,13 @@ void QgsValueMapWidgetWrapper::initWidget( QWidget *editor )`
`58`	`58`
`59`	`59`	`if ( mComboBox )`
`60`	`60`	`{`
`61`		`- QList<QPair<QString, QVariant>> valueList;`
`62`		`-`
`63`		`- QByteArray ba = config().value( QStringLiteral( "map" ) ).toByteArray();`
`64`		`- QDataStream data( &ba, QIODevice::ReadOnly );`
`65`		`- data >> valueList;`
	`61`	`+ QList<QVariant> valueList = config().value( QStringLiteral( "map" ) ).toList();`
`66`	`62`
`67`	`63`	`if ( valueList.count() > 0 )`
`68`	`64`	`{`
`69`		`- for ( int i = 0; i < valueList.count(); i++ )`
	`65`	`+ for ( int i = 0, row = 0; i < valueList.count(); i++, row++ )`
`70`	`66`	`{`
`71`		`- mComboBox->addItem( valueList[i].first, valueList[i].second );`
	`67`	`+ mComboBox->addItem( valueList[i].toMap().constBegin().key(), valueList[i].toMap().constBegin().value() );`
`72`	`68`	`}`
`73`	`69`	`}`
`74`	`70`	`else`