sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-19 00:02:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix rule based settings not saved (fix #15146, #15147, #15148)

Browse Source
This commit is contained in:
Nyall Dawson 2016-06-27 15:56:06 +10:00
parent 06343776d3
commit c49af32e95
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/gui/qgsscalerangewidget.sip
View File

@ -37,4 +37,13 @@ class QgsScaleRangeWidget : QWidget
void setMaximumScale( double scale );
void setScaleRange( double min, double max );
signals:
/** Emitted when the scale range set in the widget is changed.
* @param min minimum scale
* @param max maximum scale
* @note added in QGIS 2.16
*/
void rangeChanged( double min, double max );
};

8
src/gui/qgsscalerangewidget.cpp
View File

@ -64,6 +64,9 @@ QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
mLayout->setColumnStretch( 3, 0 );
mLayout->setColumnStretch( 4, 0 );
mLayout->setColumnStretch( 5, 3 );
connect( mMinimumScaleWidget, SIGNAL( scaleChanged( double ) ), this, SLOT( emitRangeChanged() ) );
connect( mMaximumScaleWidget, SIGNAL( scaleChanged( double ) ), this, SLOT( emitRangeChanged() ) );
}
QgsScaleRangeWidget::~QgsScaleRangeWidget()
@ -123,3 +126,8 @@ void QgsScaleRangeWidget::setScaleRange( double min, double max )
setMinimumScale( min );
}
void QgsScaleRangeWidget::emitRangeChanged()
{
emit rangeChanged( minimumScale(), maximumScale() );
}

13
src/gui/qgsscalerangewidget.h
View File

@ -62,6 +62,19 @@ class GUI_EXPORT QgsScaleRangeWidget : public QWidget
void setScaleRange( double min, double max );
signals:
/** Emitted when the scale range set in the widget is changed.
* @param min minimum scale
* @param max maximum scale
* @note added in QGIS 2.16
*/
void rangeChanged( double min, double max );
private slots:
void emitRangeChanged();
private:
//! pointer to the map canvas used for current buttons.
QgsMapCanvas* mCanvas;

6
src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
View File

@ -656,7 +656,11 @@ QgsRendererRulePropsWidget::QgsRendererRulePropsWidget( QgsRuleBasedRendererV2::
connect( btnExpressionBuilder, SIGNAL( clicked() ), this, SLOT( buildExpression() ) );
connect( btnTestFilter, SIGNAL( clicked() ), this, SLOT( testFilter() ) );
connect( editFilter, SIGNAL( textChanged( QString ) ), this, SIGNAL( widgetChanged() ) );
connect( editLabel, SIGNAL( textChanged( QString ) ), this, SIGNAL( widgetChanged() ) );
connect( editDescription, SIGNAL( textChanged( QString ) ), this, SIGNAL( widgetChanged() ) );
connect( groupSymbol, SIGNAL( toggled( bool ) ), this, SIGNAL( widgetChanged() ) );
connect( groupScale, SIGNAL( toggled( bool ) ), this, SIGNAL( widgetChanged() ) );
connect( mScaleRangeWidget, SIGNAL( rangeChanged( double, double ) ), this, SIGNAL( widgetChanged() ) );
}
QgsRendererRulePropsWidget::~QgsRendererRulePropsWidget()