Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[rule-based renderer] keep rendering order from other renderers #3269

Merged
merged 1 commit into from
Jul 4, 2016
Merged

[rule-based renderer] keep rendering order from other renderers #3269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/core/symbology-ng/qgsrulebasedrendererv2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,9 +1235,10 @@ QSet< QString > QgsRuleBasedRendererV2::legendKeysForFeature( QgsFeature& featur

QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFeatureRendererV2* renderer )
{
QgsRuleBasedRendererV2* r = nullptr;
if ( renderer->type() == "RuleRenderer" )
{
return dynamic_cast<QgsRuleBasedRendererV2*>( renderer->clone() );
r = dynamic_cast<QgsRuleBasedRendererV2*>( renderer->clone() );
}

if ( renderer->type() == "singleSymbol" )
Expand All @@ -1248,7 +1249,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe

QgsSymbolV2* origSymbol = singleSymbolRenderer->symbol()->clone();
convertToDataDefinedSymbology( origSymbol, singleSymbolRenderer->sizeScaleField() );
return new QgsRuleBasedRendererV2( origSymbol );
r = new QgsRuleBasedRendererV2( origSymbol );
}

if ( renderer->type() == "categorizedSymbol" )
Expand Down Expand Up @@ -1312,7 +1313,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe
rootrule->appendChild( rule );
}

return new QgsRuleBasedRendererV2( rootrule );
r = new QgsRuleBasedRendererV2( rootrule );
}

if ( renderer->type() == "graduatedSymbol" )
Expand Down Expand Up @@ -1369,23 +1370,29 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe
rootrule->appendChild( rule );
}

return new QgsRuleBasedRendererV2( rootrule );
r = new QgsRuleBasedRendererV2( rootrule );
}

if ( renderer->type() == "pointDisplacement" )
{
const QgsPointDisplacementRenderer* pointDisplacementRenderer = dynamic_cast<const QgsPointDisplacementRenderer*>( renderer );
if ( pointDisplacementRenderer )
return convertFromRenderer( pointDisplacementRenderer->embeddedRenderer() );
r = convertFromRenderer( pointDisplacementRenderer->embeddedRenderer() );
}
if ( renderer->type() == "invertedPolygonRenderer" )
{
const QgsInvertedPolygonRenderer* invertedPolygonRenderer = dynamic_cast<const QgsInvertedPolygonRenderer*>( renderer );
if ( invertedPolygonRenderer )
return convertFromRenderer( invertedPolygonRenderer->embeddedRenderer() );
r = convertFromRenderer( invertedPolygonRenderer->embeddedRenderer() );
}

return nullptr;
if ( r )
{
r->setOrderBy( renderer->orderBy() );
r->setOrderByEnabled( renderer->orderByEnabled() );
}

return r;
}

void QgsRuleBasedRendererV2::convertToDataDefinedSymbology( QgsSymbolV2* symbol, const QString& sizeScaleField, const QString& rotationField )
Expand Down