use QgsVectorDataProvider::getUniqueValues() in unique value dialog again (was lost in r8440)

jef · jef · commit 0c272e2d0571 · 2008-06-04T16:54:14.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8588 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsuniquevaluedialog.cpp b/src/app/qgsuniquevaluedialog.cpp
@@ -292,29 +292,19 @@ void QgsUniqueValueDialog::changeClassificationAttribute()
   QgsVectorDataProvider *provider = dynamic_cast<QgsVectorDataProvider *>(mVectorLayer->getDataProvider());
   if (provider)
   {
-    QString value;
-    QgsAttributeList attlist;
-
     int nr = provider->indexFromFieldName(attributeName);
     if(nr == -1)
     {
       return;
     }
-    attlist.append(nr);
 
-    provider->select(attlist, QgsRect(), false);
-    QgsFeature feat;
+    QStringList values;
+    provider->getUniqueValues(nr, values);
 
-    //go through all the features and insert their value into the map and into mClassListWidget
-    while(provider->getNextFeature(feat)) 
+    for(int i=0; i<values.size(); i++)
     {
-      const QgsAttributeMap& attrs = feat.attributeMap();
-      value = attrs[nr].toString();
-
-      if( mValues.contains(value) )
-        continue;
-
-      addClass(value);
+      if( !mValues.contains(values[i]) )
+        addClass(values[i]);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -292,29 +292,19 @@ void QgsUniqueValueDialog::changeClassificationAttribute()`
`292`	`292`	`QgsVectorDataProvider provider = dynamic_cast<QgsVectorDataProvider >(mVectorLayer->getDataProvider());`
`293`	`293`	`if (provider)`
`294`	`294`	`{`
`295`		`- QString value;`
`296`		`- QgsAttributeList attlist;`
`297`		`-`
`298`	`295`	`int nr = provider->indexFromFieldName(attributeName);`
`299`	`296`	`if(nr == -1)`
`300`	`297`	`{`
`301`	`298`	`return;`
`302`	`299`	`}`
`303`		`- attlist.append(nr);`
`304`	`300`
`305`		`- provider->select(attlist, QgsRect(), false);`
`306`		`- QgsFeature feat;`
	`301`	`+ QStringList values;`
	`302`	`+ provider->getUniqueValues(nr, values);`
`307`	`303`
`308`		`- //go through all the features and insert their value into the map and into mClassListWidget`
`309`		`- while(provider->getNextFeature(feat))`
	`304`	`+ for(int i=0; i<values.size(); i++)`
`310`	`305`	`{`
`311`		`- const QgsAttributeMap& attrs = feat.attributeMap();`
`312`		`- value = attrs[nr].toString();`
`313`		`-`
`314`		`- if( mValues.contains(value) )`
`315`		`- continue;`
`316`		`-`
`317`		`- addClass(value);`
	`306`	`+ if( !mValues.contains(values[i]) )`
	`307`	`+ addClass(values[i]);`
`318`	`308`	`}`
`319`	`309`	`}`
`320`	`310`	`}`