Skip to content

Commit 041ceea

Browse files
committedSep 13, 2016
Remove unused size/scale slots from renderer widgets
1 parent 3223150 commit 041ceea

10 files changed

+16
-54
lines changed
 

‎doc/api_break.dox

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,11 @@ variant instead.</li>
304304
<li>GenericDataSourceURI has been renamed to GenericDataSourceUri</li>
305305
</ul>
306306

307+
\subsection qgis_api_break_3_0_QgsCategorizedSymbolRendererWidget QgsCategorizedSymbolRendererWidget
308+
<ul>
309+
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
310+
</ul>
311+
307312
\subsection qgis_api_break_3_0_QgsClipper QgsClipper
308313

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

633+
\subsection qgis_api_break_3_0_QgsGraduatedSymbolRendererWidget QgsGraduatedSymbolRenderer
634+
<ul>
635+
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
636+
</ul>
637+
638+
628639
\subsection qgis_api_break_3_0_QgsGraphBuilderInterface QgsGraphBuilderInterface
629640

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

928+
\subsection qgis_api_break_3_0_QgsSingleSymbolRendererWidget QgsSingleSymbolRendererWidget
929+
<ul>
930+
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
931+
</ul>
932+
917933
\subsection qgis_api_break_3_0_QgsSnapper QgsSnapper
918934

919935
<ul>

‎python/gui/symbology-ng/qgscategorizedsymbolrendererwidget.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ class QgsCategorizedSymbolRendererWidget : QgsRendererWidget
3232
void deleteCategories();
3333
void deleteAllCategories();
3434

35-
void sizeScaleFieldChanged( const QString& fldName );
36-
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
37-
3835
void showSymbolLevels();
3936

4037
void rowsMoved();

‎python/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class QgsGraduatedSymbolRendererWidget : QgsRendererWidget
3030
/** Toggle the link between classes boundaries */
3131
void toggleBoundariesLink( bool linked );
3232

33-
void sizeScaleFieldChanged( const QString& fldName );
34-
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
3533
void labelFormatChanged();
3634

3735
void showSymbolLevels();

‎python/gui/symbology-ng/qgssinglesymbolrendererwidget.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@ class QgsSingleSymbolRendererWidget : QgsRendererWidget
1818
public slots:
1919
void changeSingleSymbol();
2020

21-
void sizeScaleFieldChanged( const QString& fldName );
22-
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
23-
2421
void showSymbolLevels();
2522
};

‎src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -839,18 +839,6 @@ void QgsCategorizedSymbolRendererWidget::addCategory()
839839
emit widgetChanged();
840840
}
841841

842-
void QgsCategorizedSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName )
843-
{
844-
mRenderer->setSizeScaleField( fldName );
845-
emit widgetChanged();
846-
}
847-
848-
void QgsCategorizedSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod )
849-
{
850-
mRenderer->setScaleMethod( scaleMethod );
851-
emit widgetChanged();
852-
}
853-
854842
QList<QgsSymbol*> QgsCategorizedSymbolRendererWidget::selectedSymbols()
855843
{
856844
QList<QgsSymbol*> selectedSymbols;

‎src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ class GUI_EXPORT QgsCategorizedSymbolRendererWidget : public QgsRendererWidget,
111111
void deleteCategories();
112112
void deleteAllCategories();
113113

114-
void sizeScaleFieldChanged( const QString& fldName );
115-
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
116-
117114
void showSymbolLevels();
118115

119116
void rowsMoved();

‎src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,16 +1026,6 @@ void QgsGraduatedSymbolRendererWidget::changeCurrentValue( QStandardItem * item
10261026
}
10271027
}
10281028

1029-
void QgsGraduatedSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName )
1030-
{
1031-
mRenderer->setSizeScaleField( fldName );
1032-
}
1033-
1034-
void QgsGraduatedSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod )
1035-
{
1036-
mRenderer->setScaleMethod( scaleMethod );
1037-
}
1038-
10391029
void QgsGraduatedSymbolRendererWidget::labelFormatChanged()
10401030
{
10411031
QgsRendererRangeLabelFormat labelFormat = QgsRendererRangeLabelFormat(

‎src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, pr
109109
/** Toggle the link between classes boundaries */
110110
void toggleBoundariesLink( bool linked );
111111

112-
void sizeScaleFieldChanged( const QString& fldName );
113-
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
114112
void labelFormatChanged();
115113

116114
void showSymbolLevels();

‎src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,6 @@ void QgsSingleSymbolRendererWidget::changeSingleSymbol()
101101
emit widgetChanged();
102102
}
103103

104-
void QgsSingleSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName )
105-
{
106-
mRenderer->setSizeScaleField( fldName );
107-
}
108-
109-
void QgsSingleSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod )
110-
{
111-
mRenderer->setScaleMethod( scaleMethod );
112-
// Set also on the symbol clone
113-
QgsMarkerSymbol *markerSymbol = dynamic_cast<QgsMarkerSymbol *>( mSingleSymbol );
114-
if ( markerSymbol )
115-
{
116-
markerSymbol->setScaleMethod( scaleMethod );
117-
}
118-
}
119-
120104
void QgsSingleSymbolRendererWidget::showSymbolLevels()
121105
{
122106
showSymbolLevelsDialog( mRenderer );

‎src/gui/symbology-ng/qgssinglesymbolrendererwidget.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ class GUI_EXPORT QgsSingleSymbolRendererWidget : public QgsRendererWidget
4949
public slots:
5050
void changeSingleSymbol();
5151

52-
void sizeScaleFieldChanged( const QString& fldName );
53-
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
54-
5552
void showSymbolLevels();
5653

5754
protected:

0 commit comments

Comments
 (0)
Please sign in to comment.