Skip to content

Commit

Permalink
Remove unused size/scale slots from renderer widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Sep 13, 2016
1 parent 3223150 commit 041ceea
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 54 deletions.
16 changes: 16 additions & 0 deletions doc/api_break.dox
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@ variant instead.</li>
<li>GenericDataSourceURI has been renamed to GenericDataSourceUri</li>
</ul>

\subsection qgis_api_break_3_0_QgsCategorizedSymbolRendererWidget QgsCategorizedSymbolRendererWidget
<ul>
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
</ul>

\subsection qgis_api_break_3_0_QgsClipper QgsClipper

<ul>
Expand Down Expand Up @@ -625,6 +630,12 @@ and the new ramp can be retrieved after executing the dialog by calling ramp().<
<li>getDataValues() has been removed - use QgsVectorLayer::getDoubleValues() instead</li>
</ul>

\subsection qgis_api_break_3_0_QgsGraduatedSymbolRendererWidget QgsGraduatedSymbolRenderer
<ul>
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
</ul>


\subsection qgis_api_break_3_0_QgsGraphBuilderInterface QgsGraphBuilderInterface

<ul>
Expand Down Expand Up @@ -914,6 +925,11 @@ be returned instead of a null pointer if no transformation is required.</li>
<li>prepareShape() and preparePath() were removed. Calling these methods manually should no longer be required.</li>
</ul>

\subsection qgis_api_break_3_0_QgsSingleSymbolRendererWidget QgsSingleSymbolRendererWidget
<ul>
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
</ul>

\subsection qgis_api_break_3_0_QgsSnapper QgsSnapper

<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ class QgsCategorizedSymbolRendererWidget : QgsRendererWidget
void deleteCategories();
void deleteAllCategories();

void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );

void showSymbolLevels();

void rowsMoved();
Expand Down
2 changes: 0 additions & 2 deletions python/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ class QgsGraduatedSymbolRendererWidget : QgsRendererWidget
/** Toggle the link between classes boundaries */
void toggleBoundariesLink( bool linked );

void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
void labelFormatChanged();

void showSymbolLevels();
Expand Down
3 changes: 0 additions & 3 deletions python/gui/symbology-ng/qgssinglesymbolrendererwidget.sip
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,5 @@ class QgsSingleSymbolRendererWidget : QgsRendererWidget
public slots:
void changeSingleSymbol();

void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );

void showSymbolLevels();
};
12 changes: 0 additions & 12 deletions src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -839,18 +839,6 @@ void QgsCategorizedSymbolRendererWidget::addCategory()
emit widgetChanged();
}

void QgsCategorizedSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName )
{
mRenderer->setSizeScaleField( fldName );
emit widgetChanged();
}

void QgsCategorizedSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod )
{
mRenderer->setScaleMethod( scaleMethod );
emit widgetChanged();
}

QList<QgsSymbol*> QgsCategorizedSymbolRendererWidget::selectedSymbols()
{
QList<QgsSymbol*> selectedSymbols;
Expand Down
3 changes: 0 additions & 3 deletions src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,6 @@ class GUI_EXPORT QgsCategorizedSymbolRendererWidget : public QgsRendererWidget,
void deleteCategories();
void deleteAllCategories();

void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );

void showSymbolLevels();

void rowsMoved();
Expand Down
10 changes: 0 additions & 10 deletions src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1026,16 +1026,6 @@ void QgsGraduatedSymbolRendererWidget::changeCurrentValue( QStandardItem * item
}
}

void QgsGraduatedSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName )
{
mRenderer->setSizeScaleField( fldName );
}

void QgsGraduatedSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod )
{
mRenderer->setScaleMethod( scaleMethod );
}

void QgsGraduatedSymbolRendererWidget::labelFormatChanged()
{
QgsRendererRangeLabelFormat labelFormat = QgsRendererRangeLabelFormat(
Expand Down
2 changes: 0 additions & 2 deletions src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, pr
/** Toggle the link between classes boundaries */
void toggleBoundariesLink( bool linked );

void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
void labelFormatChanged();

void showSymbolLevels();
Expand Down
16 changes: 0 additions & 16 deletions src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,6 @@ void QgsSingleSymbolRendererWidget::changeSingleSymbol()
emit widgetChanged();
}

void QgsSingleSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName )
{
mRenderer->setSizeScaleField( fldName );
}

void QgsSingleSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod )
{
mRenderer->setScaleMethod( scaleMethod );
// Set also on the symbol clone
QgsMarkerSymbol *markerSymbol = dynamic_cast<QgsMarkerSymbol *>( mSingleSymbol );
if ( markerSymbol )
{
markerSymbol->setScaleMethod( scaleMethod );
}
}

void QgsSingleSymbolRendererWidget::showSymbolLevels()
{
showSymbolLevelsDialog( mRenderer );
Expand Down
3 changes: 0 additions & 3 deletions src/gui/symbology-ng/qgssinglesymbolrendererwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ class GUI_EXPORT QgsSingleSymbolRendererWidget : public QgsRendererWidget
public slots:
void changeSingleSymbol();

void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );

void showSymbolLevels();

protected:
Expand Down

0 comments on commit 041ceea

Please sign in to comment.