categorized renderer: also setup symbol render context for hashed symbols

jef-n · jef-n · commit b46a172f6674 · 2016-09-28T15:26:20.000+02:00
(cherry picked from commit c7c5244)
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -159,9 +159,9 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( const QString& a
   //trigger a detachment and copy of mCategories BUT that same method CAN be used to modify a symbol in place
   Q_FOREACH ( const QgsRendererCategoryV2& cat, categories )
   {
-    if ( cat.symbol() )
+    if ( !cat.symbol() )
     {
-      QgsDebugMsg( "invalid symbol in a category! ignoring..." );
+      QgsDebugMsg( QString( "invalid symbol in category %1 (%2)! ignoring..." ).arg( cat.value().toString(), cat.label() ) );
     }
     mCategories << cat;
   }
@@ -442,6 +442,12 @@ void QgsCategorizedSymbolRendererV2::startRender( QgsRenderContext& context, con
       mTempSymbols[ cat.symbol()] = tempSymbol;
     }
   }
+
+  Q_FOREACH ( QgsSymbolV2 *symbol, mSymbolHash.values() )
+  {
+    symbol->startRender( context, &fields );
+  }
+
   return;
 }
 
@@ -452,6 +458,11 @@ void QgsCategorizedSymbolRendererV2::stopRender( QgsRenderContext& context )
     cat.symbol()->stopRender( context );
   }
 
+  Q_FOREACH ( QgsSymbolV2 *symbol, mSymbolHash.values() )
+  {
+    symbol->stopRender( context );
+  }
+
   // cleanup mTempSymbols
   QHash<QgsSymbolV2*, QgsSymbolV2*>::const_iterator it2 = mTempSymbols.constBegin();
   for ( ; it2 != mTempSymbols.constEnd(); ++it2 )

Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,9 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( const QString& a`
`159`	`159`	`//trigger a detachment and copy of mCategories BUT that same method CAN be used to modify a symbol in place`
`160`	`160`	`Q_FOREACH ( const QgsRendererCategoryV2& cat, categories )`
`161`	`161`	`{`
`162`		`- if ( cat.symbol() )`
	`162`	`+ if ( !cat.symbol() )`
`163`	`163`	`{`
`164`		`- QgsDebugMsg( "invalid symbol in a category! ignoring..." );`
	`164`	`+ QgsDebugMsg( QString( "invalid symbol in category %1 (%2)! ignoring..." ).arg( cat.value().toString(), cat.label() ) );`
`165`	`165`	`}`
`166`	`166`	`mCategories << cat;`
`167`	`167`	`}`
`@@ -442,6 +442,12 @@ void QgsCategorizedSymbolRendererV2::startRender( QgsRenderContext& context, con`
`442`	`442`	`mTempSymbols[ cat.symbol()] = tempSymbol;`
`443`	`443`	`}`
`444`	`444`	`}`
	`445`	`+`
	`446`	`+ Q_FOREACH ( QgsSymbolV2 *symbol, mSymbolHash.values() )`
	`447`	`+ {`
	`448`	`+ symbol->startRender( context, &fields );`
	`449`	`+ }`
	`450`	`+`
`445`	`451`	`return;`
`446`	`452`	`}`
`447`	`453`
`@@ -452,6 +458,11 @@ void QgsCategorizedSymbolRendererV2::stopRender( QgsRenderContext& context )`
`452`	`458`	`cat.symbol()->stopRender( context );`
`453`	`459`	`}`
`454`	`460`
	`461`	`+ Q_FOREACH ( QgsSymbolV2 *symbol, mSymbolHash.values() )`
	`462`	`+ {`
	`463`	`+ symbol->stopRender( context );`
	`464`	`+ }`
	`465`	`+`
`455`	`466`	`// cleanup mTempSymbols`
`456`	`467`	`QHash<QgsSymbolV2, QgsSymbolV2>::const_iterator it2 = mTempSymbols.constBegin();`
`457`	`468`	`for ( ; it2 != mTempSymbols.constEnd(); ++it2 )`