Skip to content

Commit

Permalink
fix wrong scale method with constant expressions
Browse files Browse the repository at this point in the history
fix #13571
  • Loading branch information
vmora authored and nyalldawson committed Dec 3, 2015
1 parent 18c52ab commit 701d970
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/symbology-ng/qgssymbollayerv2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ QgsMarkerSymbolLayerV2::QgsMarkerSymbolLayerV2( bool locked )
, mSize( 2.0 )
, mSizeUnit( QgsSymbolV2::MM )
, mOffsetUnit( QgsSymbolV2::MM )
, mScaleMethod( QgsSymbolV2::ScaleArea )
, mScaleMethod( QgsSymbolV2::ScaleDiameter )
, mHorizontalAnchorPoint( HCenter )
, mVerticalAnchorPoint( VCenter )
{
Expand Down
1 change: 1 addition & 0 deletions src/gui/symbology-ng/qgsrendererv2widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ QgsDataDefined QgsDataDefinedSizeDialog::symbolDataDefined( const QgsSymbolV2 *s
void QgsDataDefinedSizeDialog::setDataDefined( QgsSymbolV2* symbol, const QgsDataDefined& dd )
{
static_cast<QgsMarkerSymbolV2*>( symbol )->setDataDefinedSize( dd );
static_cast<QgsMarkerSymbolV2*>( symbol )->setScaleMethod( QgsSymbolV2::ScaleDiameter );
}


Expand Down
1 change: 1 addition & 0 deletions src/gui/symbology-ng/qgssymbolslistwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ void QgsSymbolsListWidget::updateDataDefinedMarkerSize()
|| !isDefault )
{
markerSymbol->setDataDefinedSize( dd );
markerSymbol->setScaleMethod( QgsSymbolV2::ScaleDiameter );
emit changed();
}
}
Expand Down

0 comments on commit 701d970

Please sign in to comment.