Scale range supported by symbol in QgsLegendSymbolItemV2

wonder-sk · wonder-sk · commit 54946a44e2ee · 2014-09-01T10:10:35.000+07:00
diff --git a/src/core/qgsmaplayerlegend.cpp b/src/core/qgsmaplayerlegend.cpp
@@ -185,11 +185,10 @@ QList<QgsLayerTreeModelLegendNode*> QgsDefaultVectorLayerLegend::createLayerTree
 
   nodeLayer->setChildrenCheckable( r->legendSymbolItemsCheckable() );
 
-  typedef QPair<QString, QgsSymbolV2*> QgsLegendSymbolItem;
   int k = 0;
-  foreach ( const QgsLegendSymbolItem& i, r->legendSymbolItems() )
+  foreach ( const QgsLegendSymbolItemV2& i, r->legendSymbolItemsV2() )
   {
-    nodes.append( new QgsSymbolV2LegendNode( nodeLayer, i.second, i.first, k++ ) );
+    nodes.append( new QgsSymbolV2LegendNode( nodeLayer, i.symbol, i.label, k++ ) );
   }
   return nodes;
 }
diff --git a/src/core/symbology-ng/qgslegendsymbolitemv2.cpp b/src/core/symbology-ng/qgslegendsymbolitemv2.cpp
@@ -5,21 +5,34 @@
 QgsLegendSymbolItemV2::QgsLegendSymbolItemV2()
   : symbol( 0 )
   , index( -1 )
+  , scaleDenomMin( -1 )
+  , scaleDenomMax( -1 )
 {
 }
 
-QgsLegendSymbolItemV2::~QgsLegendSymbolItemV2()
+QgsLegendSymbolItemV2::QgsLegendSymbolItemV2( QgsSymbolV2* s, const QString& lbl, int idx )
+  : symbol( s )
+  , label( lbl )
+  , index( idx )
+  , scaleDenomMin( -1 )
+  , scaleDenomMax( -1 )
 {
-  delete symbol;
 }
 
 QgsLegendSymbolItemV2::QgsLegendSymbolItemV2( const QgsLegendSymbolItemV2& other )
   : symbol( 0 )
   , index( -1 )
+  , scaleDenomMin( -1 )
+  , scaleDenomMax( -1 )
 {
   *this = other;
 }
 
+QgsLegendSymbolItemV2::~QgsLegendSymbolItemV2()
+{
+  delete symbol;
+}
+
 QgsLegendSymbolItemV2& QgsLegendSymbolItemV2::operator=( const QgsLegendSymbolItemV2& other )
 {
   if ( this == &other )
@@ -29,6 +42,8 @@ QgsLegendSymbolItemV2& QgsLegendSymbolItemV2::operator=( const QgsLegendSymbolIt
   symbol = other.symbol ? other.symbol->clone() : 0;
   label = other.label;
   index = other.index;
+  scaleDenomMin = other.scaleDenomMin;
+  scaleDenomMax = other.scaleDenomMax;
 
   return *this;
 }
diff --git a/src/core/symbology-ng/qgslegendsymbolitemv2.h b/src/core/symbology-ng/qgslegendsymbolitemv2.h
@@ -9,14 +9,21 @@ class QgsLegendSymbolItemV2
 {
 public:
   QgsLegendSymbolItemV2();
+  //! construct item, takes ownership of symbol
+  QgsLegendSymbolItemV2( QgsSymbolV2* s, const QString& lbl, int idx );
   ~QgsLegendSymbolItemV2();
   QgsLegendSymbolItemV2( const QgsLegendSymbolItemV2& other );
   QgsLegendSymbolItemV2& operator=( const QgsLegendSymbolItemV2& other );
 
   QgsSymbolV2* symbol; //!< owned by the struct
   QString label;
   int index;           //!< identifier of the symbol item (within renderer)
-  // TODO: scale range, rule
+
+  // additional data that may be used for filtering
+
+  int scaleDenomMin;
+  int scaleDenomMax;
+  // TODO: QString rule;
 };
 
 
diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp b/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
@@ -366,3 +366,10 @@ QgsLegendSymbolList QgsSingleSymbolRendererV2::legendSymbolItems( double scaleDe
   lst << qMakePair( QString(), mSymbol.data() );
   return lst;
 }
+
+QgsLegendSymbolListV2 QgsSingleSymbolRendererV2::legendSymbolItemsV2() const
+{
+  QgsLegendSymbolListV2 lst;
+  lst << QgsLegendSymbolItemV2( mSymbol.data() ? mSymbol->clone() : 0, QString(), 0 );
+  return lst;
+}
diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.h b/src/core/symbology-ng/qgssinglesymbolrendererv2.h
@@ -82,6 +82,10 @@ class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2
     //! @note not available in python bindings
     virtual QgsLegendSymbolList legendSymbolItems( double scaleDenominator = -1, QString rule = QString() );
 
+    //! Return a list of symbology items for the legend. Better choice than legendSymbolItems().
+    //! @node added in 2.6
+    virtual QgsLegendSymbolListV2 legendSymbolItemsV2() const;
+
   protected:
     QScopedPointer<QgsSymbolV2> mSymbol;
     QScopedPointer<QgsExpression> mRotation;

Original file line number	Diff line number	Diff line change
`@@ -185,11 +185,10 @@ QList<QgsLayerTreeModelLegendNode*> QgsDefaultVectorLayerLegend::createLayerTree`
`185`	`185`
`186`	`186`	`nodeLayer->setChildrenCheckable( r->legendSymbolItemsCheckable() );`
`187`	`187`
`188`		`- typedef QPair<QString, QgsSymbolV2*> QgsLegendSymbolItem;`
`189`	`188`	`int k = 0;`
`190`		`- foreach ( const QgsLegendSymbolItem& i, r->legendSymbolItems() )`
	`189`	`+ foreach ( const QgsLegendSymbolItemV2& i, r->legendSymbolItemsV2() )`
`191`	`190`	`{`
`192`		`- nodes.append( new QgsSymbolV2LegendNode( nodeLayer, i.second, i.first, k++ ) );`
	`191`	`+ nodes.append( new QgsSymbolV2LegendNode( nodeLayer, i.symbol, i.label, k++ ) );`
`193`	`192`	`}`
`194`	`193`	`return nodes;`
`195`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,21 +5,34 @@`
`5`	`5`	`QgsLegendSymbolItemV2::QgsLegendSymbolItemV2()`
`6`	`6`	`: symbol( 0 )`
`7`	`7`	`, index( -1 )`
	`8`	`+ , scaleDenomMin( -1 )`
	`9`	`+ , scaleDenomMax( -1 )`
`8`	`10`	`{`
`9`	`11`	`}`
`10`	`12`
`11`		`-QgsLegendSymbolItemV2::~QgsLegendSymbolItemV2()`
	`13`	`+QgsLegendSymbolItemV2::QgsLegendSymbolItemV2( QgsSymbolV2* s, const QString& lbl, int idx )`
	`14`	`+ : symbol( s )`
	`15`	`+ , label( lbl )`
	`16`	`+ , index( idx )`
	`17`	`+ , scaleDenomMin( -1 )`
	`18`	`+ , scaleDenomMax( -1 )`
`12`	`19`	`{`
`13`		`- delete symbol;`
`14`	`20`	`}`
`15`	`21`
`16`	`22`	`QgsLegendSymbolItemV2::QgsLegendSymbolItemV2( const QgsLegendSymbolItemV2& other )`
`17`	`23`	`: symbol( 0 )`
`18`	`24`	`, index( -1 )`
	`25`	`+ , scaleDenomMin( -1 )`
	`26`	`+ , scaleDenomMax( -1 )`
`19`	`27`	`{`
`20`	`28`	`*this = other;`
`21`	`29`	`}`
`22`	`30`
	`31`	`+QgsLegendSymbolItemV2::~QgsLegendSymbolItemV2()`
	`32`	`+{`
	`33`	`+ delete symbol;`
	`34`	`+}`
	`35`	`+`
`23`	`36`	`QgsLegendSymbolItemV2& QgsLegendSymbolItemV2::operator=( const QgsLegendSymbolItemV2& other )`
`24`	`37`	`{`
`25`	`38`	`if ( this == &other )`
`@@ -29,6 +42,8 @@ QgsLegendSymbolItemV2& QgsLegendSymbolItemV2::operator=( const QgsLegendSymbolIt`
`29`	`42`	`symbol = other.symbol ? other.symbol->clone() : 0;`
`30`	`43`	`label = other.label;`
`31`	`44`	`index = other.index;`
	`45`	`+ scaleDenomMin = other.scaleDenomMin;`
	`46`	`+ scaleDenomMax = other.scaleDenomMax;`
`32`	`47`
`33`	`48`	`return *this;`
`34`	`49`	`}`