[QGIS Commit] r9453 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-10-07 14:07:09 -0400 (Tue, 07 Oct 2008)
New Revision: 9453

Modified:
   trunk/qgis/src/app/qgscontinuouscolordialog.cpp
   trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp
Log:
Fix bug where quantiles and empty classification types werent showing preview symbols in layer props. Also used some better var names in cont col dlg

Modified: trunk/qgis/src/app/qgscontinuouscolordialog.cpp
===================================================================
--- trunk/qgis/src/app/qgscontinuouscolordialog.cpp	2008-10-07 14:49:28 UTC (rev 9452)
+++ trunk/qgis/src/app/qgscontinuouscolordialog.cpp	2008-10-07 18:07:09 UTC (rev 9453)
@@ -44,7 +44,7 @@
   if ( provider )
   {
     const QgsFieldMap & fields = provider->fields();
-    int fieldnumber( 0 ), combonumber( 0 );
+    int fieldNumber( 0 ), comboNumber( 0 );
     QString str;
 
     for ( QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it )
@@ -54,10 +54,10 @@
       {
         str = ( *it ).name();
         classificationComboBox->addItem( str );
-        mFieldMap.insert( std::make_pair( combonumber, fieldnumber ) );
-        combonumber++;
+        mFieldMap.insert( std::make_pair( comboNumber, fieldNumber ) );
+        comboNumber++;
       }
-      fieldnumber++;
+      fieldNumber++;
     }
   }
   else

Modified: trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp	2008-10-07 14:49:28 UTC (rev 9452)
+++ trunk/qgis/src/app/qgsgraduatedsymboldialog.cpp	2008-10-07 18:07:09 UTC (rev 9453)
@@ -307,7 +307,9 @@
       if ( last_it != quantileBorders.end() )
       {
         listBoxText = QString::number( *last_it, 'f' ) + " - " + QString::number( *it, 'f' );
-        mClassListWidget->addItem( listBoxText );
+        QListWidgetItem *mypItem = new QListWidgetItem( listBoxText );
+        mClassListWidget->addItem( mypItem );
+        updateEntryIcon( *symbol_it, mypItem );
         ( *symbol_it )->setLowerValue( QString::number( *last_it, 'f' ) );
         ( *symbol_it )->setUpperValue( QString::number( *it, 'f' ) );
         mEntries.insert( std::make_pair( listBoxText, *symbol_it ) );
@@ -348,7 +350,9 @@
     for ( int i = 0;i < numberofclassesspinbox->value();++i )
     {
       listBoxText = "Empty" + QString::number( i + 1 );
-      mClassListWidget->addItem( listBoxText );
+      QListWidgetItem * mypItem = new QListWidgetItem( listBoxText );
+      updateEntryIcon( *symbol_it, mypItem );
+      mClassListWidget->addItem( mypItem );
       mEntries.insert( std::make_pair( listBoxText, *symbol_it ) );
       ++symbol_it;
     }