fixed the empty group issue in symbol filter

Arunmozhi · Arunmozhi · commit 86143e9242b7 · 2012-08-04T12:57:44.000+05:30
diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
@@ -51,6 +51,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
 
   // Populate the symbol groups
   QStringList groups = style->groupNames();
+  groupsCombo->addItem( QString( "" ) ); //empty first item
   foreach ( QString group, groups )
   {
     groupsCombo->addItem( group );
@@ -100,7 +101,12 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
   updateSymbolColor();
 }
 
-void QgsSymbolsListWidget::populateSymbolView( QStringList names )
+void QgsSymbolsListWidget::populateSymbolView()
+{
+  populateSymbols( mStyle->symbolNames() );
+}
+
+void QgsSymbolsListWidget::populateSymbols( QStringList names )
 {
   QSize previewSize = viewSymbols->iconSize();
   QPixmap p( previewSize );
@@ -113,11 +119,6 @@ void QgsSymbolsListWidget::populateSymbolView( QStringList names )
   }
   model->clear();
 
-  if ( names.isEmpty() )
-  {
-    names = mStyle->symbolNames();
-  }
-
   for ( int i = 0; i < names.count(); i++ )
   {
     QgsSymbolV2* s = mStyle->symbol( names[i] );
@@ -298,11 +299,11 @@ void QgsSymbolsListWidget::on_groupsCombo_currentIndexChanged( const QString &te
 {
   int groupid = mStyle->groupId( text );
   QStringList symbols = mStyle->symbolsOfGroup( SymbolEntity, groupid );
-  populateSymbolView( symbols );
+  populateSymbols( symbols );
 }
 
 void QgsSymbolsListWidget::on_groupsCombo_editTextChanged( const QString &text )
 {
   QStringList symbols = mStyle->findSymbols( text );
-  populateSymbolView( symbols );
+  populateSymbols( symbols );
 }
diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.h b/src/gui/symbology-ng/qgssymbolslistwidget.h
@@ -54,7 +54,8 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
     QgsSymbolV2* mSymbol;
     QgsStyleV2* mStyle;
 
-    void populateSymbolView( QStringList symbols = QStringList() );
+    void populateSymbolView();
+    void populateSymbols( QStringList symbols );
     void updateSymbolColor();
     void updateSymbolInfo();
 

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty`
`51`	`51`
`52`	`52`	`// Populate the symbol groups`
`53`	`53`	`QStringList groups = style->groupNames();`
	`54`	`+ groupsCombo->addItem( QString( "" ) ); //empty first item`
`54`	`55`	`foreach ( QString group, groups )`
`55`	`56`	`{`
`56`	`57`	`groupsCombo->addItem( group );`
`@@ -100,7 +101,12 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty`
`100`	`101`	`updateSymbolColor();`
`101`	`102`	`}`
`102`	`103`
`103`		`-void QgsSymbolsListWidget::populateSymbolView( QStringList names )`
	`104`	`+void QgsSymbolsListWidget::populateSymbolView()`
	`105`	`+{`
	`106`	`+ populateSymbols( mStyle->symbolNames() );`
	`107`	`+}`
	`108`	`+`
	`109`	`+void QgsSymbolsListWidget::populateSymbols( QStringList names )`
`104`	`110`	`{`
`105`	`111`	`QSize previewSize = viewSymbols->iconSize();`
`106`	`112`	`QPixmap p( previewSize );`
`@@ -113,11 +119,6 @@ void QgsSymbolsListWidget::populateSymbolView( QStringList names )`
`113`	`119`	`}`
`114`	`120`	`model->clear();`
`115`	`121`
`116`		`- if ( names.isEmpty() )`
`117`		`- {`
`118`		`- names = mStyle->symbolNames();`
`119`		`- }`
`120`		`-`
`121`	`122`	`for ( int i = 0; i < names.count(); i++ )`
`122`	`123`	`{`
`123`	`124`	`QgsSymbolV2* s = mStyle->symbol( names[i] );`
`@@ -298,11 +299,11 @@ void QgsSymbolsListWidget::on_groupsCombo_currentIndexChanged( const QString &te`
`298`	`299`	`{`
`299`	`300`	`int groupid = mStyle->groupId( text );`
`300`	`301`	`QStringList symbols = mStyle->symbolsOfGroup( SymbolEntity, groupid );`
`301`		`- populateSymbolView( symbols );`
	`302`	`+ populateSymbols( symbols );`
`302`	`303`	`}`
`303`	`304`
`304`	`305`	`void QgsSymbolsListWidget::on_groupsCombo_editTextChanged( const QString &text )`
`305`	`306`	`{`
`306`	`307`	`QStringList symbols = mStyle->findSymbols( text );`
`307`		`- populateSymbolView( symbols );`
	`308`	`+ populateSymbols( symbols );`
`308`	`309`	`}`