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

Address review

Browse Source
This commit is contained in:
nirvn 2021-03-17 16:08:23 +07:00
parent 01f1f0c78a
commit 2cbb1307cb
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/symbology/qgsmarkersymbollayer.sip.in
View File

@ -52,7 +52,7 @@ leaves the actual drawing of the symbols to subclasses.
Octagon, Octagon,
SquareWithCorners, SquareWithCorners,
AsteriskFill, AsteriskFill,
SemiArc, HalfArc,
ThirdArc, ThirdArc,
QuarterArc, QuarterArc,
}; };

4
src/core/symbology/qgsellipsesymbollayer.cpp
View File

@ -641,7 +641,7 @@ void QgsEllipseSymbolLayer::preparePath( const QString &symbolName, QgsSymbolRen
mPainterPath.lineTo( 0, -size.height() / 2.0 ); mPainterPath.lineTo( 0, -size.height() / 2.0 );
mPainterPath.lineTo( size.width() / 2.0, size.height() / 2.0 ); mPainterPath.lineTo( size.width() / 2.0, size.height() / 2.0 );
} }
else if ( symbolName == QLatin1String( "semi_arc" ) ) else if ( symbolName == QLatin1String( "half_arc" ) )
{ {
mPainterPath.moveTo( size.width() / 2.0, 0 ); mPainterPath.moveTo( size.width() / 2.0, 0 );
mPainterPath.arcTo( -size.width() / 2.0, -size.height() / 2.0, size.width(), size.height(), 0, 180 ); 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
bool QgsEllipseSymbolLayer::shapeIsFilled( const QString &symbolName ) const bool QgsEllipseSymbolLayer::shapeIsFilled( const QString &symbolName ) const
{ {
return symbolName == QLatin1String( "cross" ) || symbolName == QLatin1String( "arrow" ) || symbolName == QLatin1String( "semi_arc" ) ? false : true; return symbolName == QLatin1String( "cross" ) || symbolName == QLatin1String( "arrow" ) || symbolName == QLatin1String( "half_arc" ) ? false : true;
} }
void QgsEllipseSymbolLayer::setSize( double size ) void QgsEllipseSymbolLayer::setSize( double size )

16
src/core/symbology/qgsmarkersymbollayer.cpp
View File

@ -75,7 +75,7 @@ QList<QgsSimpleMarkerSymbolLayerBase::Shape> QgsSimpleMarkerSymbolLayerBase::ava
<< CrossFill << CrossFill
<< Cross2 << Cross2
<< Line << Line
<< SemiArc << HalfArc
<< ThirdArc << ThirdArc
<< QuarterArc << QuarterArc
<< ArrowHead << ArrowHead
@ -136,7 +136,7 @@ bool QgsSimpleMarkerSymbolLayerBase::shapeIsFilled( QgsSimpleMarkerSymbolLayerBa
case Cross2: case Cross2:
case Line: case Line:
case ArrowHead: case ArrowHead:
case SemiArc: case HalfArc:
case ThirdArc: case ThirdArc:
case QuarterArc: case QuarterArc:
return false; return false;
@ -362,8 +362,8 @@ QgsSimpleMarkerSymbolLayerBase::Shape QgsSimpleMarkerSymbolLayerBase::decodeShap
return LeftHalfTriangle; return LeftHalfTriangle;
else if ( cleaned == QLatin1String( "asterisk_fill" ) ) else if ( cleaned == QLatin1String( "asterisk_fill" ) )
return AsteriskFill; return AsteriskFill;
else if ( cleaned == QLatin1String( "semi_arc" ) ) else if ( cleaned == QLatin1String( "half_arc" ) )
return SemiArc; return HalfArc;
else if ( cleaned == QLatin1String( "third_arc" ) ) else if ( cleaned == QLatin1String( "third_arc" ) )
return ThirdArc; return ThirdArc;
else if ( cleaned == QLatin1String( "quarter_arc" ) ) else if ( cleaned == QLatin1String( "quarter_arc" ) )
@ -430,8 +430,8 @@ QString QgsSimpleMarkerSymbolLayerBase::encodeShape( QgsSimpleMarkerSymbolLayerB
return QStringLiteral( "quarter_circle" ); return QStringLiteral( "quarter_circle" );
case AsteriskFill: case AsteriskFill:
return QStringLiteral( "asterisk_fill" ); return QStringLiteral( "asterisk_fill" );
case SemiArc: case HalfArc:
return QStringLiteral( "semi_arc" ); return QStringLiteral( "half_arc" );
case ThirdArc: case ThirdArc:
return QStringLiteral( "third_arc" ); return QStringLiteral( "third_arc" );
case QuarterArc: case QuarterArc:
@ -653,7 +653,7 @@ bool QgsSimpleMarkerSymbolLayerBase::shapeToPolygon( QgsSimpleMarkerSymbolLayerB
case SemiCircle: case SemiCircle:
case ThirdCircle: case ThirdCircle:
case QuarterCircle: case QuarterCircle:
case SemiArc: case HalfArc:
case ThirdArc: case ThirdArc:
case QuarterArc: case QuarterArc:
return false; return false;
@ -688,7 +688,7 @@ bool QgsSimpleMarkerSymbolLayerBase::prepareMarkerPath( QgsSimpleMarkerSymbolLay
mPath.lineTo( 0, 0 ); mPath.lineTo( 0, 0 );
return true; return true;
case SemiArc: case HalfArc:
mPath.moveTo( 1, 0 ); mPath.moveTo( 1, 0 );
mPath.arcTo( -1, -1, 2, 2, 0, 180 ); mPath.arcTo( -1, -1, 2, 2, 0, 180 );
return true; return true;

4
src/core/symbology/qgsmarkersymbollayer.h
View File

@ -74,9 +74,9 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerBase : public QgsMarkerSymbolLayer
Octagon, //!< Octagon (since QGIS 3.18) Octagon, //!< Octagon (since QGIS 3.18)
SquareWithCorners, //!< A square with diagonal corners (since QGIS 3.18) SquareWithCorners, //!< A square with diagonal corners (since QGIS 3.18)
AsteriskFill, //!< A filled asterisk shape (since QGIS 3.18) AsteriskFill, //!< A filled asterisk shape (since QGIS 3.18)
SemiArc, //!< A line-only semi arc (since QGIS 3.20) HalfArc, //!< A line-only half arc (since QGIS 3.20)
ThirdArc, //!< A line-only one third arc (since QGIS 3.20) ThirdArc, //!< A line-only one third arc (since QGIS 3.20)
QuarterArc, //!< A line-only quarter arc (since QGIS 3.20) QuarterArc, //!< A line-only one quarter arc (since QGIS 3.20)
}; };
//! Returns a list of all available shape types. //! Returns a list of all available shape types.

2
src/gui/symbology/qgsellipsesymbollayerwidget.cpp
View File

@ -66,7 +66,7 @@ QgsEllipseSymbolLayerWidget::QgsEllipseSymbolLayerWidget( QgsVectorLayer *vl, QW
mRotationSpinBox->setClearValue( 0.0 ); mRotationSpinBox->setClearValue( 0.0 );
QStringList names; QStringList names;
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" ); 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" );
int size = mShapeListWidget->iconSize().width(); int size = mShapeListWidget->iconSize().width();
size = std::max( 30, static_cast< int >( std::round( Qgis::UI_SCALE_FACTOR * fontMetrics().horizontalAdvance( 'X' ) * 3 ) ) ); size = std::max( 30, static_cast< int >( std::round( Qgis::UI_SCALE_FACTOR * fontMetrics().horizontalAdvance( 'X' ) * 3 ) ) );