[QGIS Commit] r9277 - in trunk/qgis/src: app/composer core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-09-07 07:12:35 -0400 (Sun, 07 Sep 2008)
New Revision: 9277

Modified:
   trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp
   trunk/qgis/src/core/composer/qgslegendmodel.cpp
Log:
Adjust legend box size when updating. Fix problem where vector class. items were not deleted in update

Modified: trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp	2008-09-07 08:59:28 UTC (rev 9276)
+++ trunk/qgis/src/app/composer/qgscomposerlegendwidget.cpp	2008-09-07 11:12:35 UTC (rev 9277)
@@ -368,6 +368,7 @@
       mLegend->model()->updateItem(currentItem);
     }
   mLegend->update();
+  mLegend->adjustBoxSize();
 }
 
 void QgsComposerLegendWidget::on_mUpdateAllPushButton_clicked()

Modified: trunk/qgis/src/core/composer/qgslegendmodel.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgslegendmodel.cpp	2008-09-07 08:59:28 UTC (rev 9276)
+++ trunk/qgis/src/core/composer/qgslegendmodel.cpp	2008-09-07 11:12:35 UTC (rev 9277)
@@ -279,7 +279,8 @@
   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);
 	}