fix for #6901

Arunmozhi · Arunmozhi · commit 0ff4324caa9a · 2012-12-21T22:04:31.000+05:30
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -445,10 +445,9 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2Widget::renderer()
 
 void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols()
 {
-  QItemSelectionModel* m = viewCategories->selectionModel();
-  QModelIndexList selectedIndexes = m->selectedRows( 1 );
+  QList<int> selectedCats = selectedCategories();
 
-  if ( m && selectedIndexes.size() > 0 )
+  if ( selectedCats.size() > 0 )
   {
     QgsSymbolV2* newSymbol = mCategorizedSymbol->clone();
     QgsSymbolV2SelectorDialog dlg( newSymbol, mStyle, mLayer, this );
@@ -458,15 +457,13 @@ void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols()
       return;
     }
 
-    foreach ( QModelIndex idx, selectedIndexes )
+    foreach ( const int idx, selectedCats )
     {
-      if ( idx.isValid() )
-      {
-        int catIdx = mRenderer->categoryIndexForValue( idx.data( Qt::UserRole + 1 ) );
-        QgsSymbolV2* newCatSymbol = newSymbol->clone();
-        newCatSymbol->setColor( mRenderer->categories()[catIdx].symbol()->color() );
-        mRenderer->updateCategorySymbol( catIdx, newCatSymbol );
-      }
+      QgsRendererCategoryV2 category = mRenderer->categories().value( idx );
+
+      QgsSymbolV2* newCatSymbol = newSymbol->clone();
+      newCatSymbol->setColor( mRenderer->categories()[idx].symbol()->color() );
+      mRenderer->updateCategorySymbol( idx, newCatSymbol );
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -445,10 +445,9 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2Widget::renderer()`
`445`	`445`
`446`	`446`	`void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols()`
`447`	`447`	`{`
`448`		`- QItemSelectionModel* m = viewCategories->selectionModel();`
`449`		`- QModelIndexList selectedIndexes = m->selectedRows( 1 );`
	`448`	`+ QList<int> selectedCats = selectedCategories();`
`450`	`449`
`451`		`- if ( m && selectedIndexes.size() > 0 )`
	`450`	`+ if ( selectedCats.size() > 0 )`
`452`	`451`	`{`
`453`	`452`	`QgsSymbolV2* newSymbol = mCategorizedSymbol->clone();`
`454`	`453`	`QgsSymbolV2SelectorDialog dlg( newSymbol, mStyle, mLayer, this );`
`@@ -458,15 +457,13 @@ void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols()`
`458`	`457`	`return;`
`459`	`458`	`}`
`460`	`459`
`461`		`- foreach ( QModelIndex idx, selectedIndexes )`
	`460`	`+ foreach ( const int idx, selectedCats )`
`462`	`461`	`{`
`463`		`- if ( idx.isValid() )`
`464`		`- {`
`465`		`- int catIdx = mRenderer->categoryIndexForValue( idx.data( Qt::UserRole + 1 ) );`
`466`		`- QgsSymbolV2* newCatSymbol = newSymbol->clone();`
`467`		`- newCatSymbol->setColor( mRenderer->categories()[catIdx].symbol()->color() );`
`468`		`- mRenderer->updateCategorySymbol( catIdx, newCatSymbol );`
`469`		`- }`
	`462`	`+ QgsRendererCategoryV2 category = mRenderer->categories().value( idx );`
	`463`	`+`
	`464`	`+ QgsSymbolV2* newCatSymbol = newSymbol->clone();`
	`465`	`+ newCatSymbol->setColor( mRenderer->categories()[idx].symbol()->color() );`
	`466`	`+ mRenderer->updateCategorySymbol( idx, newCatSymbol );`
`470`	`467`	`}`
`471`	`468`	`}`
`472`	`469`	`}`