Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix leak
  • Loading branch information
3nids committed Dec 5, 2019
1 parent dbd2d74 commit bd447f4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
20 changes: 17 additions & 3 deletions src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
Expand Up @@ -821,9 +821,7 @@ void QgsGraduatedSymbolRendererWidget::methodComboBox_currentIndexChanged( int )

void QgsGraduatedSymbolRendererWidget::updateMethodParameters()
{
while ( mParametersLayout->rowCount() )
mParametersLayout->removeRow( 0 );
mParameterWidgetWrappers.clear();
clearParameterWidgets();

const QString methodId = cboGraduatedMode->currentData().toString();
QgsClassificationMethod *method = QgsApplication::classificationMethodRegistry()->method( methodId );
Expand Down Expand Up @@ -873,6 +871,22 @@ void QgsGraduatedSymbolRendererWidget::toggleMethodWidgets( MethodMode mode )
}
}

void QgsGraduatedSymbolRendererWidget::clearParameterWidgets()
{
while ( mParametersLayout->rowCount() )
{
QFormLayout::TakeRowResult row = mParametersLayout->takeRow( 0 );
for ( QLayoutItem *item : QList<QLayoutItem *>( {row.labelItem, row.fieldItem} ) )
if ( item )
{
if ( item->widget() )
item->widget()->deleteLater();
delete item;
}
}
mParameterWidgetWrappers.clear();
}

void QgsGraduatedSymbolRendererWidget::refreshRanges( bool reset )
{
if ( !mModel )
Expand Down
2 changes: 2 additions & 0 deletions src/gui/symbology/qgsgraduatedsymbolrendererwidget.h
Expand Up @@ -175,6 +175,8 @@ class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, pr
QgsExpressionContext createExpressionContext() const override;
void toggleMethodWidgets( MethodMode mode );

void clearParameterWidgets();

std::unique_ptr< QgsGraduatedSymbolRenderer > mRenderer;

std::unique_ptr< QgsSymbol > mGraduatedSymbol;
Expand Down

0 comments on commit bd447f4

Please sign in to comment.