Adjust legend box size when updating. Fix problem where vector class. items were not deleted in update

mhugent · mhugent · commit ca0eb5c5436c · 2008-09-07T11:12:35.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9277 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -368,6 +368,7 @@ void QgsComposerLegendWidget::on_mUpdatePushButton_clicked()
       mLegend->model()->updateItem(currentItem);
     }
   mLegend->update();
+  mLegend->adjustBoxSize();
 }
 
 void QgsComposerLegendWidget::on_mUpdateAllPushButton_clicked()
diff --git a/src/core/composer/qgslegendmodel.cpp b/src/core/composer/qgslegendmodel.cpp
@@ -279,7 +279,8 @@ void QgsLegendModel::updateLayer(QStandardItem* layerItem)
   if(mapLayer)
     {
       //delete all the entries under layer item
-      for(int i = rowCount() - 1; i >= 0; --i)
+      int currentRowCount = layerItem->rowCount();
+      for(int i = currentRowCount - 1; i >= 0; --i)
 	{
 	  layerItem->removeRow(i);
 	}

Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,7 @@ void QgsComposerLegendWidget::on_mUpdatePushButton_clicked()`
`368`	`368`	`mLegend->model()->updateItem(currentItem);`
`369`	`369`	`}`
`370`	`370`	`mLegend->update();`
	`371`	`+ mLegend->adjustBoxSize();`
`371`	`372`	`}`
`372`	`373`
`373`	`374`	`void QgsComposerLegendWidget::on_mUpdateAllPushButton_clicked()`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,8 @@ void QgsLegendModel::updateLayer(QStandardItem* layerItem)`
`279`	`279`	`if(mapLayer)`
`280`	`280`	`{`
`281`	`281`	`//delete all the entries under layer item`
`282`		`- for(int i = rowCount() - 1; i >= 0; --i)`
	`282`	`+ int currentRowCount = layerItem->rowCount();`
	`283`	`+ for(int i = currentRowCount - 1; i >= 0; --i)`
`283`	`284`	`{`
`284`	`285`	`layerItem->removeRow(i);`
`285`	`286`	`}`