Followup 43f150d, don't show diagram warnings if diagrams disabled

nyalldawson · nyalldawson · commit c34f035cf667 · 2015-04-10T06:40:53.000+10:00
(fix #12532)
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -521,11 +521,13 @@ void QgsDiagramProperties::apply()
   QSettings().setValue( "/Windows/VectorLayerProperties/diagram/tab",
                         mDiagramPropertiesTabWidget->currentIndex() );
 
+  bool diagramsEnabled = mDisplayDiagramsGroupBox->isChecked();
+
   QgsDiagram* diagram = 0;
   int index = mDiagramTypeComboBox->currentIndex();
   QString diagramType = mDiagramTypeComboBox->itemData( index ).toString();
 
-  if ( 0 == mDiagramAttributesTreeWidget->topLevelItemCount() )
+  if ( diagramsEnabled && 0 == mDiagramAttributesTreeWidget->topLevelItemCount() )
   {
     QgisApp::instance()->messageBar()->pushMessage(
       tr( "Diagrams: No attributes added." ),
@@ -568,7 +570,7 @@ void QgsDiagramProperties::apply()
       }
     }
 
-    if ( maxVal != DBL_MIN )
+    if ( diagramsEnabled && maxVal != DBL_MIN )
     {
       QgisApp::instance()->messageBar()->pushMessage(
         tr( "Interpolation value" ),

Original file line number	Diff line number	Diff line change
`@@ -521,11 +521,13 @@ void QgsDiagramProperties::apply()`
`521`	`521`	`QSettings().setValue( "/Windows/VectorLayerProperties/diagram/tab",`
`522`	`522`	`mDiagramPropertiesTabWidget->currentIndex() );`
`523`	`523`
	`524`	`+ bool diagramsEnabled = mDisplayDiagramsGroupBox->isChecked();`
	`525`	`+`
`524`	`526`	`QgsDiagram* diagram = 0;`
`525`	`527`	`int index = mDiagramTypeComboBox->currentIndex();`
`526`	`528`	`QString diagramType = mDiagramTypeComboBox->itemData( index ).toString();`
`527`	`529`
`528`		`- if ( 0 == mDiagramAttributesTreeWidget->topLevelItemCount() )`
	`530`	`+ if ( diagramsEnabled && 0 == mDiagramAttributesTreeWidget->topLevelItemCount() )`
`529`	`531`	`{`
`530`	`532`	`QgisApp::instance()->messageBar()->pushMessage(`
`531`	`533`	`tr( "Diagrams: No attributes added." ),`
`@@ -568,7 +570,7 @@ void QgsDiagramProperties::apply()`
`568`	`570`	`}`
`569`	`571`	`}`
`570`	`572`
`571`		`- if ( maxVal != DBL_MIN )`
	`573`	`+ if ( diagramsEnabled && maxVal != DBL_MIN )`
`572`	`574`	`{`
`573`	`575`	`QgisApp::instance()->messageBar()->pushMessage(`
`574`	`576`	`tr( "Interpolation value" ),`