more legend icon size related fixes

mhugent · mhugent · commit e3433a0ad66c · 2006-04-18T10:47:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5303 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -109,7 +109,10 @@ void QgsLegend::removeAll()
 {
   mStateOfCheckBoxes.clear();
   clear();
+  mPixmapWidthValues.clear();
+  mPixmapHeightValues.clear();
   updateMapCanvasLayerSet();
+  setIconSize(mMinimumIconSize);
 }
 
 void QgsLegend::removeLayer(QString layer_key)
@@ -131,6 +134,7 @@ void QgsLegend::removeLayer(QString layer_key)
 		  //remove the map entry for the checkbox
 		  mStateOfCheckBoxes.erase(llf);
 		  removeItem(llf);
+		  delete llf;
 		  break;
 		}
 	    }
@@ -139,6 +143,7 @@ void QgsLegend::removeLayer(QString layer_key)
     }
 
     updateMapCanvasLayerSet();
+    adjustIconSize();
 }
 
 void QgsLegend::mousePressEvent(QMouseEvent * e)
@@ -548,6 +553,7 @@ void QgsLegend::legendGroupRemove()
             child = lg->child(0);
         }
 	delete lg;
+	adjustIconSize();
     }
 }
 
@@ -584,6 +590,8 @@ void QgsLegend::legendLayerRemove()
      mMapCanvas->refresh();
    }
    removeItem(ll);
+   delete ll;
+   adjustIconSize();
 }
 
 void QgsLegend::legendLayerAddToOverview()
@@ -1284,8 +1292,6 @@ void QgsLegend::changeSymbologySettings(const QString& key, const std::list< std
       theSymbologyItem = dynamic_cast<QgsLegendSymbologyItem*>((theLegendLayer)->child(i));
       if(theSymbologyItem)
 	{
-	  removePixmapWidthValue(theSymbologyItem->pixmapWidth());
-	  removePixmapHeightValue(theSymbologyItem->pixmapHeight());
 	  delete (theLegendLayer->takeChild(i));
 	}
     }
@@ -1297,12 +1303,10 @@ void QgsLegend::changeSymbologySettings(const QString& key, const std::list< std
       for(std::list< std::pair<QString, QPixmap> >::const_iterator it= newSymbologyItems->begin(); it != newSymbologyItems->end(); ++it)
 	{
 	  QgsLegendSymbologyItem* theItem = new QgsLegendSymbologyItem(it->second.width(), it->second.height());
+	  theItem->setLegend(this);
 	  theItem->setText(0, it->first);
 	  theItem->setIcon(0, QIcon(it->second));
 	  theLegendLayer->insertChild(childposition, theItem);
-	  //add the width and height values to the multisets
-	  addPixmapWidthValue(theItem->pixmapWidth());
-	  addPixmapHeightValue(theItem->pixmapHeight());
 	  ++childposition;
 	}
     }
diff --git a/src/legend/qgslegendsymbologyitem.cpp b/src/legend/qgslegendsymbologyitem.cpp
@@ -17,22 +17,27 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "qgslegend.h"
+
 #include "qgslegendsymbologyitem.h"
 
 QgsLegendSymbologyItem::QgsLegendSymbologyItem(QTreeWidgetItem * theItem,QString theString, int pixmapWidth, int pixmapHeight)
-  : QgsLegendItem(theItem, theString), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight)
+  : QgsLegendItem(theItem, theString), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight), mLegend(0)
 {
   mType = LEGEND_SYMBOL_ITEM;
 }
 
-QgsLegendSymbologyItem::QgsLegendSymbologyItem(int pixmapWidth, int pixmapHeight): QgsLegendItem(), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight)
+QgsLegendSymbologyItem::QgsLegendSymbologyItem(int pixmapWidth, int pixmapHeight): QgsLegendItem(), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight), mLegend(0)
 {
   mType = LEGEND_SYMBOL_ITEM;
 }
 
 QgsLegendSymbologyItem::~QgsLegendSymbologyItem()
 {  
+  if(mLegend)
+    {
+      mLegend->removePixmapWidthValue(mPixmapWidth);
+      mLegend->removePixmapHeightValue(mPixmapHeight);
+    }
 }
 
 QgsLegendItem::DRAG_ACTION QgsLegendSymbologyItem::accept(LEGEND_ITEM_TYPE type)
@@ -45,3 +50,13 @@ QgsLegendItem::DRAG_ACTION QgsLegendSymbologyItem::accept(const QgsLegendItem* l
   return NO_ACTION;
 }
 
+void QgsLegendSymbologyItem::setLegend(QgsLegend* theLegend)
+{
+  mLegend = theLegend;
+  if(mLegend)
+    {
+      mLegend->addPixmapWidthValue(mPixmapWidth);
+      mLegend->addPixmapHeightValue(mPixmapHeight);
+    }
+}
+
diff --git a/src/legend/qgslegendsymbologyitem.h b/src/legend/qgslegendsymbologyitem.h
@@ -20,6 +20,7 @@
 #ifndef QGSLEGENDSYMBOLOGYITEM_H
 #define QGSLEGENDSYMBOLOGYITEM_H
 
+#include "qgslegend.h"
 #include <qgslegenditem.h>
 
 /**
@@ -36,9 +37,14 @@ class QgsLegendSymbologyItem : public QgsLegendItem
     QgsLegendItem::DRAG_ACTION accept(const QgsLegendItem* li) const;
     int pixmapWidth() const {return mPixmapWidth;}
     int pixmapHeight() const {return mPixmapHeight;}
+    void setLegend(QgsLegend* theLegend);
+    QgsLegend* legend() const {return mLegend;}
  protected:
     int mPixmapWidth;
     int mPixmapHeight;
+    /**This pointer is needed to remove the width/height values of this item
+     in the legend even if this item is not in the legend anymore*/
+    QgsLegend* mLegend;
 };
 
 #endif
diff --git a/src/raster/qgsrasterlayer.cpp b/src/raster/qgsrasterlayer.cpp
@@ -5060,7 +5060,7 @@ void QgsRasterLayer::refreshLegend()
   if(mLegend)
     {
       std::list< std::pair<QString, QPixmap> > itemList;
-      QPixmap legendpixmap = getLegendQPixmap(true).scaled(20, 20);
+      QPixmap legendpixmap = getLegendQPixmap(true).scaled(20, 20, Qt::KeepAspectRatio);
       itemList.push_back(std::make_pair("", legendpixmap));
       mLegend->changeSymbologySettings(getLayerID(), &itemList);
     }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,10 @@ void QgsLegend::removeAll()`
`109`	`109`	`{`
`110`	`110`	`mStateOfCheckBoxes.clear();`
`111`	`111`	`clear();`
	`112`	`+ mPixmapWidthValues.clear();`
	`113`	`+ mPixmapHeightValues.clear();`
`112`	`114`	`updateMapCanvasLayerSet();`
	`115`	`+ setIconSize(mMinimumIconSize);`
`113`	`116`	`}`
`114`	`117`
`115`	`118`	`void QgsLegend::removeLayer(QString layer_key)`
`@@ -131,6 +134,7 @@ void QgsLegend::removeLayer(QString layer_key)`
`131`	`134`	`//remove the map entry for the checkbox`
`132`	`135`	`mStateOfCheckBoxes.erase(llf);`
`133`	`136`	`removeItem(llf);`
	`137`	`+ delete llf;`
`134`	`138`	`break;`
`135`	`139`	`}`
`136`	`140`	`}`
`@@ -139,6 +143,7 @@ void QgsLegend::removeLayer(QString layer_key)`
`139`	`143`	`}`
`140`	`144`
`141`	`145`	`updateMapCanvasLayerSet();`
	`146`	`+ adjustIconSize();`
`142`	`147`	`}`
`143`	`148`
`144`	`149`	`void QgsLegend::mousePressEvent(QMouseEvent * e)`
`@@ -548,6 +553,7 @@ void QgsLegend::legendGroupRemove()`
`548`	`553`	`child = lg->child(0);`
`549`	`554`	`}`
`550`	`555`	`delete lg;`
	`556`	`+ adjustIconSize();`
`551`	`557`	`}`
`552`	`558`	`}`
`553`	`559`
`@@ -584,6 +590,8 @@ void QgsLegend::legendLayerRemove()`
`584`	`590`	`mMapCanvas->refresh();`
`585`	`591`	`}`
`586`	`592`	`removeItem(ll);`
	`593`	`+ delete ll;`
	`594`	`+ adjustIconSize();`
`587`	`595`	`}`
`588`	`596`
`589`	`597`	`void QgsLegend::legendLayerAddToOverview()`
`@@ -1284,8 +1292,6 @@ void QgsLegend::changeSymbologySettings(const QString& key, const std::list< std`
`1284`	`1292`	`theSymbologyItem = dynamic_cast<QgsLegendSymbologyItem*>((theLegendLayer)->child(i));`
`1285`	`1293`	`if(theSymbologyItem)`
`1286`	`1294`	`{`
`1287`		`- removePixmapWidthValue(theSymbologyItem->pixmapWidth());`
`1288`		`- removePixmapHeightValue(theSymbologyItem->pixmapHeight());`
`1289`	`1295`	`delete (theLegendLayer->takeChild(i));`
`1290`	`1296`	`}`
`1291`	`1297`	`}`
`@@ -1297,12 +1303,10 @@ void QgsLegend::changeSymbologySettings(const QString& key, const std::list< std`
`1297`	`1303`	`for(std::list< std::pair<QString, QPixmap> >::const_iterator it= newSymbologyItems->begin(); it != newSymbologyItems->end(); ++it)`
`1298`	`1304`	`{`
`1299`	`1305`	`QgsLegendSymbologyItem* theItem = new QgsLegendSymbologyItem(it->second.width(), it->second.height());`
	`1306`	`+ theItem->setLegend(this);`
`1300`	`1307`	`theItem->setText(0, it->first);`
`1301`	`1308`	`theItem->setIcon(0, QIcon(it->second));`
`1302`	`1309`	`theLegendLayer->insertChild(childposition, theItem);`
`1303`		`- //add the width and height values to the multisets`
`1304`		`- addPixmapWidthValue(theItem->pixmapWidth());`
`1305`		`- addPixmapHeightValue(theItem->pixmapHeight());`
`1306`	`1310`	`++childposition;`
`1307`	`1311`	`}`
`1308`	`1312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,22 +17,27 @@`
`17`	`17`	`* Free Software Foundation, Inc., *`
`18`	`18`	`* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *`
`19`	`19`	`***************************************************************************/`
`20`		`-#include "qgslegend.h"`
	`20`	`+`
`21`	`21`	`#include "qgslegendsymbologyitem.h"`
`22`	`22`
`23`	`23`	`QgsLegendSymbologyItem::QgsLegendSymbologyItem(QTreeWidgetItem * theItem,QString theString, int pixmapWidth, int pixmapHeight)`
`24`		`- : QgsLegendItem(theItem, theString), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight)`
	`24`	`+ : QgsLegendItem(theItem, theString), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight), mLegend(0)`
`25`	`25`	`{`
`26`	`26`	`mType = LEGEND_SYMBOL_ITEM;`
`27`	`27`	`}`
`28`	`28`
`29`		`-QgsLegendSymbologyItem::QgsLegendSymbologyItem(int pixmapWidth, int pixmapHeight): QgsLegendItem(), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight)`
	`29`	`+QgsLegendSymbologyItem::QgsLegendSymbologyItem(int pixmapWidth, int pixmapHeight): QgsLegendItem(), mPixmapWidth(pixmapWidth), mPixmapHeight(pixmapHeight), mLegend(0)`
`30`	`30`	`{`
`31`	`31`	`mType = LEGEND_SYMBOL_ITEM;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`QgsLegendSymbologyItem::~QgsLegendSymbologyItem()`
`35`	`35`	`{`
	`36`	`+ if(mLegend)`
	`37`	`+ {`
	`38`	`+ mLegend->removePixmapWidthValue(mPixmapWidth);`
	`39`	`+ mLegend->removePixmapHeightValue(mPixmapHeight);`
	`40`	`+ }`
`36`	`41`	`}`
`37`	`42`
`38`	`43`	`QgsLegendItem::DRAG_ACTION QgsLegendSymbologyItem::accept(LEGEND_ITEM_TYPE type)`
`@@ -45,3 +50,13 @@ QgsLegendItem::DRAG_ACTION QgsLegendSymbologyItem::accept(const QgsLegendItem* l`
`45`	`50`	`return NO_ACTION;`
`46`	`51`	`}`
`47`	`52`
	`53`	`+void QgsLegendSymbologyItem::setLegend(QgsLegend* theLegend)`
	`54`	`+{`
	`55`	`+ mLegend = theLegend;`
	`56`	`+ if(mLegend)`
	`57`	`+ {`
	`58`	`+ mLegend->addPixmapWidthValue(mPixmapWidth);`
	`59`	`+ mLegend->addPixmapHeightValue(mPixmapHeight);`
	`60`	`+ }`
	`61`	`+}`
	`62`	`+`
Original file line number	Diff line number	Diff line change
`@@ -5060,7 +5060,7 @@ void QgsRasterLayer::refreshLegend()`
`5060`	`5060`	`if(mLegend)`
`5061`	`5061`	`{`
`5062`	`5062`	`std::list< std::pair<QString, QPixmap> > itemList;`
`5063`		`- QPixmap legendpixmap = getLegendQPixmap(true).scaled(20, 20);`
	`5063`	`+ QPixmap legendpixmap = getLegendQPixmap(true).scaled(20, 20, Qt::KeepAspectRatio);`
`5064`	`5064`	`itemList.push_back(std::make_pair("", legendpixmap));`
`5065`	`5065`	`mLegend->changeSymbologySettings(getLayerID(), &itemList);`
`5066`	`5066`	`}`