Fix GetLegendGraphic with scale on Categorized or Graduated symbol

Stéphane Brunner · Stéphane Brunner · commit 7fdedf1ab95d · 2013-10-19T12:48:01.000+02:00
diff --git a/src/core/composer/qgslegendmodel.cpp b/src/core/composer/qgslegendmodel.cpp
@@ -187,17 +187,17 @@ int QgsLegendModel::addVectorLayerItemsV2( QStandardItem* layerItem, QgsVectorLa
 
       // updateSymbolV2ItemText needs layer set
       updateSymbolV2ItemText( currentSymbolItem );
-
-      row++;
     }
     else
     {
       QgsComposerSymbolV2Item* currentSymbolItem = new QgsComposerSymbolV2Item( "" );
       currentSymbolItem->setIcon( QgsSymbolLayerV2Utils::symbolPreviewIcon( symbolIt->second, QSize( 30, 30 ) ) );
       currentSymbolItem->setSymbolV2( symbolIt->second );
-      layerItem->setChild( 0, 0, currentSymbolItem );
+      layerItem->setChild( row, 0, currentSymbolItem );
       currentSymbolItem->setText( symbolIt->first );
     }
+
+    row++;
   }
 
   // Don't remove row on getLegendGraphic (read only with filter)

Original file line number	Diff line number	Diff line change
`@@ -187,17 +187,17 @@ int QgsLegendModel::addVectorLayerItemsV2( QStandardItem* layerItem, QgsVectorLa`
`187`	`187`
`188`	`188`	`// updateSymbolV2ItemText needs layer set`
`189`	`189`	`updateSymbolV2ItemText( currentSymbolItem );`
`190`		`-`
`191`		`- row++;`
`192`	`190`	`}`
`193`	`191`	`else`
`194`	`192`	`{`
`195`	`193`	`QgsComposerSymbolV2Item* currentSymbolItem = new QgsComposerSymbolV2Item( "" );`
`196`	`194`	`currentSymbolItem->setIcon( QgsSymbolLayerV2Utils::symbolPreviewIcon( symbolIt->second, QSize( 30, 30 ) ) );`
`197`	`195`	`currentSymbolItem->setSymbolV2( symbolIt->second );`
`198`		`- layerItem->setChild( 0, 0, currentSymbolItem );`
	`196`	`+ layerItem->setChild( row, 0, currentSymbolItem );`
`199`	`197`	`currentSymbolItem->setText( symbolIt->first );`
`200`	`198`	`}`
	`199`	`+`
	`200`	`+ row++;`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// Don't remove row on getLegendGraphic (read only with filter)`