diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp index e93f92059749..cfb86efe1272 100644 --- a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp +++ b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp @@ -58,6 +58,7 @@ QgsFeatureRendererV2* QgsPointDisplacementRenderer::clone() r->setLabelColor( mLabelColor ); r->setCircleRadiusAddition( mCircleRadiusAddition ); r->setMaxLabelScaleDenominator( mMaxLabelScaleDenominator ); + r->setTolerance( mTolerance ); if ( mCenterSymbol ) { r->setCenterSymbol( dynamic_cast( mCenterSymbol->clone() ) ); diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp index 72a94437239e..4367e1692c0e 100644 --- a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp +++ b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp @@ -98,6 +98,7 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto mCircleColorButton->setColor( mRenderer->circleColor() ); mLabelColorButton->setColor( mRenderer->labelColor() ); mCircleModificationSpinBox->setValue( mRenderer->circleRadiusAddition() ); + mDistanceSpinBox->setValue( mRenderer->tolerance() ); //scale dependent labelling mMaxScaleDenominatorEdit->setText( QString::number( mRenderer->maxLabelScaleDenominator() ) ); @@ -265,6 +266,14 @@ void QgsPointDisplacementRendererWidget::on_mCircleModificationSpinBox_valueChan mRenderer->setCircleRadiusAddition( d ); } +void QgsPointDisplacementRendererWidget::on_mDistanceSpinBox_valueChanged( double d ) +{ + if ( mRenderer ) + { + mRenderer->setTolerance( d ); + } +} + void QgsPointDisplacementRendererWidget::on_mScaleDependentLabelsCheckBox_stateChanged( int state ) { if ( state == Qt::Unchecked ) @@ -305,6 +314,7 @@ void QgsPointDisplacementRendererWidget::blockAllSignals( bool block ) mScaleDependentLabelsCheckBox->blockSignals( block ); mMaxScaleDenominatorEdit->blockSignals( block ); mCenterSymbolPushButton->blockSignals( block ); + mDistanceSpinBox->blockSignals( block ); } void QgsPointDisplacementRendererWidget::on_mCenterSymbolPushButton_clicked() diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.h b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.h index 98c99e3c807a..3176eb7d9ee5 100644 --- a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.h +++ b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.h @@ -47,6 +47,7 @@ class QgsPointDisplacementRendererWidget: public QgsRendererV2Widget, private Ui void on_mLabelFontButton_clicked(); void on_mCircleWidthSpinBox_valueChanged( double d ); void on_mCircleColorButton_clicked(); + void on_mDistanceSpinBox_valueChanged( double d ); void on_mLabelColorButton_clicked(); void on_mCircleModificationSpinBox_valueChanged( double d ); void on_mScaleDependentLabelsCheckBox_stateChanged( int state ); diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidgetbase.ui b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidgetbase.ui index c569dea3e06f..54955e996b1a 100644 --- a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidgetbase.ui +++ b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidgetbase.ui @@ -6,8 +6,8 @@ 0 0 - 328 - 469 + 327 + 505 @@ -115,6 +115,27 @@ + + + + + + Point distance tolerance: + + + + + + + 7 + + + 9999.000000000000000 + + + + +