fix bug in max value on joined fields

vmora · vmora · commit 80b44a768545 · 2014-01-16T13:02:44.000+01:00
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -445,8 +445,7 @@ void QgsDiagramProperties::on_mFindMaximumValueButton_clicked()
   //get maximum value from provider (ignoring not-commited edits)
   if ( mLayer )
   {
-    QgsVectorDataProvider* provider = mLayer->dataProvider();
-    if ( provider )
+    // condition removed, keep this useless scope to avoid screewing diff (easier to review)
     {
       float maxValue = 0;
       if ( mSizeAttributeComboBox->currentIndex() >= mAvailableAttributes )
@@ -469,7 +468,7 @@ void QgsDiagramProperties::on_mFindMaximumValueButton_clicked()
       }
       else
       {
-        maxValue = provider->maximumValue( mSizeAttributeComboBox->itemData( mSizeAttributeComboBox->currentIndex() ).toInt() ).toFloat();
+        maxValue = mLayer->maximumValue( mSizeAttributeComboBox->itemData( mSizeAttributeComboBox->currentIndex() ).toInt() ).toFloat();
       }
       mValueLineEdit->setText( QString( "%1" ).arg( maxValue ) );
     }

Original file line number	Diff line number	Diff line change
`@@ -445,8 +445,7 @@ void QgsDiagramProperties::on_mFindMaximumValueButton_clicked()`
`445`	`445`	`//get maximum value from provider (ignoring not-commited edits)`
`446`	`446`	`if ( mLayer )`
`447`	`447`	`{`
`448`		`- QgsVectorDataProvider* provider = mLayer->dataProvider();`
`449`		`- if ( provider )`
	`448`	`+ // condition removed, keep this useless scope to avoid screewing diff (easier to review)`
`450`	`449`	`{`
`451`	`450`	`float maxValue = 0;`
`452`	`451`	`if ( mSizeAttributeComboBox->currentIndex() >= mAvailableAttributes )`
`@@ -469,7 +468,7 @@ void QgsDiagramProperties::on_mFindMaximumValueButton_clicked()`
`469`	`468`	`}`
`470`	`469`	`else`
`471`	`470`	`{`
`472`		`- maxValue = provider->maximumValue( mSizeAttributeComboBox->itemData( mSizeAttributeComboBox->currentIndex() ).toInt() ).toFloat();`
	`471`	`+ maxValue = mLayer->maximumValue( mSizeAttributeComboBox->itemData( mSizeAttributeComboBox->currentIndex() ).toInt() ).toFloat();`
`473`	`472`	`}`
`474`	`473`	`mValueLineEdit->setText( QString( "%1" ).arg( maxValue ) );`
`475`	`474`	`}`