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

Better default values for gradient fills

Browse Source
This commit is contained in:
nyalldawson 2013-11-03 20:54:23 +11:00
parent dfba26d9b0
commit eeea36e695
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/symbology-ng/qgsfillsymbollayerv2.cpp
View File

@ -293,9 +293,9 @@ QgsGradientFillSymbolLayerV2::QgsGradientFillSymbolLayerV2( QColor color, QColor
mGradientType( gradientType ), mGradientType( gradientType ),
mCoordinateMode( coordinateMode ), mCoordinateMode( coordinateMode ),
mGradientSpread( spread ), mGradientSpread( spread ),
mReferencePoint1( QPointF( 0, 0 ) ), mReferencePoint1( QPointF( 0.5, 0 ) ),
mReferencePoint1IsCentroid( false ), mReferencePoint1IsCentroid( false ),
mReferencePoint2( QPointF( 1, 1 ) ), mReferencePoint2( QPointF( 0.5, 1 ) ),
mReferencePoint2IsCentroid( false ), mReferencePoint2IsCentroid( false ),
mAngle( 0 ), mAngle( 0 ),
mOffsetUnit( QgsSymbolV2::MM ) mOffsetUnit( QgsSymbolV2::MM )
@ -318,9 +318,9 @@ QgsSymbolLayerV2* QgsGradientFillSymbolLayerV2::create( const QgsStringMap& prop
GradientSpread gradientSpread = QgsGradientFillSymbolLayerV2::Pad; GradientSpread gradientSpread = QgsGradientFillSymbolLayerV2::Pad;
//default to gradient from the default fill color to white //default to gradient from the default fill color to white
QColor color = DEFAULT_SIMPLEFILL_COLOR, color2 = Qt::white; QColor color = DEFAULT_SIMPLEFILL_COLOR, color2 = Qt::white;
QPointF referencePoint1 = QPointF( 0, 0 ); QPointF referencePoint1 = QPointF( 0.5, 0 );
bool refPoint1IsCentroid = false; bool refPoint1IsCentroid = false;
QPointF referencePoint2 = QPointF( 1, 1 ); QPointF referencePoint2 = QPointF( 0.5, 1 );
bool refPoint2IsCentroid = false; bool refPoint2IsCentroid = false;
double angle = 0; double angle = 0;
QPointF offset; QPointF offset;

14
src/gui/symbology-ng/qgssymbollayerv2widget.cpp
View File

@ -813,12 +813,26 @@ void QgsGradientFillSymbolLayerV2Widget::setGradientType( int index )
{ {
case 0: case 0:
mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Linear ); mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Linear );
//set sensible default reference points
spinRefPoint1X->setValue( 0.5 );
spinRefPoint1Y->setValue( 0 );
spinRefPoint2X->setValue( 0.5 );
spinRefPoint2Y->setValue( 1 );
break; break;
case 1: case 1:
mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Radial ); mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Radial );
//set sensible default reference points
spinRefPoint1X->setValue( 0 );
spinRefPoint1Y->setValue( 0 );
spinRefPoint2X->setValue( 1 );
spinRefPoint2Y->setValue( 1 );
break; break;
case 2: case 2:
mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Conical ); mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Conical );
spinRefPoint1X->setValue( 0.5 );
spinRefPoint1Y->setValue( 0.5 );
spinRefPoint2X->setValue( 1 );
spinRefPoint2Y->setValue( 1 );
break; break;
} }
emit changed(); emit changed();

5
src/ui/symbollayer/widget_gradientfill.ui
View File

@ -207,6 +207,9 @@
<property name="singleStep"> <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="value">
<double>0.500000000000000</double>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -276,7 +279,7 @@
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="value"> <property name="value">
<double>1.000000000000000</double> <double>0.500000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>