Skip to content

Commit 7c779ae

Browse files
committed
[symbology] add diamond ellipse marker
1 parent b7a4e20 commit 7c779ae

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/core/symbology-ng/qgsellipsesymbollayerv2.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,14 @@ void QgsEllipseSymbolLayerV2::preparePath( const QString& symbolName, QgsSymbolV
597597
{
598598
mPainterPath.addRect( QRectF( -size.width() / 2.0, -size.height() / 2.0, size.width(), size.height() ) );
599599
}
600+
else if ( symbolName == "diamond" )
601+
{
602+
mPainterPath.moveTo( -size.width() / 2.0, 0 );
603+
mPainterPath.lineTo( 0, size.height() / 2.0 );
604+
mPainterPath.lineTo( size.width() / 2.0, 0 );
605+
mPainterPath.lineTo( 0, -size.height() / 2.0 );
606+
mPainterPath.lineTo( -size.width() / 2.0, 0 );
607+
}
600608
else if ( symbolName == "cross" )
601609
{
602610
mPainterPath.moveTo( 0, -size.height() / 2.0 );

src/gui/qgsdatadefinedbutton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ QString QgsDataDefinedButton::fillStyleDesc()
896896

897897
QString QgsDataDefinedButton::markerStyleDesc()
898898
{
899-
return trString() + QLatin1String( "[<b>circle</b>|<b>rectangle</b>|<b>cross</b>|<b>triangle"
899+
return trString() + QLatin1String( "[<b>circle</b>|<b>rectangle</b>|<b>diamond</b>|<b>cross</b>|<b>triangle"
900900
"</b>|<b>right_half_triangle</b>|<b>left_half_triangle</b>|<b>semi_circle</b>]" );
901901
}
902902

src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLay
4646
mRotationSpinBox->setClearValue( 0.0 );
4747

4848
QStringList names;
49-
names << "circle" << "rectangle" << "cross" << "triangle" << "right_half_triangle" << "left_half_triangle" << "semi_circle";
49+
names << "circle" << "rectangle" << "diamond" << "cross" << "triangle" << "right_half_triangle" << "left_half_triangle" << "semi_circle";
5050
QSize iconSize = mShapeListWidget->iconSize();
5151

5252
Q_FOREACH ( const QString& name, names )

0 commit comments

Comments
 (0)