Skip to content

Commit

Permalink
[FEATURE] Labels for rules in rule-based renderers and some other goo…
Browse files Browse the repository at this point in the history 
…dies.

Applied patch #3222 from Mayeul Kauffmann with various modifications.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15217 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Feb 20, 2011
1 parent cf9ae27 commit 4b29b80
Show file tree
Hide file tree
Showing 6 changed files with 229 additions and 65 deletions.
34 changes: 22 additions & 12 deletions src/core/symbology-ng/qgsrulebasedrendererv2.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
***************************************************************************/ ***************************************************************************/


#include "qgsrulebasedrendererv2.h" #include "qgsrulebasedrendererv2.h"

#include "qgssymbollayerv2.h"
#include "qgssearchtreenode.h" #include "qgssearchtreenode.h"
#include "qgssymbollayerv2utils.h" #include "qgssymbollayerv2utils.h"
#include "qgsrendercontext.h" #include "qgsrendercontext.h"
Expand All @@ -28,10 +28,10 @@






QgsRuleBasedRendererV2::Rule::Rule( QgsSymbolV2* symbol, int scaleMinDenom, int scaleMaxDenom, QString filterExp ) QgsRuleBasedRendererV2::Rule::Rule( QgsSymbolV2* symbol, int scaleMinDenom, int scaleMaxDenom, QString filterExp, QString label, QString description )
: mSymbol( symbol ), : mSymbol( symbol ),
mScaleMinDenom( scaleMinDenom ), mScaleMaxDenom( scaleMaxDenom ), mScaleMinDenom( scaleMinDenom ), mScaleMaxDenom( scaleMaxDenom ),
mFilterExp( filterExp ) mFilterExp( filterExp ), mLabel( label ), mDescription( description )
{ {
initFilter(); initFilter();
} }
Expand Down Expand Up @@ -62,8 +62,8 @@ void QgsRuleBasedRendererV2::Rule::initFilter()


QString QgsRuleBasedRendererV2::Rule::dump() const QString QgsRuleBasedRendererV2::Rule::dump() const
{ {
return QString( "RULE - scale [%1,%2] - filter %3 - symbol %4" ) return QString( "RULE %1 - scale [%2,%3] - filter %4 - symbol %5" )
.arg( mScaleMinDenom ).arg( mScaleMaxDenom ) .arg( mLabel ).arg( mScaleMinDenom ).arg( mScaleMaxDenom )
.arg( mFilterExp ).arg( mSymbol->dump() ); .arg( mFilterExp ).arg( mSymbol->dump() );


} }
Expand Down Expand Up @@ -107,6 +107,8 @@ QgsRuleBasedRendererV2::Rule& QgsRuleBasedRendererV2::Rule::operator=( const Qgs
mScaleMinDenom = other.mScaleMinDenom; mScaleMinDenom = other.mScaleMinDenom;
mScaleMaxDenom = other.mScaleMaxDenom; mScaleMaxDenom = other.mScaleMaxDenom;
mFilterExp = other.mFilterExp; mFilterExp = other.mFilterExp;
mLabel = other.mLabel;
mDescription = other.mDescription;
initFilter(); initFilter();
} }
return *this; return *this;
Expand Down Expand Up @@ -233,6 +235,8 @@ QDomElement QgsRuleBasedRendererV2::save( QDomDocument& doc )
ruleElem.setAttribute( "filter", rule.filterExpression() ); ruleElem.setAttribute( "filter", rule.filterExpression() );
ruleElem.setAttribute( "scalemindenom", rule.scaleMinDenom() ); ruleElem.setAttribute( "scalemindenom", rule.scaleMinDenom() );
ruleElem.setAttribute( "scalemaxdenom", rule.scaleMaxDenom() ); ruleElem.setAttribute( "scalemaxdenom", rule.scaleMaxDenom() );
ruleElem.setAttribute( "label", rule.label() );
ruleElem.setAttribute( "description", rule.description() );
rulesElem.appendChild( ruleElem ); rulesElem.appendChild( ruleElem );
} }
rendererElem.appendChild( rulesElem ); rendererElem.appendChild( rulesElem );
Expand All @@ -250,7 +254,7 @@ QgsLegendSymbologyList QgsRuleBasedRendererV2::legendSymbologyItems( QSize iconS
for ( QList<Rule>::iterator it = mRules.begin(); it != mRules.end(); ++it ) for ( QList<Rule>::iterator it = mRules.begin(); it != mRules.end(); ++it )
{ {
QPixmap pix = QgsSymbolLayerV2Utils::symbolPreviewPixmap( it->symbol(), iconSize ); QPixmap pix = QgsSymbolLayerV2Utils::symbolPreviewPixmap( it->symbol(), iconSize );
lst << qMakePair( it->filterExpression(), pix ); lst << qMakePair( it->label(), pix );
} }
return lst; return lst;
} }
Expand All @@ -260,7 +264,7 @@ QgsLegendSymbolList QgsRuleBasedRendererV2::legendSymbolItems()
QgsLegendSymbolList lst; QgsLegendSymbolList lst;
for ( QList<Rule>::iterator it = mRules.begin(); it != mRules.end(); ++it ) for ( QList<Rule>::iterator it = mRules.begin(); it != mRules.end(); ++it )
{ {
lst << qMakePair( it->filterExpression(), it->symbol() ); lst << qMakePair( it->label(), it->symbol() );
} }
return lst; return lst;
} }
Expand Down Expand Up @@ -292,9 +296,11 @@ QgsFeatureRendererV2* QgsRuleBasedRendererV2::create( QDomElement& element )
if ( symbolMap.contains( symbolIdx ) ) if ( symbolMap.contains( symbolIdx ) )
{ {
QString filterExp = ruleElem.attribute( "filter" ); QString filterExp = ruleElem.attribute( "filter" );
QString label = ruleElem.attribute( "label" );
QString description = ruleElem.attribute( "description" );
int scaleMinDenom = ruleElem.attribute( "scalemindenom", "0" ).toInt(); int scaleMinDenom = ruleElem.attribute( "scalemindenom", "0" ).toInt();
int scaleMaxDenom = ruleElem.attribute( "scalemaxdenom", "0" ).toInt(); int scaleMaxDenom = ruleElem.attribute( "scalemaxdenom", "0" ).toInt();
r->mRules.append( Rule( symbolMap.take( symbolIdx ), scaleMinDenom, scaleMaxDenom, filterExp ) ); r->mRules.append( Rule( symbolMap.take( symbolIdx ), scaleMinDenom, scaleMaxDenom, filterExp, label, description ) );
} }
else else
{ {
Expand Down Expand Up @@ -350,11 +356,13 @@ QList<QgsRuleBasedRendererV2::Rule> QgsRuleBasedRendererV2::refineRuleCategories
{ {
QString newfilter = QString( "%1 = '%2'" ).arg( r->classAttribute() ).arg( cat.value().toString() ); QString newfilter = QString( "%1 = '%2'" ).arg( r->classAttribute() ).arg( cat.value().toString() );
QString filter = initialRule.filterExpression(); QString filter = initialRule.filterExpression();
QString label = initialRule.label();
QString description = initialRule.description();
if ( filter.isEmpty() ) if ( filter.isEmpty() )
filter = newfilter; filter = newfilter;
else else
filter = QString( "(%1) AND (%2)" ).arg( filter ).arg( newfilter ); filter = QString( "(%1) AND (%2)" ).arg( filter ).arg( newfilter );
rules.append( Rule( cat.symbol()->clone(), initialRule.scaleMinDenom(), initialRule.scaleMaxDenom(), filter ) ); rules.append( Rule( cat.symbol()->clone(), initialRule.scaleMinDenom(), initialRule.scaleMaxDenom(), filter, initialRule.label(), initialRule.description() ) );
} }
return rules; return rules;
} }
Expand All @@ -366,11 +374,13 @@ QList<QgsRuleBasedRendererV2::Rule> QgsRuleBasedRendererV2::refineRuleRanges( Qg
{ {
QString newfilter = QString( "%1 >= '%2' AND %1 <= '%3'" ).arg( r->classAttribute() ).arg( rng.lowerValue() ).arg( rng.upperValue() ); QString newfilter = QString( "%1 >= '%2' AND %1 <= '%3'" ).arg( r->classAttribute() ).arg( rng.lowerValue() ).arg( rng.upperValue() );
QString filter = initialRule.filterExpression(); QString filter = initialRule.filterExpression();
QString label = initialRule.label();
QString description = initialRule.description();
if ( filter.isEmpty() ) if ( filter.isEmpty() )
filter = newfilter; filter = newfilter;
else else
filter = QString( "(%1) AND (%2)" ).arg( filter ).arg( newfilter ); filter = QString( "(%1) AND (%2)" ).arg( filter ).arg( newfilter );
rules.append( Rule( rng.symbol()->clone(), initialRule.scaleMinDenom(), initialRule.scaleMaxDenom(), filter ) ); rules.append( Rule( rng.symbol()->clone(), initialRule.scaleMinDenom(), initialRule.scaleMaxDenom(), filter, initialRule.label(), initialRule.description() ) );
} }
return rules; return rules;
} }
Expand All @@ -387,10 +397,10 @@ QList<QgsRuleBasedRendererV2::Rule> QgsRuleBasedRendererV2::refineRuleScales( Qg
continue; // jump over the first scales out of the interval continue; // jump over the first scales out of the interval
if ( maxDenom != 0 && maxDenom <= scale ) if ( maxDenom != 0 && maxDenom <= scale )
break; // ignore the latter scales out of the interval break; // ignore the latter scales out of the interval
rules.append( Rule( initialRule.symbol()->clone(), oldScale, scale, initialRule.filterExpression() ) ); rules.append( Rule( initialRule.symbol()->clone(), oldScale, scale, initialRule.filterExpression(), initialRule.label(), initialRule.description() ) );
oldScale = scale; oldScale = scale;
} }
// last rule // last rule
rules.append( Rule( initialRule.symbol()->clone(), oldScale, maxDenom, initialRule.filterExpression() ) ); rules.append( Rule( initialRule.symbol()->clone(), oldScale, maxDenom, initialRule.filterExpression(), initialRule.label(), initialRule.description() ) );
return rules; return rules;
} }
10 changes: 7 additions & 3 deletions src/core/symbology-ng/qgsrulebasedrendererv2.h
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
{ {
public: public:
//! Constructor takes ownership of the symbol //! Constructor takes ownership of the symbol
Rule( QgsSymbolV2* symbol, int scaleMinDenom = 0, int scaleMaxDenom = 0, QString filterExp = QString() ); Rule( QgsSymbolV2* symbol, int scaleMinDenom = 0, int scaleMaxDenom = 0, QString filterExp = QString(), QString label = QString(), QString description = QString() );
Rule( const Rule& other ); Rule( const Rule& other );
~Rule(); ~Rule();
QString dump() const; QString dump() const;
Expand All @@ -57,10 +57,14 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
int scaleMinDenom() const { return mScaleMinDenom; } int scaleMinDenom() const { return mScaleMinDenom; }
int scaleMaxDenom() const { return mScaleMaxDenom; } int scaleMaxDenom() const { return mScaleMaxDenom; }
QString filterExpression() const { return mFilterExp; } QString filterExpression() const { return mFilterExp; }
QString label() const { return mLabel; }
QString description() const { return mDescription; }


void setScaleMinDenom( int scaleMinDenom ) { mScaleMinDenom = scaleMinDenom; } void setScaleMinDenom( int scaleMinDenom ) { mScaleMinDenom = scaleMinDenom; }
void setScaleMaxDenom( int scaleMaxDenom ) { mScaleMaxDenom = scaleMaxDenom; } void setScaleMaxDenom( int scaleMaxDenom ) { mScaleMaxDenom = scaleMaxDenom; }
void setFilterExpression( QString filterExp ) { mFilterExp = filterExp; initFilter(); } void setFilterExpression( QString filterExp ) { mFilterExp = filterExp; initFilter(); }
void setLabel( QString label ) { mLabel = label; }
void setDescription( QString description ) { mDescription = description; }


Rule& operator=( const Rule& other ); Rule& operator=( const Rule& other );


Expand All @@ -70,7 +74,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2


QgsSymbolV2* mSymbol; QgsSymbolV2* mSymbol;
int mScaleMinDenom, mScaleMaxDenom; int mScaleMinDenom, mScaleMaxDenom;
QString mFilterExp; QString mFilterExp, mLabel, mDescription;


// temporary // temporary
QgsSearchString mFilterParsed; QgsSearchString mFilterParsed;
Expand All @@ -81,7 +85,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2


static QgsFeatureRendererV2* create( QDomElement& element ); static QgsFeatureRendererV2* create( QDomElement& element );


//! Constructor. Takes ownership of the defult symbol. //! Constructor. Takes ownership of the default symbol.
QgsRuleBasedRendererV2( QgsSymbolV2* defaultSymbol ); QgsRuleBasedRendererV2( QgsSymbolV2* defaultSymbol );


//! return symbol for current feature. Should not be used individually: there could be more symbols for a feature //! return symbol for current feature. Should not be used individually: there could be more symbols for a feature
Expand Down
Loading

0 comments on commit 4b29b80

Please sign in to comment.