Added vlayer in startRender calls of renderer classes

qgis · Nov 1, 2011 · c7f98f2 · c7f98f2
1 parent 96496c5
commit c7f98f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -252,14 +252,14 @@ void QgsCategorizedSymbolRendererV2::startRender( QgsRenderContext& context, con
   QgsCategoryList::iterator it = mCategories.begin();
   for ( ; it != mCategories.end(); ++it )
   {
-    it->symbol()->startRender( context );
+    it->symbol()->startRender( context, vlayer );
 
     if ( mRotationFieldIdx != -1 || mSizeScaleFieldIdx != -1 )
     {
       QgsSymbolV2* tempSymbol = it->symbol()->clone();
       tempSymbol->setRenderHints(( mRotationFieldIdx != -1 ? QgsSymbolV2::DataDefinedRotation : 0 ) |
                                  ( mSizeScaleFieldIdx != -1 ? QgsSymbolV2::DataDefinedSizeScale : 0 ) );
-      tempSymbol->startRender( context );
+      tempSymbol->startRender( context, vlayer );
       mTempSymbols[ it->value().toString()] = tempSymbol;
     }
   }

diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -183,14 +183,14 @@ void QgsGraduatedSymbolRendererV2::startRender( QgsRenderContext& context, const
   QgsRangeList::iterator it = mRanges.begin();
   for ( ; it != mRanges.end(); ++it )
   {
-    it->symbol()->startRender( context );
+    it->symbol()->startRender( context, vlayer );
 
     if ( mRotationFieldIdx != -1 || mSizeScaleFieldIdx != -1 )
     {
       QgsSymbolV2* tempSymbol = it->symbol()->clone();
       tempSymbol->setRenderHints(( mRotationFieldIdx != -1 ? QgsSymbolV2::DataDefinedRotation : 0 ) |
                                  ( mSizeScaleFieldIdx != -1 ? QgsSymbolV2::DataDefinedSizeScale : 0 ) );
-      tempSymbol->startRender( context );
+      tempSymbol->startRender( context, vlayer );
       mTempSymbols[ it->symbol()] = tempSymbol;
     }
   }

diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -184,7 +184,7 @@ void QgsRuleBasedRendererV2::startRender( QgsRenderContext& context, const QgsVe
     QgsExpression* exp = rule->filter();
     if ( exp )
       exp->prepare( pendingFields );
-    rule->symbol()->startRender( context );
+    rule->symbol()->startRender( context, vlayer );
   }
 }