Applied part of #2832 (show rules in legend).

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14404 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 18, 2010 · b1c0053 · b1c0053
1 parent 80b5759
commit b1c0053
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/python/core/symbology-ng-core.sip b/python/core/symbology-ng-core.sip
@@ -448,6 +448,9 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
     //! store renderer info to XML element
     virtual QDomElement save( QDomDocument& doc );
 
+    //! return a list of symbology items for the legend 
+    virtual QgsLegendSymbologyList legendSymbologyItems( QSize iconSize ); 
+
     /////
 
     //! return the total number of rules

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -244,6 +244,28 @@ QDomElement QgsRuleBasedRendererV2::save( QDomDocument& doc )
 }
 
 
+QgsLegendSymbologyList QgsRuleBasedRendererV2::legendSymbologyItems( QSize iconSize )
+{
+  QgsLegendSymbologyList lst;
+  for ( QList<Rule>::iterator it = mRules.begin(); it != mRules.end(); ++it )
+  {
+    QPixmap pix = QgsSymbolLayerV2Utils::symbolPreviewPixmap( it->symbol(), iconSize );
+    lst << qMakePair( it->filterExpression(), pix );
+  }
+  return lst;
+}
+
+QgsLegendSymbolList QgsRuleBasedRendererV2::legendSymbolItems()
+{
+  QgsLegendSymbolList lst;
+  for ( QList<Rule>::iterator it = mRules.begin(); it != mRules.end(); ++it )
+  {
+    lst << qMakePair( it->filterExpression(), it->symbol() );
+  }
+  return lst;
+}
+
+
 QgsFeatureRendererV2* QgsRuleBasedRendererV2::create( QDomElement& element )
 {
   // load symbols

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h
@@ -102,6 +102,13 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
     //! store renderer info to XML element
     virtual QDomElement save( QDomDocument& doc );
 
+    //! return a list of symbology items for the legend
+    virtual QgsLegendSymbologyList legendSymbologyItems( QSize iconSize );
+
+    //! return a list of item text / symbol
+    //! @note: this method was added in version 1.5
+    virtual QgsLegendSymbolList legendSymbolItems();
+
     /////
 
     //! return the total number of rules