Save scale by area/diameter setting

m-kuhn · m-kuhn · commit e0e5f1a9531f · 2012-08-10T14:44:07.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1810,6 +1810,15 @@ void QgsVectorLayerProperties::initDiagramTab()
       mIncreaseSmallDiagramsCheckBox->setChecked( settingList.at( 0 ).minimumSize != 0 );
       mIncreaseMinimumSizeSpinBox->setValue( settingList.at( 0 ).minimumSize );
 
+      if ( settingList.at( 0 ).scaleByArea )
+      {
+        mScaleDependencyComboBox->setCurrentIndex( 0 );
+      }
+      else
+      {
+        mScaleDependencyComboBox->setCurrentIndex( 1 );
+      }
+
       QList< QColor > categoryColors = settingList.at( 0 ).categoryColors;
       QList< int > categoryIndices = settingList.at( 0 ).categoryIndices;
       QList< int >::const_iterator catIt = categoryIndices.constBegin();
diff --git a/src/core/qgsdiagramrendererv2.cpp b/src/core/qgsdiagramrendererv2.cpp
@@ -95,6 +95,16 @@ void QgsDiagramSettings::readXML( const QDomElement& elem )
     diagramOrientation = Up;
   }
 
+  // scale dependency
+  if ( elem.attribute( "scaleDependency" ) == "Diameter" )
+  {
+    scaleByArea = false;
+  }
+  else
+  {
+    scaleByArea = true;
+  }
+
   barWidth = elem.attribute( "barWidth" ).toDouble();
 
   minimumSize = elem.attribute( "minimumSize" ).toDouble();
@@ -144,11 +154,20 @@ void QgsDiagramSettings::writeXML( QDomElement& rendererElem, QDomDocument& doc
   // label placement method (text diagram)
   if ( labelPlacementMethod == Height )
   {
-   categoryElem.setAttribute( "labelPlacementMethod", "Height" );
+    categoryElem.setAttribute( "labelPlacementMethod", "Height" );
+  }
+  else
+  {
+    categoryElem.setAttribute( "labelPlacementMethod", "XHeight" );
+  }
+
+  if ( scaleByArea )
+  {
+    categoryElem.setAttribute( "scaleDependency", "Area" );
   }
   else
   {
-   categoryElem.setAttribute( "labelPlacementMethod", "XHeight" );
+    categoryElem.setAttribute( "scaleDependency", "Diameter" );
   }
 
   // orientation (histogram)
