sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-27 00:07:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove last use of QgsSizeScaleWidget

Browse Source
This commit is contained in:
Nyall Dawson 2017-02-13 12:17:47 +10:00
parent 85677196b2
commit 613ef634a5
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/symbology-ng/qgsrendererwidget.cpp
View File

@ -292,14 +292,6 @@ QgsDataDefinedValueDialog::QgsDataDefinedValueDialog( const QList<QgsSymbol*>& s
void QgsDataDefinedValueDialog::setContext( const QgsSymbolWidgetContext& context ) void QgsDataDefinedValueDialog::setContext( const QgsSymbolWidgetContext& context )
{ {
mContext = context; mContext = context;
#if 0
Q_FOREACH ( QgsPropertyOverrideButton* ddButton, findChildren<QgsPropertyOverrideButton*>() )
{
if ( ddButton->assistant() )
ddButton->assistant()->setMapCanvas( context.mapCanvas() );
}
#endif
} }
QgsSymbolWidgetContext QgsDataDefinedValueDialog::context() const QgsSymbolWidgetContext QgsDataDefinedValueDialog::context() const

12
src/gui/symbology-ng/qgsrendererwidget.h
View File

@ -137,7 +137,6 @@ class QgsField;
class QgsFields; class QgsFields;
#include "ui_widget_set_dd_value.h" #include "ui_widget_set_dd_value.h"
#include "qgssizescalewidget.h"
#include "qgis_gui.h" #include "qgis_gui.h"
/** \ingroup gui /** \ingroup gui
@ -212,10 +211,11 @@ class GUI_EXPORT QgsDataDefinedSizeDialog : public QgsDataDefinedValueDialog
: QgsDataDefinedValueDialog( symbolList, layer, tr( "Size" ) ) : QgsDataDefinedValueDialog( symbolList, layer, tr( "Size" ) )
{ {
init( QgsSymbolLayer::PropertySize ); init( QgsSymbolLayer::PropertySize );
#if 0
if ( !symbolList.isEmpty() && symbolList.at( 0 ) && vectorLayer() ) if ( !symbolList.isEmpty() && symbolList.at( 0 ) && vectorLayer() )
mDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), static_cast<const QgsMarkerSymbol*>( symbolList.at( 0 ) ) ) ); {
#endif mAssistantSymbol.reset( static_cast<const QgsMarkerSymbol*>( symbolList.at( 0 ) )->clone() );
mDDBtn->setSymbol( mAssistantSymbol );
}
} }
protected: protected:
@ -224,6 +224,10 @@ class GUI_EXPORT QgsDataDefinedSizeDialog : public QgsDataDefinedValueDialog
double value( const QgsSymbol * symbol ) const override { return static_cast<const QgsMarkerSymbol*>( symbol )->size(); } double value( const QgsSymbol * symbol ) const override { return static_cast<const QgsMarkerSymbol*>( symbol )->size(); }
void setDataDefined( QgsSymbol* symbol, const QgsProperty& dd ) override; void setDataDefined( QgsSymbol* symbol, const QgsProperty& dd ) override;
private:
std::shared_ptr< QgsMarkerSymbol > mAssistantSymbol;
}; };
/** \ingroup gui /** \ingroup gui