[QGIS Commit] r14034 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-08-09 10:38:46 +0000 (Mon, 09 Aug 2010)
New Revision: 14034

Modified:
   trunk/qgis/src/core/qgsvectordataprovider.cpp
Log:
add support for non-numeric fields in generic minimumValue/maximumValue fallback method

Modified: trunk/qgis/src/core/qgsvectordataprovider.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectordataprovider.cpp	2010-08-09 03:12:19 UTC (rev 14033)
+++ trunk/qgis/src/core/qgsvectordataprovider.cpp	2010-08-09 10:38:46 UTC (rev 14034)
@@ -373,6 +373,11 @@
       mCacheMinValues[it.key()] = QVariant( DBL_MAX );
       mCacheMaxValues[it.key()] = QVariant( -DBL_MAX );
     }
+    else
+    {
+      mCacheMinValues[it.key()] = QVariant();
+      mCacheMaxValues[it.key()] = QVariant();
+    }
   }
 
   QgsFeature f;
@@ -402,6 +407,18 @@
         if ( value > mCacheMaxValues[*it].toDouble() )
           mCacheMaxValues[*it] = value;
       }
+      else
+      {
+        QString value = varValue.toString();
+        if ( mCacheMinValues[*it].isNull() || value < mCacheMinValues[*it].toString() )
+        {
+          mCacheMinValues[*it] = value;
+        }
+        if ( mCacheMaxValues[*it].isNull() || value > mCacheMinValues[*it].toString() )
+        {
+          mCacheMaxValues[*it] = value;
+        }
+      }
     }
   }