Fix diagrams not initially showing when toggling on/off layers

nyalldawson · nyalldawson · commit 134067716d6d · 2015-04-09T17:50:18.000+10:00
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -427,6 +427,12 @@ class QgsVectorLayer : QgsMapLayer
     /** Returns the bounding box of the selected features. If there is no selection, QgsRectangle(0,0,0,0) is returned */
     QgsRectangle boundingBoxOfSelected();
 
+    /** Returns whether the layer contains diagrams which are enabled and should be drawn.
+     * @return true if layer contains enabled diagrams
+     * @note added in QGIS 2.9
+     */
+    bool diagramsEnabled() const;
+
     /** Sets diagram rendering object (takes ownership) */
     void setDiagramRenderer( QgsDiagramRendererV2* r /Transfer/ );
     const QgsDiagramRendererV2* diagramRenderer() const;
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9157,7 +9157,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
   {
     QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( it.value() );
     if ( !vlayer || !vlayer->isEditable() ||
-         ( !vlayer->diagramRenderer() && vlayer->customProperty( "labeling" ).toString() != QString( "pal" ) ) )
+         ( !vlayer->diagramsEnabled() && vlayer->customProperty( "labeling" ).toString() != QString( "pal" ) ) )
       continue;
 
     int colX, colY, colShow, colAng;
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3152,7 +3152,8 @@ bool QgsPalLabeling::staticWillUseLayer( QgsVectorLayer* layer )
   // don't do QgsPalLayerSettings::readFromLayer( layer ) if not needed
   bool enabled = false;
   if ( layer->customProperty( "labeling" ).toString() == QString( "pal" ) )
-    enabled = layer->customProperty( "labeling/enabled", QVariant( false ) ).toBool();
+    enabled = layer->customProperty( "labeling/enabled", QVariant( false ) ).toBool()
+              || layer->diagramsEnabled();
 
   return enabled;
 }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -711,6 +711,11 @@ QgsRectangle QgsVectorLayer::boundingBoxOfSelected()
   return retval;
 }
 
+bool QgsVectorLayer::diagramsEnabled() const
+{
+  return mDiagramRenderer && mDiagramLayerSettings;
+}
+
 long QgsVectorLayer::featureCount() const
 {
   if ( !mDataProvider )
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -789,6 +789,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Returns the bounding box of the selected features. If there is no selection, QgsRectangle(0,0,0,0) is returned */
     QgsRectangle boundingBoxOfSelected();
 
+    /** Returns whether the layer contains diagrams which are enabled and should be drawn.
+     * @return true if layer contains enabled diagrams
+     * @note added in QGIS 2.9
+     */
+    bool diagramsEnabled() const;
+
     /** Sets diagram rendering object (takes ownership) */
     void setDiagramRenderer( QgsDiagramRendererV2* r );
     const QgsDiagramRendererV2* diagramRenderer() const { return mDiagramRenderer; }
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -489,7 +489,7 @@ void QgsVectorLayerRenderer::prepareDiagrams( QgsVectorLayer* layer, QStringList
   if ( !mContext.labelingEngine() )
     return;
 
-  if ( !layer->diagramRenderer() || !layer->diagramLayerSettings() )
+  if ( !layer->diagramsEnabled() )
     return;
 
   mDiagrams = true;

Original file line number	Diff line number	Diff line change
`@@ -9157,7 +9157,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`9157`	`9157`	`{`
`9158`	`9158`	`QgsVectorLayer vlayer = qobject_cast<QgsVectorLayer >( it.value() );`
`9159`	`9159`	`if ( !vlayer \|\| !vlayer->isEditable() \|\|`
`9160`		`- ( !vlayer->diagramRenderer() && vlayer->customProperty( "labeling" ).toString() != QString( "pal" ) ) )`
	`9160`	`+ ( !vlayer->diagramsEnabled() && vlayer->customProperty( "labeling" ).toString() != QString( "pal" ) ) )`
`9161`	`9161`	`continue;`
`9162`	`9162`
`9163`	`9163`	`int colX, colY, colShow, colAng;`
Original file line number	Diff line number	Diff line change
`@@ -3152,7 +3152,8 @@ bool QgsPalLabeling::staticWillUseLayer( QgsVectorLayer* layer )`
`3152`	`3152`	`// don't do QgsPalLayerSettings::readFromLayer( layer ) if not needed`
`3153`	`3153`	`bool enabled = false;`
`3154`	`3154`	`if ( layer->customProperty( "labeling" ).toString() == QString( "pal" ) )`
`3155`		`- enabled = layer->customProperty( "labeling/enabled", QVariant( false ) ).toBool();`
	`3155`	`+ enabled = layer->customProperty( "labeling/enabled", QVariant( false ) ).toBool()`
	`3156`	`+ \|\| layer->diagramsEnabled();`
`3156`	`3157`
`3157`	`3158`	`return enabled;`
`3158`	`3159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -711,6 +711,11 @@ QgsRectangle QgsVectorLayer::boundingBoxOfSelected()`
`711`	`711`	`return retval;`
`712`	`712`	`}`
`713`	`713`
	`714`	`+bool QgsVectorLayer::diagramsEnabled() const`
	`715`	`+{`
	`716`	`+ return mDiagramRenderer && mDiagramLayerSettings;`
	`717`	`+}`
	`718`	`+`
`714`	`719`	`long QgsVectorLayer::featureCount() const`
`715`	`720`	`{`
`716`	`721`	`if ( !mDataProvider )`