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

timlinux · timlinux · commit e96e1bf736e1 · 2008-10-07T18:07:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9453 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgscontinuouscolordialog.cpp b/src/app/qgscontinuouscolordialog.cpp
@@ -44,7 +44,7 @@ QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )
   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 @@ QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )
       {
         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
diff --git a/src/app/qgsgraduatedsymboldialog.cpp b/src/app/qgsgraduatedsymboldialog.cpp
@@ -307,7 +307,9 @@ void QgsGraduatedSymbolDialog::adjustClassification()
       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 @@ void QgsGraduatedSymbolDialog::adjustClassification()
     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;
     }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )`
`44`	`44`	`if ( provider )`
`45`	`45`	`{`
`46`	`46`	`const QgsFieldMap & fields = provider->fields();`
`47`		`- int fieldnumber( 0 ), combonumber( 0 );`
	`47`	`+ int fieldNumber( 0 ), comboNumber( 0 );`
`48`	`48`	`QString str;`
`49`	`49`
`50`	`50`	`for ( QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it )`
`@@ -54,10 +54,10 @@ QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )`
`54`	`54`	`{`
`55`	`55`	`str = ( *it ).name();`
`56`	`56`	`classificationComboBox->addItem( str );`
`57`		`- mFieldMap.insert( std::make_pair( combonumber, fieldnumber ) );`
`58`		`- combonumber++;`
	`57`	`+ mFieldMap.insert( std::make_pair( comboNumber, fieldNumber ) );`
	`58`	`+ comboNumber++;`
`59`	`59`	`}`
`60`		`- fieldnumber++;`
	`60`	`+ fieldNumber++;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`else`