improve sorting of field values for the query builder (#6046)

nirvn · web-flow · commit f3ced09632c6 · 2018-01-12T15:48:02.000+07:00
diff --git a/src/gui/qgsquerybuilder.cpp b/src/gui/qgsquerybuilder.cpp
@@ -137,7 +137,8 @@ void QgsQueryBuilder::fillValues( int idx, int limit )
   mModelValues->clear();
 
   // determine the field type
-  QSet<QVariant> values = mLayer->uniqueValues( idx, limit );
+  QList<QVariant> values = mLayer->uniqueValues( idx, limit ).toList();
+  std::sort( values.begin(), values.end() );
 
   QString nullValue = QgsApplication::nullRepresentation();
 
@@ -159,7 +160,6 @@ void QgsQueryBuilder::fillValues( int idx, int limit )
     mModelValues->insertRow( mModelValues->rowCount(), myItem );
     QgsDebugMsg( QString( "Value is null: %1\nvalue: %2" ).arg( var.isNull() ).arg( var.isNull() ? nullValue : var.toString() ) );
   }
-  mModelValues->sort( 0 );
 }
 
 void QgsQueryBuilder::btnSampleValues_clicked()

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,8 @@ void QgsQueryBuilder::fillValues( int idx, int limit )`
`137`	`137`	`mModelValues->clear();`
`138`	`138`
`139`	`139`	`// determine the field type`
`140`		`- QSet<QVariant> values = mLayer->uniqueValues( idx, limit );`
	`140`	`+ QList<QVariant> values = mLayer->uniqueValues( idx, limit ).toList();`
	`141`	`+ std::sort( values.begin(), values.end() );`
`141`	`142`
`142`	`143`	`QString nullValue = QgsApplication::nullRepresentation();`
`143`	`144`
`@@ -159,7 +160,6 @@ void QgsQueryBuilder::fillValues( int idx, int limit )`
`159`	`160`	`mModelValues->insertRow( mModelValues->rowCount(), myItem );`
`160`	`161`	`QgsDebugMsg( QString( "Value is null: %1\nvalue: %2" ).arg( var.isNull() ).arg( var.isNull() ? nullValue : var.toString() ) );`
`161`	`162`	`}`
`162`		`- mModelValues->sort( 0 );`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`void QgsQueryBuilder::btnSampleValues_clicked()`