Reordering of the legend and possibility to show/ hide layer files in…

… the legend with the right click menu

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4782 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/core/qgsrenderer.cpp

@@ -13,24 +13,16 @@ QgsRenderer::QgsRenderer()
 
 }
 
-void QgsRenderer::refreshLegend(QTreeWidgetItem* legendparent) const
+void QgsRenderer::refreshLegend(std::list< std::pair<QString, QIcon*> >* symbologyList) const
 {
-    if(legendparent)
+    if(symbologyList)
     {
-
-      //first remove the existing childs
-      //legendparent->takeChildren();
-      dynamic_cast<QgsLegendItem*>(legendparent)->removeAllChildren();
-
       //add the new items
       QString lw, uv, label;
       const std::list<QgsSymbol*> sym = symbols();
 
       for(std::list<QgsSymbol*>::const_iterator it=sym.begin(); it!=sym.end(); ++it)
 	{
-	  QgsLegendVectorSymbologyItem* item = new QgsLegendVectorSymbologyItem(legendparent, "");
-	  item->addSymbol(*it);
-
 	  QPixmap pix;
 	  if((*it)->type() == QGis::Point)
 	    {
@@ -45,8 +37,8 @@ void QgsRenderer::refreshLegend(QTreeWidgetItem* legendparent) const
 	      pix = (*it)->getPolygonSymbolAsPixmap();
 	    }
 
-	  QIcon theIcon(pix);
-	  item->setIcon(0, theIcon);
+	  QIcon* theIcon = new QIcon(pix);
+ 
 	  QString values;
 	  lw = (*it)->lowerValue();
 	  if(!lw.isEmpty())
@@ -65,7 +57,7 @@ void QgsRenderer::refreshLegend(QTreeWidgetItem* legendparent) const
 	      values += " ";
 	      values += label;
 	    }
-	  item->setText(0, values);
+	  symbologyList->push_back(std::make_pair(values, theIcon));
 	}
     }
 }

src/core/qgsrenderer.h

@@ -75,7 +75,7 @@ class QgsRenderer
     virtual const std::list<QgsSymbol*> symbols() const=0;
     /**Deletes the child items of the legendparent and add new ones according to the 
      QgsSymbols contained in this renderer*/
-    virtual void refreshLegend(QTreeWidgetItem* legendparent) const;
+    virtual void refreshLegend(std::list< std::pair<QString, QIcon*> >* symbologyList) const;
     /**Returns a copy of the renderer (a deep copy on the heap)*/
     virtual QgsRenderer* clone() const=0;
     /**Color to draw selected features - static so we can change it in proj props and automatically 

src/gui/qgsmapcanvas.cpp

@@ -2340,10 +2340,9 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
 #ifdef QGISDEBUG
             std::cout << "QgsMapCanvas::mouseReleaseEvent: Completed vlayer->insertVertexBefore." << std::endl;
 #endif
+	    refresh();
           }
-        }
-
-        // TODO: Redraw?  
+        }  
         break;
       }  
 
@@ -2396,8 +2395,7 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
                 point.x(), point.y(),
                 mCanvasProperties->snappedAtFeatureId,
                 mCanvasProperties->snappedAtVertex);
-	    render();
-	    update();
+	    refresh();
 
 #ifdef QGISDEBUG
             std::cout << "QgsMapCanvas::mouseReleaseEvent: Completed vlayer->moveVertexAt." << std::endl;
@@ -2458,10 +2456,9 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
 #ifdef QGISDEBUG
             std::cout << "QgsMapCanvas::mouseReleaseEvent: Completed vlayer->deleteVertexAt." << std::endl;
 #endif
+	    refresh();
           }
-        }
-        // TODO: Redraw?  
-
+        }  
         break;
       }
 

src/gui/qgsmaplayer.cpp

@@ -37,7 +37,6 @@
 #include "qgssymbol.h"
 #include "qgsmaplayer.h"
 #include "qgslegendlayerfile.h"
-#include "qgslegendsymbologygroup.h"
 
 
 
@@ -52,7 +51,7 @@ QgsMapLayer::QgsMapLayer(int type,
         mShowInOverviewAction(0),
         mShowInOverview(false),
         mCoordinateTransform(0),
-        mLegendSymbologyGroupParent(0),
+        mLegend(0),
         mLegendLayerFile(0),
         ID(""),
         layerType(type),

src/gui/qgsmaplayer.h

@@ -34,8 +34,8 @@ class QAction;
 class QgisApp;
 class QgsMapToPixel;
 class QgsFeature;
+class QgsLegend;
 class QgsLegendLayerFile;
-class QgsLegendSymbologyGroup;
 class QDomNode;
 class QDomDocument;
 class QKeyEvent;
@@ -268,8 +268,8 @@ class QgsMapLayer : public QObject
     /**Returns the path to an icon which characterises the type of layer*/
     virtual QString layerTypeIconPath() = 0;
 
-    void setLegendSymbologyGroupParent(QgsLegendSymbologyGroup* item) {mLegendSymbologyGroupParent = item;}
-    const QgsLegendSymbologyGroup* legendSymbologyGroupParent() {return mLegendSymbologyGroupParent;}
+    void setLegend(QgsLegend* legend) {mLegend = legend;}
+    const QgsLegend* legend() {return mLegend;}
 
     /**Refresh the symbology part of the legend. Specific implementations have to be provided by subclasses*/
     virtual void refreshLegend() = 0;
@@ -438,9 +438,8 @@ public  slots:
     //! A QgsCoordinateTransform is used for on the fly reprojection of map layers
     QgsCoordinateTransform * mCoordinateTransform; 
 
-    /**Pointer to the symbology group item of the legend. This pointer is used if refreshLegend() 
-       is called by a subclass*/
-    QgsLegendSymbologyGroup* mLegendSymbologyGroupParent;
+    /**Pointer to the legend layer item of the legend*/
+    QgsLegend* mLegend;
 
     /**Pointer to the legend layer file of the legend. It is used to modify the pixmap with overview
      glasses, editing or pyramid symbols*/

src/gui/qgsvectorlayer.cpp

@@ -64,9 +64,7 @@
 #include "qgsattributetable.h"
 #include "qgsfeature.h"
 #include "qgsfield.h"
-#include "qgslegenditem.h"
-#include "qgslegendvectorsymbologyitem.h"
-#include "qgslegendsymbologygroup.h"
+#include "qgslegend.h"
 #include "qgsvectorlayerproperties.h"
 #include "qgsrenderer.h"
 #include "qgssinglesymrenderer.h"
@@ -2865,9 +2863,27 @@ QString QgsVectorLayer::layerTypeIconPath()
 
 void QgsVectorLayer::refreshLegend()
 {
-  if(mLegendSymbologyGroupParent && m_renderer)
+  if(mLegend && m_renderer)
+    {
+      std::list< std::pair<QString, QIcon*> > itemList;
+      m_renderer->refreshLegend(&itemList);
+      if(m_renderer->needsAttributes()) //create an item for each classification field (only one for most renderers)
+	{
+	  std::list<int> classfieldlist = m_renderer->classificationAttributes();
+	  for(std::list<int>::iterator it = classfieldlist.begin(); it!=classfieldlist.end(); ++it)
+	    {
+	      const QgsField theField = (dataProvider->fields())[*it];
+	      QString classfieldname = theField.name();
+	      itemList.push_front(std::make_pair(classfieldname, (QIcon*)0));
+	    }
+	}
+      mLegend->changeSymbologySettings(getLayerID(), &itemList);
+    }
+
+#if 0
+  if(mLegendLayer && m_renderer)
   {
-    m_renderer->refreshLegend(mLegendSymbologyGroupParent);
+    m_renderer->refreshLegend(mLegendLayer);
   }
 
   //create an item for each classification field (currently only one for all renderers)
@@ -2882,15 +2898,16 @@ void QgsVectorLayer::refreshLegend()
         QString classfieldname = theField.name();
         QgsLegendSymbologyItem* item = new QgsLegendSymbologyItem();
         item->setText(0, classfieldname);
-        mLegendSymbologyGroupParent->insertChild(0, item);
+        static_cast<QTreeWidgetItem*>(mLegendLayer)->insertChild(0, item);
       }
     }
   }
-  if(mLegendSymbologyGroupParent)
+  if(mLegendLayer)
   {
     //copy the symbology changes for the other layers in the same symbology group
-    mLegendSymbologyGroupParent->updateLayerSymbologySettings(this);
+    mLegendLayer->updateLayerSymbologySettings(this);
   }
+#endif
 }
 
 bool QgsVectorLayer::copySymbologySettings(const QgsMapLayer& other)