Skip to content

Commit 2cbb130

Browse files
nirvnnirvn
committedMar 17, 2021
Address review
·
ltr-3_40final-3_20_0
1 parent 01f1f0c commit 2cbb130

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed
 

‎python/core/auto_generated/symbology/qgsmarkersymbollayer.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ leaves the actual drawing of the symbols to subclasses.
5252
Octagon,
5353
SquareWithCorners,
5454
AsteriskFill,
55-
SemiArc,
55+
HalfArc,
5656
ThirdArc,
5757
QuarterArc,
5858
};

‎src/core/symbology/qgsellipsesymbollayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ void QgsEllipseSymbolLayer::preparePath( const QString &symbolName, QgsSymbolRen
641641
mPainterPath.lineTo( 0, -size.height() / 2.0 );
642642
mPainterPath.lineTo( size.width() / 2.0, size.height() / 2.0 );
643643
}
644-
else if ( symbolName == QLatin1String( "semi_arc" ) )
644+
else if ( symbolName == QLatin1String( "half_arc" ) )
645645
{
646646
mPainterPath.moveTo( size.width() / 2.0, 0 );
647647
mPainterPath.arcTo( -size.width() / 2.0, -size.height() / 2.0, size.width(), size.height(), 0, 180 );
@@ -671,7 +671,7 @@ void QgsEllipseSymbolLayer::preparePath( const QString &symbolName, QgsSymbolRen
671671

672672
bool QgsEllipseSymbolLayer::shapeIsFilled( const QString &symbolName ) const
673673
{
674-
return symbolName == QLatin1String( "cross" ) || symbolName == QLatin1String( "arrow" ) || symbolName == QLatin1String( "semi_arc" ) ? false : true;
674+
return symbolName == QLatin1String( "cross" ) || symbolName == QLatin1String( "arrow" ) || symbolName == QLatin1String( "half_arc" ) ? false : true;
675675
}
676676

677677
void QgsEllipseSymbolLayer::setSize( double size )

‎src/core/symbology/qgsmarkersymbollayer.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ QList<QgsSimpleMarkerSymbolLayerBase::Shape> QgsSimpleMarkerSymbolLayerBase::ava
7575
<< CrossFill
7676
<< Cross2
7777
<< Line
78-
<< SemiArc
78+
<< HalfArc
7979
<< ThirdArc
8080
<< QuarterArc
8181
<< ArrowHead
@@ -136,7 +136,7 @@ bool QgsSimpleMarkerSymbolLayerBase::shapeIsFilled( QgsSimpleMarkerSymbolLayerBa
136136
case Cross2:
137137
case Line:
138138
case ArrowHead:
139-
case SemiArc:
139+
case HalfArc:
140140
case ThirdArc:
141141
case QuarterArc:
142142
return false;
@@ -362,8 +362,8 @@ QgsSimpleMarkerSymbolLayerBase::Shape QgsSimpleMarkerSymbolLayerBase::decodeShap
362362
return LeftHalfTriangle;
363363
else if ( cleaned == QLatin1String( "asterisk_fill" ) )
364364
return AsteriskFill;
365-
else if ( cleaned == QLatin1String( "semi_arc" ) )
366-
return SemiArc;
365+
else if ( cleaned == QLatin1String( "half_arc" ) )
366+
return HalfArc;
367367
else if ( cleaned == QLatin1String( "third_arc" ) )
368368
return ThirdArc;
369369
else if ( cleaned == QLatin1String( "quarter_arc" ) )
@@ -430,8 +430,8 @@ QString QgsSimpleMarkerSymbolLayerBase::encodeShape( QgsSimpleMarkerSymbolLayerB
430430
return QStringLiteral( "quarter_circle" );
431431
case AsteriskFill:
432432
return QStringLiteral( "asterisk_fill" );
433-
case SemiArc:
434-
return QStringLiteral( "semi_arc" );
433+
case HalfArc:
434+
return QStringLiteral( "half_arc" );
435435
case ThirdArc:
436436
return QStringLiteral( "third_arc" );
437437
case QuarterArc:
@@ -653,7 +653,7 @@ bool QgsSimpleMarkerSymbolLayerBase::shapeToPolygon( QgsSimpleMarkerSymbolLayerB
653653
case SemiCircle:
654654
case ThirdCircle:
655655
case QuarterCircle:
656-
case SemiArc:
656+
case HalfArc:
657657
case ThirdArc:
658658
case QuarterArc:
659659
return false;
@@ -688,7 +688,7 @@ bool QgsSimpleMarkerSymbolLayerBase::prepareMarkerPath( QgsSimpleMarkerSymbolLay
688688
mPath.lineTo( 0, 0 );
689689
return true;
690690

691-
case SemiArc:
691+
case HalfArc:
692692
mPath.moveTo( 1, 0 );
693693
mPath.arcTo( -1, -1, 2, 2, 0, 180 );
694694
return true;

‎src/core/symbology/qgsmarkersymbollayer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerBase : public QgsMarkerSymbolLayer
7474
Octagon, //!< Octagon (since QGIS 3.18)
7575
SquareWithCorners, //!< A square with diagonal corners (since QGIS 3.18)
7676
AsteriskFill, //!< A filled asterisk shape (since QGIS 3.18)
77-
SemiArc, //!< A line-only semi arc (since QGIS 3.20)
77+
HalfArc, //!< A line-only half arc (since QGIS 3.20)
7878
ThirdArc, //!< A line-only one third arc (since QGIS 3.20)
79-
QuarterArc, //!< A line-only quarter arc (since QGIS 3.20)
79+
QuarterArc, //!< A line-only one quarter arc (since QGIS 3.20)
8080
};
8181

8282
//! Returns a list of all available shape types.

‎src/gui/symbology/qgsellipsesymbollayerwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ QgsEllipseSymbolLayerWidget::QgsEllipseSymbolLayerWidget( QgsVectorLayer *vl, QW
6666
mRotationSpinBox->setClearValue( 0.0 );
6767

6868
QStringList names;
69-
names << QStringLiteral( "circle" ) << QStringLiteral( "rectangle" ) << QStringLiteral( "diamond" ) << QStringLiteral( "cross" ) << QStringLiteral( "arrow" ) << QStringLiteral( "semi_arc" ) << QStringLiteral( "triangle" ) << QStringLiteral( "right_half_triangle" ) << QStringLiteral( "left_half_triangle" ) << QStringLiteral( "semi_circle" );
69+
names << QStringLiteral( "circle" ) << QStringLiteral( "rectangle" ) << QStringLiteral( "diamond" ) << QStringLiteral( "cross" ) << QStringLiteral( "arrow" ) << QStringLiteral( "half_arc" ) << QStringLiteral( "triangle" ) << QStringLiteral( "right_half_triangle" ) << QStringLiteral( "left_half_triangle" ) << QStringLiteral( "semi_circle" );
7070

7171
int size = mShapeListWidget->iconSize().width();
7272
size = std::max( 30, static_cast< int >( std::round( Qgis::UI_SCALE_FACTOR * fontMetrics().horizontalAdvance( 'X' ) * 3 ) ) );

0 commit comments

Comments
 (0)
Please sign in to comment.