Skip to content

Commit

Permalink
reactivate field when dd buton is deactivated
Browse files Browse the repository at this point in the history
  • Loading branch information
vmora authored and nyalldawson committed Jun 24, 2015
1 parent d4badf8 commit 2e35781
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/gui/symbology-ng/qgssymbolslistwidget.cpp
Expand Up @@ -218,6 +218,8 @@ void QgsSymbolsListWidget::updateDataDefinedMarkerAngle()
QgsMarkerSymbolV2* markerSymbol = static_cast<QgsMarkerSymbolV2*>( mSymbol ); QgsMarkerSymbolV2* markerSymbol = static_cast<QgsMarkerSymbolV2*>( mSymbol );
QgsDataDefined dd = mRotationDDBtn->currentDataDefined(); QgsDataDefined dd = mRotationDDBtn->currentDataDefined();


spinAngle->setEnabled( !mRotationDDBtn->isActive() );

bool isDefault = dd.hasDefaultValues(); bool isDefault = dd.hasDefaultValues();


if ( // shall we remove datadefined expressions for layers ? if ( // shall we remove datadefined expressions for layers ?
Expand All @@ -244,6 +246,8 @@ void QgsSymbolsListWidget::updateDataDefinedMarkerSize()
QgsMarkerSymbolV2* markerSymbol = static_cast<QgsMarkerSymbolV2*>( mSymbol ); QgsMarkerSymbolV2* markerSymbol = static_cast<QgsMarkerSymbolV2*>( mSymbol );
QgsDataDefined dd = mSizeDDBtn->currentDataDefined(); QgsDataDefined dd = mSizeDDBtn->currentDataDefined();


spinSize->setEnabled( !mSizeDDBtn->isActive() );

bool isDefault = dd.hasDefaultValues(); bool isDefault = dd.hasDefaultValues();


if ( // shall we remove datadefined expressions for layers ? if ( // shall we remove datadefined expressions for layers ?
Expand All @@ -270,6 +274,8 @@ void QgsSymbolsListWidget::updateDataDefinedLineWidth()
QgsLineSymbolV2* lineSymbol = static_cast<QgsLineSymbolV2*>( mSymbol ); QgsLineSymbolV2* lineSymbol = static_cast<QgsLineSymbolV2*>( mSymbol );
QgsDataDefined dd = mWidthDDBtn->currentDataDefined(); QgsDataDefined dd = mWidthDDBtn->currentDataDefined();


spinWidth->setEnabled( !mWidthDDBtn->isActive() );

bool isDefault = dd.hasDefaultValues(); bool isDefault = dd.hasDefaultValues();


if ( // shall we remove datadefined expressions for layers ? if ( // shall we remove datadefined expressions for layers ?
Expand Down

0 comments on commit 2e35781

Please sign in to comment.