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

Remove unused size/scale slots from renderer widgets

Browse Source
This commit is contained in:
Nyall Dawson 2016-09-13 09:44:37 +10:00
parent 3223150db6
commit 041ceeaf9a
10 changed files with 16 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/api_break.dox
View File

@ -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>
@ -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>
@ -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>

3
python/gui/symbology-ng/qgscategorizedsymbolrendererwidget.sip
View File

@ -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();

2
python/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip
View File

@ -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();

3
python/gui/symbology-ng/qgssinglesymbolrendererwidget.sip
View File

@ -18,8 +18,5 @@ class QgsSingleSymbolRendererWidget : QgsRendererWidget
public slots:
void changeSingleSymbol();
void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
void showSymbolLevels();
};

12
src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp
View File

@ -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;

3
src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.h
View File

@ -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();

10
src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp
View File

@ -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(

2
src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.h
View File

@ -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();

16
src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp
View File

@ -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 );

3
src/gui/symbology-ng/qgssinglesymbolrendererwidget.h
View File

@ -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: