Fix symbols drawn multiple times in rule based renderer if symbol

nyalldawson · nyalldawson · commit bd551e8f2bf2 · 2015-11-18T22:08:36.000+11:00
has multiple layers (cherry-picked from a0d7653)
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -449,7 +449,7 @@ void QgsRuleBasedRendererV2::Rule::setNormZLevels( const QMap<int, int>& zLevels
     for ( int i = 0; i < mSymbol->symbolLayerCount(); i++ )
     {
       int normLevel = zLevelsToNormLevels.value( mSymbol->symbolLayer( i )->renderingPass() );
-      mSymbolNormZLevels.append( normLevel );
+      mSymbolNormZLevels.insert( normLevel );
     }
   }
 
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h
@@ -200,7 +200,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
         // temporary
         QgsExpression* mFilter;
         // temporary while rendering
-        QList<int> mSymbolNormZLevels;
+        QSet<int> mSymbolNormZLevels;
         RuleList mActiveChildren;
     };
 

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ void QgsRuleBasedRendererV2::Rule::setNormZLevels( const QMap<int, int>& zLevels`
`449`	`449`	`for ( int i = 0; i < mSymbol->symbolLayerCount(); i++ )`
`450`	`450`	`{`
`451`	`451`	`int normLevel = zLevelsToNormLevels.value( mSymbol->symbolLayer( i )->renderingPass() );`
`452`		`- mSymbolNormZLevels.append( normLevel );`
	`452`	`+ mSymbolNormZLevels.insert( normLevel );`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`