mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-17 00:04:02 -04:00
Deprecate QgsDataDefinedSymbolDialog, no longer used
Move help descriptions to QgsDataDefinedButton and consolidate with existing descriptions.
This commit is contained in:
Nyall Dawson
parent
408d746c21
commit
6d7e3960de
@ -146,6 +146,7 @@ class QgsDataDefinedButton : QToolButton
|
||||
static QString intPosOneDesc();
|
||||
static QString doubleDesc();
|
||||
static QString doublePosDesc();
|
||||
static QString double0to1Desc();
|
||||
static QString doubleXYDesc();
|
||||
static QString double180RotDesc();
|
||||
static QString intTranspDesc();
|
||||
@ -158,6 +159,19 @@ class QgsDataDefinedButton : QToolButton
|
||||
static QString penJoinStyleDesc();
|
||||
static QString blendModesDesc();
|
||||
static QString svgPathDesc();
|
||||
static QString filePathDesc();
|
||||
static QString paperSizeDesc();
|
||||
static QString paperOrientationDesc();
|
||||
static QString horizontalAnchorDesc();
|
||||
static QString verticalAnchorDesc();
|
||||
static QString gradientTypeDesc();
|
||||
static QString gradientCoordModeDesc();
|
||||
static QString gradientSpreadDesc();
|
||||
static QString lineStyleDesc();
|
||||
static QString capStyleDesc();
|
||||
static QString fillStyleDesc();
|
||||
static QString markerStyleDesc();
|
||||
static QString customDashDesc();
|
||||
|
||||
public slots:
|
||||
/**
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
/** \ingroup gui
|
||||
* \class QgsDataDefinedSymbolDialog
|
||||
* \deprecated no longer used and will be removed in QGIS 3.0
|
||||
*/
|
||||
class QgsDataDefinedSymbolDialog : QDialog
|
||||
{
|
||||
%TypeHeaderCode
|
||||
@ -10,23 +14,23 @@ class QgsDataDefinedSymbolDialog : QDialog
|
||||
DataDefinedSymbolEntry( const QString& p, const QString& t, const QString& v, const QString& h );
|
||||
};
|
||||
|
||||
QgsDataDefinedSymbolDialog( const QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 );
|
||||
QgsDataDefinedSymbolDialog( const QList< QgsDataDefinedSymbolDialog::DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 ) /Deprecated/;
|
||||
~QgsDataDefinedSymbolDialog();
|
||||
QMap< QString, QString > dataDefinedProperties() const;
|
||||
QMap< QString, QString > dataDefinedProperties() const /Deprecated/;
|
||||
|
||||
//common help texts
|
||||
static QString doubleHelpText();
|
||||
static QString colorHelpText();
|
||||
static QString offsetHelpText();
|
||||
static QString fileNameHelpText();
|
||||
static QString horizontalAnchorHelpText();
|
||||
static QString verticalAnchorHelpText();
|
||||
static QString gradientTypeHelpText();
|
||||
static QString gradientCoordModeHelpText();
|
||||
static QString gradientSpreadHelpText();
|
||||
static QString boolHelpText();
|
||||
static QString lineStyleHelpText();
|
||||
static QString joinStyleHelpText();
|
||||
static QString capStyleHelpText();
|
||||
static QString fillStyleHelpText();
|
||||
static QString doubleHelpText() /Deprecated/;
|
||||
static QString colorHelpText() /Deprecated/;
|
||||
static QString offsetHelpText() /Deprecated/;
|
||||
static QString fileNameHelpText() /Deprecated/;
|
||||
static QString horizontalAnchorHelpText() /Deprecated/;
|
||||
static QString verticalAnchorHelpText() /Deprecated/;
|
||||
static QString gradientTypeHelpText() /Deprecated/;
|
||||
static QString gradientCoordModeHelpText() /Deprecated/;
|
||||
static QString gradientSpreadHelpText() /Deprecated/;
|
||||
static QString boolHelpText() /Deprecated/;
|
||||
static QString lineStyleHelpText() /Deprecated/;
|
||||
static QString joinStyleHelpText() /Deprecated/;
|
||||
static QString capStyleHelpText() /Deprecated/;
|
||||
static QString fillStyleHelpText() /Deprecated/;
|
||||
};
|
||||
|
||||
@ -640,6 +640,11 @@ QString QgsDataDefinedButton::doublePosDesc()
|
||||
return tr( "double [>= 0.0]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::double0to1Desc()
|
||||
{
|
||||
return tr( "double [0.0-1.0]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::doubleXYDesc()
|
||||
{
|
||||
return tr( "double coord [<b>X,Y</b>] as <= 0.0 =>" );
|
||||
@ -687,7 +692,7 @@ QString QgsDataDefinedButton::textVertAlignDesc()
|
||||
|
||||
QString QgsDataDefinedButton::penJoinStyleDesc()
|
||||
{
|
||||
return trString() + "[<b>Bevel</b>|<b>Miter</b>|<b>Round</b>]";
|
||||
return trString() + "[<b>bevel</b>|<b>miter</b>|<b>round</b>]";
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::blendModesDesc()
|
||||
@ -704,6 +709,11 @@ QString QgsDataDefinedButton::svgPathDesc()
|
||||
"project-relative|URL" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::filePathDesc()
|
||||
{
|
||||
return tr( "string [<b>filepath</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::paperSizeDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>A5</b>|<b>A4</b>|<b>A3</b>|<b>A2</b>|<b>A1</b>|<b>A0</b>"
|
||||
@ -717,3 +727,55 @@ QString QgsDataDefinedButton::paperOrientationDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>portrait</b>|<b>landscape</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::horizontalAnchorDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>left</b>|<b>center</b>|<b>right</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::verticalAnchorDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>top</b>|<b>center</b>|<b>bottom</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::gradientTypeDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>linear</b>|<b>radial</b>|<b>conical</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::gradientCoordModeDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>feature</b>|<b>viewport</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::gradientSpreadDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>pad</b>|<b>repeat</b>|<b>reflect</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::lineStyleDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>no</b>|<b>solid</b>|<b>dash</b>|<b>dot</b>|<b>dash dot</b>|<b>dash dot dot</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::capStyleDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>square</b>|<b>flat</b>|<b>round</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::fillStyleDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>solid</b>|<b>horizontal</b>|<b>vertical</b>|<b>cross</b>|<b>b_diagonal</b>|<b>f_diagonal"
|
||||
"</b>|<b>diagonal_x</b>|<b>dense1</b>|<b>dense2</b>|<b>dense3</b>|<b>dense4</b>|<b>dense5"
|
||||
"</b>|<b>dense6</b>|<b>dense7</b>|<b>no]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::markerStyleDesc()
|
||||
{
|
||||
return trString() + QString( "[<b>circle</b>|<b>rectangle</b>|<b>cross</b>|<b>triangle</b>]" );
|
||||
}
|
||||
|
||||
QString QgsDataDefinedButton::customDashDesc()
|
||||
{
|
||||
return tr( "[<b><dash>;<space></b>] e.g. '8;2;1;2'" );
|
||||
}
|
||||
|
||||
@ -178,6 +178,7 @@ class GUI_EXPORT QgsDataDefinedButton: public QToolButton
|
||||
static QString intPosOneDesc();
|
||||
static QString doubleDesc();
|
||||
static QString doublePosDesc();
|
||||
static QString double0to1Desc();
|
||||
static QString doubleXYDesc();
|
||||
static QString double180RotDesc();
|
||||
static QString intTranspDesc();
|
||||
@ -190,8 +191,19 @@ class GUI_EXPORT QgsDataDefinedButton: public QToolButton
|
||||
static QString penJoinStyleDesc();
|
||||
static QString blendModesDesc();
|
||||
static QString svgPathDesc();
|
||||
static QString filePathDesc();
|
||||
static QString paperSizeDesc();
|
||||
static QString paperOrientationDesc();
|
||||
static QString horizontalAnchorDesc();
|
||||
static QString verticalAnchorDesc();
|
||||
static QString gradientTypeDesc();
|
||||
static QString gradientCoordModeDesc();
|
||||
static QString gradientSpreadDesc();
|
||||
static QString lineStyleDesc();
|
||||
static QString capStyleDesc();
|
||||
static QString fillStyleDesc();
|
||||
static QString markerStyleDesc();
|
||||
static QString customDashDesc();
|
||||
|
||||
public slots:
|
||||
/**
|
||||
|
||||
@ -8,7 +8,10 @@ class QgsVectorLayer;
|
||||
class QComboBox;
|
||||
|
||||
|
||||
|
||||
/** \ingroup gui
|
||||
* \class QgsDataDefinedSymbolDialog
|
||||
* \deprecated no longer used and will be removed in QGIS 3.0
|
||||
*/
|
||||
class GUI_EXPORT QgsDataDefinedSymbolDialog: public QDialog, private Ui::QgsDataDefinedSymbolDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -24,25 +27,25 @@ class GUI_EXPORT QgsDataDefinedSymbolDialog: public QDialog, private Ui::QgsData
|
||||
QString helpText;
|
||||
};
|
||||
|
||||
QgsDataDefinedSymbolDialog( const QList< DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 );
|
||||
Q_DECL_DEPRECATED QgsDataDefinedSymbolDialog( const QList< DataDefinedSymbolEntry >& entries, const QgsVectorLayer* vl, QWidget * parent = 0, Qt::WindowFlags f = 0 );
|
||||
~QgsDataDefinedSymbolDialog();
|
||||
QMap< QString, QString > dataDefinedProperties() const;
|
||||
Q_DECL_DEPRECATED QMap< QString, QString > dataDefinedProperties() const;
|
||||
|
||||
//common help texts
|
||||
static QString doubleHelpText();
|
||||
static QString colorHelpText();
|
||||
static QString offsetHelpText();
|
||||
static QString fileNameHelpText();
|
||||
static QString horizontalAnchorHelpText();
|
||||
static QString verticalAnchorHelpText();
|
||||
static QString gradientTypeHelpText();
|
||||
static QString gradientCoordModeHelpText();
|
||||
static QString gradientSpreadHelpText();
|
||||
static QString boolHelpText();
|
||||
static QString lineStyleHelpText();
|
||||
static QString joinStyleHelpText();
|
||||
static QString capStyleHelpText();
|
||||
static QString fillStyleHelpText();
|
||||
Q_DECL_DEPRECATED static QString doubleHelpText();
|
||||
Q_DECL_DEPRECATED static QString colorHelpText();
|
||||
Q_DECL_DEPRECATED static QString offsetHelpText();
|
||||
Q_DECL_DEPRECATED static QString fileNameHelpText();
|
||||
Q_DECL_DEPRECATED static QString horizontalAnchorHelpText();
|
||||
Q_DECL_DEPRECATED static QString verticalAnchorHelpText();
|
||||
Q_DECL_DEPRECATED static QString gradientTypeHelpText();
|
||||
Q_DECL_DEPRECATED static QString gradientCoordModeHelpText();
|
||||
Q_DECL_DEPRECATED static QString gradientSpreadHelpText();
|
||||
Q_DECL_DEPRECATED static QString boolHelpText();
|
||||
Q_DECL_DEPRECATED static QString lineStyleHelpText();
|
||||
Q_DECL_DEPRECATED static QString joinStyleHelpText();
|
||||
Q_DECL_DEPRECATED static QString capStyleHelpText();
|
||||
Q_DECL_DEPRECATED static QString fillStyleHelpText();
|
||||
|
||||
private:
|
||||
const QgsVectorLayer* mVectorLayer;
|
||||
|
||||
@ -110,17 +110,17 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
|
||||
mVerticalAnchorComboBox->setCurrentIndex( mLayer->verticalAnchorPoint() );
|
||||
blockComboSignals( false );
|
||||
|
||||
registerDataDefinedButton( mSymbolWidthDDBtn, "width", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mSymbolHeightDDBtn, "height", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mRotationDDBtn, "rotation", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mFillColorDDBtn, "fill_color", QgsDataDefinedButton::String, "'red,green,blue,alpha' e.g. '255,0,0,255'" );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "outline_color", QgsDataDefinedButton::String, "'red,green,blue,alpha' e.g. '255,0,0,255'" );
|
||||
registerDataDefinedButton( mOutlineStyleDDBtn, "outline_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
|
||||
registerDataDefinedButton( mShapeDDBtn, "symbol_name", QgsDataDefinedButton::String, "'circle', 'rectangle', 'cross', 'triangle'" );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, "'x,y' e.g. '2,3.5'" );
|
||||
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, "'left', 'center' or 'right'" );
|
||||
registerDataDefinedButton( mVerticalAnchorDDBtn, "vertical_anchor_point", QgsDataDefinedButton::String, "'top', 'center' or 'bottom'" );
|
||||
registerDataDefinedButton( mSymbolWidthDDBtn, "width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mSymbolHeightDDBtn, "height", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mRotationDDBtn, "rotation", QgsDataDefinedButton::Double, QgsDataDefinedButton::double180RotDesc() );
|
||||
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mFillColorDDBtn, "fill_color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "outline_color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mOutlineStyleDDBtn, "outline_style", QgsDataDefinedButton::String, QgsDataDefinedButton::lineStyleDesc() );
|
||||
registerDataDefinedButton( mShapeDDBtn, "symbol_name", QgsDataDefinedButton::String, QgsDataDefinedButton::markerStyleDesc() );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, QgsDataDefinedButton::doubleXYDesc() );
|
||||
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedButton::horizontalAnchorDesc() );
|
||||
registerDataDefinedButton( mVerticalAnchorDDBtn, "vertical_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedButton::verticalAnchorDesc() );
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -182,13 +182,13 @@ void QgsSimpleLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
|
||||
|
||||
updatePatternIcon();
|
||||
|
||||
registerDataDefinedButton( mColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mPenWidthDDBtn, "width", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mDashPatternDDBtn, "customdash", QgsDataDefinedButton::String, tr( "'<dash>;<space>' e.g. '8;2;1;2'" ) );
|
||||
registerDataDefinedButton( mPenStyleDDBtn, "line_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
|
||||
registerDataDefinedButton( mJoinStyleDDBtn, "joinstyle", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::joinStyleHelpText() );
|
||||
registerDataDefinedButton( mCapStyleDDBtn, "capstyle", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::capStyleHelpText() );
|
||||
registerDataDefinedButton( mColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mPenWidthDDBtn, "width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
|
||||
registerDataDefinedButton( mDashPatternDDBtn, "customdash", QgsDataDefinedButton::String, QgsDataDefinedButton::customDashDesc() );
|
||||
registerDataDefinedButton( mPenStyleDDBtn, "line_style", QgsDataDefinedButton::String, QgsDataDefinedButton::lineStyleDesc() );
|
||||
registerDataDefinedButton( mJoinStyleDDBtn, "joinstyle", QgsDataDefinedButton::String, QgsDataDefinedButton::penJoinStyleDesc() );
|
||||
registerDataDefinedButton( mCapStyleDDBtn, "capstyle", QgsDataDefinedButton::String, QgsDataDefinedButton::capStyleDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2Widget::symbolLayer()
|
||||
@ -423,15 +423,15 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
|
||||
mVerticalAnchorComboBox->blockSignals( false );
|
||||
|
||||
registerDataDefinedButton( mNameDDBtn, "name", QgsDataDefinedButton::String, "'square'|'rectangle'|'diamond'|'pentagon'|'triangle'|'equilateral_triangle'|'star'|'regular_star'|'arrow'|'filled_arrowhead'|'circle'|'cross'|'x'|'cross2'|'line'|'arrowhead'" );
|
||||
registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mOutlineStyleDDBtn, "outline_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
|
||||
registerDataDefinedButton( mSizeDDBtn, "size", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mAngleDDBtn, "angle", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::offsetHelpText() );
|
||||
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::horizontalAnchorHelpText() );
|
||||
registerDataDefinedButton( mVerticalAnchorDDBtn, "vertical_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::verticalAnchorHelpText() );
|
||||
registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mOutlineWidthDDBtn, "outline_width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mOutlineStyleDDBtn, "outline_style", QgsDataDefinedButton::String, QgsDataDefinedButton::lineStyleDesc() );
|
||||
registerDataDefinedButton( mSizeDDBtn, "size", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mAngleDDBtn, "angle", QgsDataDefinedButton::Double, QgsDataDefinedButton::double180RotDesc() );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, QgsDataDefinedButton::doubleXYDesc() );
|
||||
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedButton::horizontalAnchorDesc() );
|
||||
registerDataDefinedButton( mVerticalAnchorDDBtn, "vertical_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedButton::verticalAnchorDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsSimpleMarkerSymbolLayerV2Widget::symbolLayer()
|
||||
@ -625,12 +625,12 @@ void QgsSimpleFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
|
||||
mOffsetUnitWidget->setMapUnitScale( mLayer->offsetMapUnitScale() );
|
||||
mOffsetUnitWidget->blockSignals( false );
|
||||
|
||||
registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mBorderWidthDDBtn, "width_border", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mFillStyleDDBtn, "fill_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::fillStyleHelpText() );
|
||||
registerDataDefinedButton( mBorderStyleDDBtn, "border_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::lineStyleHelpText() );
|
||||
registerDataDefinedButton( mJoinStyleDDBtn, "join_style", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::joinStyleHelpText() );
|
||||
registerDataDefinedButton( mFillColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "color_border", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mBorderWidthDDBtn, "width_border", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mFillStyleDDBtn, "fill_style", QgsDataDefinedButton::String, QgsDataDefinedButton::fillStyleDesc() );
|
||||
registerDataDefinedButton( mBorderStyleDDBtn, "border_style", QgsDataDefinedButton::String, QgsDataDefinedButton::lineStyleDesc() );
|
||||
registerDataDefinedButton( mJoinStyleDDBtn, "join_style", QgsDataDefinedButton::String, QgsDataDefinedButton::penJoinStyleDesc() );
|
||||
|
||||
}
|
||||
|
||||
@ -867,18 +867,18 @@ void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer
|
||||
mOffsetUnitWidget->setMapUnitScale( mLayer->offsetMapUnitScale() );
|
||||
mOffsetUnitWidget->blockSignals( false );
|
||||
|
||||
registerDataDefinedButton( mStartColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mEndColorDDBtn, "color2", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mAngleDDBtn, "angle", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mGradientTypeDDBtn, "gradient_type", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::gradientTypeHelpText() );
|
||||
registerDataDefinedButton( mCoordinateModeDDBtn, "coordinate_mode", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::gradientCoordModeHelpText() );
|
||||
registerDataDefinedButton( mSpreadDDBtn, "spread", QgsDataDefinedButton::Double, QgsDataDefinedSymbolDialog::gradientSpreadHelpText() );
|
||||
registerDataDefinedButton( mRefPoint1XDDBtn, "reference1_x", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mRefPoint1YDDBtn, "reference1_y", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mRefPoint1CentroidDDBtn, "reference1_iscentroid", QgsDataDefinedButton::Int, QgsDataDefinedSymbolDialog::boolHelpText() );
|
||||
registerDataDefinedButton( mRefPoint2XDDBtn, "reference2_x", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mRefPoint2YDDBtn, "reference2_y", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mRefPoint2CentroidDDBtn, "reference2_iscentroid", QgsDataDefinedButton::Int, QgsDataDefinedSymbolDialog::boolHelpText() );
|
||||
registerDataDefinedButton( mStartColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mEndColorDDBtn, "color2", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mAngleDDBtn, "angle", QgsDataDefinedButton::Double, QgsDataDefinedButton::double180RotDesc() );
|
||||
registerDataDefinedButton( mGradientTypeDDBtn, "gradient_type", QgsDataDefinedButton::String, QgsDataDefinedButton::gradientTypeDesc() );
|
||||
registerDataDefinedButton( mCoordinateModeDDBtn, "coordinate_mode", QgsDataDefinedButton::String, QgsDataDefinedButton::gradientCoordModeDesc() );
|
||||
registerDataDefinedButton( mSpreadDDBtn, "spread", QgsDataDefinedButton::Double, QgsDataDefinedButton::gradientSpreadDesc() );
|
||||
registerDataDefinedButton( mRefPoint1XDDBtn, "reference1_x", QgsDataDefinedButton::Double, QgsDataDefinedButton::double0to1Desc() );
|
||||
registerDataDefinedButton( mRefPoint1YDDBtn, "reference1_y", QgsDataDefinedButton::Double, QgsDataDefinedButton::double0to1Desc() );
|
||||
registerDataDefinedButton( mRefPoint1CentroidDDBtn, "reference1_iscentroid", QgsDataDefinedButton::Int, QgsDataDefinedButton::boolDesc() );
|
||||
registerDataDefinedButton( mRefPoint2XDDBtn, "reference2_x", QgsDataDefinedButton::Double, QgsDataDefinedButton::double0to1Desc() );
|
||||
registerDataDefinedButton( mRefPoint2YDDBtn, "reference2_y", QgsDataDefinedButton::Double, QgsDataDefinedButton::double0to1Desc() );
|
||||
registerDataDefinedButton( mRefPoint2CentroidDDBtn, "reference2_iscentroid", QgsDataDefinedButton::Int, QgsDataDefinedButton::boolDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsGradientFillSymbolLayerV2Widget::symbolLayer()
|
||||
@ -1174,12 +1174,12 @@ void QgsShapeburstFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* lay
|
||||
mOffsetUnitWidget->setMapUnitScale( mLayer->offsetMapUnitScale() );
|
||||
mOffsetUnitWidget->blockSignals( false );
|
||||
|
||||
registerDataDefinedButton( mStartColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mEndColorDDBtn, "color2", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mStartColorDDBtn, "color", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mEndColorDDBtn, "color2", QgsDataDefinedButton::String, QgsDataDefinedButton::colorAlphaDesc() );
|
||||
registerDataDefinedButton( mBlurRadiusDDBtn, "blur_radius", QgsDataDefinedButton::Int, tr( "Integer between 0 and 18" ) );
|
||||
registerDataDefinedButton( mShadeWholeShapeDDBtn, "use_whole_shape", QgsDataDefinedButton::Int, QgsDataDefinedSymbolDialog::boolHelpText() );
|
||||
registerDataDefinedButton( mShadeDistanceDDBtn, "max_distance", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mIgnoreRingsDDBtn, "ignore_rings", QgsDataDefinedButton::Int, QgsDataDefinedSymbolDialog::boolHelpText() );
|
||||
registerDataDefinedButton( mShadeWholeShapeDDBtn, "use_whole_shape", QgsDataDefinedButton::Int, QgsDataDefinedButton::boolDesc() );
|
||||
registerDataDefinedButton( mShadeDistanceDDBtn, "max_distance", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mIgnoreRingsDDBtn, "ignore_rings", QgsDataDefinedButton::Int, QgsDataDefinedButton::boolDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsShapeburstFillSymbolLayerV2Widget::symbolLayer()
|
||||
@ -1396,10 +1396,10 @@ void QgsMarkerLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
|
||||
|
||||
setPlacement(); // update gui
|
||||
|
||||
registerDataDefinedButton( mIntervalDDBtn, "interval", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mLineOffsetDDBtn, "offset", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mIntervalDDBtn, "interval", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mLineOffsetDDBtn, "offset", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
|
||||
registerDataDefinedButton( mPlacementDDBtn, "placement", QgsDataDefinedButton::String, "'vertex'|'lastvertex'|'firstvertex'|'centerpoint'" );
|
||||
registerDataDefinedButton( mOffsetAlongLineDDBtn, "offset_along_line", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mOffsetAlongLineDDBtn, "offset_along_line", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsMarkerLineSymbolLayerV2Widget::symbolLayer()
|
||||
@ -1772,15 +1772,15 @@ void QgsSvgMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
|
||||
|
||||
setGuiForSvg( mLayer );
|
||||
|
||||
registerDataDefinedButton( mSizeDDBtn, "size", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mBorderWidthDDBtn, "outline-width", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mAngleDDBtn, "angle", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::offsetHelpText() );
|
||||
registerDataDefinedButton( mFilenameDDBtn, "name", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::fileNameHelpText() );
|
||||
registerDataDefinedButton( mFillColorDDBtn, "fill", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "outline", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::horizontalAnchorHelpText() );
|
||||
registerDataDefinedButton( mVerticalAnchorDDBtn, "vertical_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::verticalAnchorHelpText() );
|
||||
registerDataDefinedButton( mSizeDDBtn, "size", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mBorderWidthDDBtn, "outline-width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mAngleDDBtn, "angle", QgsDataDefinedButton::Double, QgsDataDefinedButton::double180RotDesc() );
|
||||
registerDataDefinedButton( mOffsetDDBtn, "offset", QgsDataDefinedButton::String, QgsDataDefinedButton::doubleXYDesc() );
|
||||
registerDataDefinedButton( mFilenameDDBtn, "name", QgsDataDefinedButton::String, QgsDataDefinedButton::filePathDesc() );
|
||||
registerDataDefinedButton( mFillColorDDBtn, "fill", QgsDataDefinedButton::String, QgsDataDefinedButton::colorNoAlphaDesc() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "outline", QgsDataDefinedButton::String, QgsDataDefinedButton::colorNoAlphaDesc() );
|
||||
registerDataDefinedButton( mHorizontalAnchorDDBtn, "horizontal_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedButton::horizontalAnchorDesc() );
|
||||
registerDataDefinedButton( mVerticalAnchorDDBtn, "vertical_anchor_point", QgsDataDefinedButton::String, QgsDataDefinedButton::verticalAnchorDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2Widget::symbolLayer()
|
||||
@ -2011,12 +2011,12 @@ void QgsSVGFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* layer )
|
||||
}
|
||||
updateParamGui( false );
|
||||
|
||||
registerDataDefinedButton( mTextureWidthDDBtn, "width", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mSVGDDBtn, "svgFile", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::fileNameHelpText() );
|
||||
registerDataDefinedButton( mRotationDDBtn, "angle", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mFilColorDDBtn, "svgFillColor", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "svgOutlineColor", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::colorHelpText() );
|
||||
registerDataDefinedButton( mBorderWidthDDBtn, "svgOutlineWidth", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mTextureWidthDDBtn, "width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
registerDataDefinedButton( mSVGDDBtn, "svgFile", QgsDataDefinedButton::String, QgsDataDefinedButton::svgPathDesc() );
|
||||
registerDataDefinedButton( mRotationDDBtn, "angle", QgsDataDefinedButton::Double, QgsDataDefinedButton::double180RotDesc() );
|
||||
registerDataDefinedButton( mFilColorDDBtn, "svgFillColor", QgsDataDefinedButton::String, QgsDataDefinedButton::colorNoAlphaDesc() );
|
||||
registerDataDefinedButton( mBorderColorDDBtn, "svgOutlineColor", QgsDataDefinedButton::String, QgsDataDefinedButton::colorNoAlphaDesc() );
|
||||
registerDataDefinedButton( mBorderWidthDDBtn, "svgOutlineWidth", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsSVGFillSymbolLayerWidget::symbolLayer()
|
||||
@ -2250,8 +2250,8 @@ void QgsLinePatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* laye
|
||||
mOffsetUnitWidget->blockSignals( false );
|
||||
}
|
||||
|
||||
registerDataDefinedButton( mAngleDDBtn, "lineangle", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mDistanceDDBtn, "distance", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mAngleDDBtn, "lineangle", QgsDataDefinedButton::Double, QgsDataDefinedButton::double180RotDesc() );
|
||||
registerDataDefinedButton( mDistanceDDBtn, "distance", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsLinePatternFillSymbolLayerWidget::symbolLayer()
|
||||
@ -2359,10 +2359,10 @@ void QgsPointPatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* lay
|
||||
mVerticalDisplacementUnitWidget->setMapUnitScale( mLayer->displacementYMapUnitScale() );
|
||||
mVerticalDisplacementUnitWidget->blockSignals( false );
|
||||
|
||||
registerDataDefinedButton( mHorizontalDistanceDDBtn, "distance_x", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mVerticalDistanceDDBtn, "distance_y", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mHorizontalDisplacementDDBtn, "displacement_x", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mVerticalDisplacementDDBtn, "displacement_y", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mHorizontalDistanceDDBtn, "distance_x", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
|
||||
registerDataDefinedButton( mVerticalDistanceDDBtn, "distance_y", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
|
||||
registerDataDefinedButton( mHorizontalDisplacementDDBtn, "displacement_x", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
|
||||
registerDataDefinedButton( mVerticalDisplacementDDBtn, "displacement_y", QgsDataDefinedButton::Double, QgsDataDefinedButton::doubleDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2* QgsPointPatternFillSymbolLayerWidget::symbolLayer()
|
||||
@ -2744,10 +2744,10 @@ void QgsRasterFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2 *layer )
|
||||
mWidthUnitWidget->blockSignals( false );
|
||||
updatePreviewImage();
|
||||
|
||||
registerDataDefinedButton( mFilenameDDBtn, "file", QgsDataDefinedButton::String, QgsDataDefinedSymbolDialog::fileNameHelpText() );
|
||||
registerDataDefinedButton( mOpacityDDBtn, "alpha", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mRotationDDBtn, "angle", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mWidthDDBtn, "width", QgsDataDefinedButton::Double, "" );
|
||||
registerDataDefinedButton( mFilenameDDBtn, "file", QgsDataDefinedButton::String, QgsDataDefinedButton::filePathDesc() );
|
||||
registerDataDefinedButton( mOpacityDDBtn, "alpha", QgsDataDefinedButton::Double, QgsDataDefinedButton::double0to1Desc() );
|
||||
registerDataDefinedButton( mRotationDDBtn, "angle", QgsDataDefinedButton::Double, QgsDataDefinedButton::double180RotDesc() );
|
||||
registerDataDefinedButton( mWidthDDBtn, "width", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() );
|
||||
}
|
||||
|
||||
QgsSymbolLayerV2 *QgsRasterFillSymbolLayerWidget::symbolLayer()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user