Skip to content

Commit

Permalink
Merge pull request #46453 from Koyaani/unnecessary-instantiation
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-kuhn
m-kuhn committed Dec 13, 2021
2 parents 8150822 + 3cc70bf commit 4e50050
Show file tree
Hide file tree
Showing 21 changed files with 78 additions and 78 deletions.
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolcircle2points.cpp
View file
Expand Up @@ -69,7 +69,7 @@ void QgsMapToolCircle2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )

if ( mTempRubberBand )
{
mCircle = QgsCircle().from2Points( mPoints.at( 0 ), point );
mCircle = QgsCircle::from2Points( mPoints.at( 0 ), point );
mTempRubberBand->setGeometry( mCircle.toCircularString( true ) );
}
}
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolcircle3points.cpp
View file
Expand Up @@ -78,7 +78,7 @@ void QgsMapToolCircle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
break;
case 2:
{
mCircle = QgsCircle().from3Points( mPoints.at( 0 ), mPoints.at( 1 ), point );
mCircle = QgsCircle::from3Points( mPoints.at( 0 ), mPoints.at( 1 ), point );
mTempRubberBand->setGeometry( mCircle.toCircularString( true ) );
}
break;
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptoolcircle3tangents.cpp
View file
Expand Up @@ -83,7 +83,7 @@ void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
mPoints.append( mapPoint( p1 ) );
mPoints.append( mapPoint( p2 ) );
const QgsPoint pos = getFirstPointOnParallels( mPoints.at( 0 ), mPoints.at( 1 ), mPosPoints.at( 0 ), mPoints.at( 2 ), mPoints.at( 3 ), mPosPoints.at( 1 ), mPoints.at( 4 ), mPoints.at( 5 ) );
mCircle = QgsCircle().from3Tangents( mPoints.at( 0 ), mPoints.at( 1 ), mPoints.at( 2 ), mPoints.at( 3 ), mPoints.at( 4 ), mPoints.at( 5 ), 1E-8, pos );
mCircle = QgsCircle::from3Tangents( mPoints.at( 0 ), mPoints.at( 1 ), mPoints.at( 2 ), mPoints.at( 3 ), mPoints.at( 4 ), mPoints.at( 5 ), 1E-8, pos );
if ( mCircle.isEmpty() )
{
QgisApp::instance()->messageBar()->pushMessage( tr( "Error" ), tr( "The three segments are parallel" ), Qgis::MessageLevel::Critical );
Expand Down Expand Up @@ -121,7 +121,7 @@ void QgsMapToolCircle3Tangents::cadCanvasMoveEvent( QgsMapMouseEvent *e )
if ( mPoints.size() == 4 )
{
const QgsPoint pos = getFirstPointOnParallels( mPoints.at( 0 ), mPoints.at( 1 ), mPosPoints.at( 0 ), mPoints.at( 2 ), mPoints.at( 3 ), mPosPoints.at( 1 ), QgsPoint( p1 ), QgsPoint( p2 ) );
mCircle = QgsCircle().from3Tangents( mPoints.at( 0 ), mPoints.at( 1 ), mPoints.at( 2 ), mPoints.at( 3 ), QgsPoint( p1 ), QgsPoint( p2 ), 1E-8, pos );
mCircle = QgsCircle::from3Tangents( mPoints.at( 0 ), mPoints.at( 1 ), mPoints.at( 2 ), mPoints.at( 3 ), QgsPoint( p1 ), QgsPoint( p2 ), 1E-8, pos );
mTempRubberBand->setGeometry( mCircle.toLineString() );
mTempRubberBand->show();
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolcirclecenterpoint.cpp
View file
Expand Up @@ -70,7 +70,7 @@ void QgsMapToolCircleCenterPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )

if ( mTempRubberBand )
{
mCircle = QgsCircle().fromCenterPoint( mPoints.at( 0 ), point );
mCircle = QgsCircle::fromCenterPoint( mPoints.at( 0 ), point );
mTempRubberBand->setGeometry( mCircle.toCircularString( true ) );
}
}
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolellipsecenter2points.cpp
View file
Expand Up @@ -80,7 +80,7 @@ void QgsMapToolEllipseCenter2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
break;
case 2:
{
mEllipse = QgsEllipse().fromCenter2Points( mPoints.at( 0 ), mPoints.at( 1 ), point );
mEllipse = QgsEllipse::fromCenter2Points( mPoints.at( 0 ), mPoints.at( 1 ), point );
mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );
}
break;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolellipsecenterpoint.cpp
View file
Expand Up @@ -66,7 +66,7 @@ void QgsMapToolEllipseCenterPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )

if ( mTempRubberBand )
{
mEllipse = QgsEllipse().fromCenterPoint( mPoints.at( 0 ), point );
mEllipse = QgsEllipse::fromCenterPoint( mPoints.at( 0 ), point );
mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );
}
}
4 changes: 2 additions & 2 deletions src/app/qgsmaptoolellipseextent.cpp
View file
Expand Up @@ -74,15 +74,15 @@ void QgsMapToolEllipseExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e )
{
if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) )
{
mEllipse = QgsEllipse().fromExtent( mPoints.at( 0 ), point );
mEllipse = QgsEllipse::fromExtent( mPoints.at( 0 ), point );
mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );
}
else
{
const double dist = mPoints.at( 0 ).distance( point );
const double angle = mPoints.at( 0 ).azimuth( point );

mEllipse = QgsEllipse().fromExtent( mPoints.at( 0 ), mPoints.at( 0 ).project( dist, angle ) );
mEllipse = QgsEllipse::fromExtent( mPoints.at( 0 ), mPoints.at( 0 ).project( dist, angle ) );
mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolellipsefoci.cpp
View file
Expand Up @@ -79,7 +79,7 @@ void QgsMapToolEllipseFoci::cadCanvasMoveEvent( QgsMapMouseEvent *e )
break;
case 2:
{
mEllipse = QgsEllipse().fromFoci( mPoints.at( 0 ), mPoints.at( 1 ), point );
mEllipse = QgsEllipse::fromFoci( mPoints.at( 0 ), mPoints.at( 1 ), point );
mTempRubberBand->setGeometry( mEllipse.toPolygon() );
}
break;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolscalefeature.cpp
View file
Expand Up @@ -218,7 +218,7 @@ void QgsMapToolScaleFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setNoAttributes().setFilterRect( selectRect ) );

//find the closest feature
const QgsGeometry pointGeometry = QgsGeometry().fromPointXY( layerCoords );
const QgsGeometry pointGeometry = QgsGeometry::fromPointXY( layerCoords );
if ( pointGeometry.isNull() )
{
return;
Expand Down
4 changes: 2 additions & 2 deletions src/core/geometry/qgsgeometry.cpp
View file
Expand Up @@ -1134,14 +1134,14 @@ static QgsCircle __recMinimalEnclosingCircle( QgsMultiPointXY points, QgsMultiPo
boundary.pop_back();
QgsPointXY p2 = boundary.last();
boundary.pop_back();
circ_mec = QgsCircle().from2Points( QgsPoint( p1 ), QgsPoint( p2 ) );
circ_mec = QgsCircle::from2Points( QgsPoint( p1 ), QgsPoint( p2 ) );
}
break;
default:
QgsPoint p1( boundary.at( 0 ) );
QgsPoint p2( boundary.at( 1 ) );
QgsPoint p3( boundary.at( 2 ) );
circ_mec = QgsCircle().minimalCircleFrom3Points( p1, p2, p3 );
circ_mec = QgsCircle::minimalCircleFrom3Points( p1, p2, p3 );
break;
}
return circ_mec;
Expand Down
6 changes: 3 additions & 3 deletions src/core/metadata/qgslayermetadata.cpp
View file
Expand Up @@ -218,7 +218,7 @@ bool QgsLayerMetadata::readMetadataXml( const QDomElement &metadataElement )
for ( int i = 0; i < instantList.size(); i++ )
{
mnl = instantList.at( i );
const QDateTime d = QDateTime().fromString( mnl.toElement().text(), Qt::ISODate );
const QDateTime d = QDateTime::fromString( mnl.toElement().text(), Qt::ISODate );
const QgsDateTimeRange date = QgsDateTimeRange( d, d );
metadataDates << date;
}
Expand All @@ -227,8 +227,8 @@ bool QgsLayerMetadata::readMetadataXml( const QDomElement &metadataElement )
{
const QDomNode begin = periodList.at( i ).namedItem( QStringLiteral( "start" ) );
const QDomNode end = periodList.at( i ).namedItem( QStringLiteral( "end" ) );
const QDateTime beginDate = QDateTime().fromString( begin.toElement().text(), Qt::ISODate );
const QDateTime endDate = QDateTime().fromString( end.toElement().text(), Qt::ISODate );
const QDateTime beginDate = QDateTime::fromString( begin.toElement().text(), Qt::ISODate );
const QDateTime endDate = QDateTime::fromString( end.toElement().text(), Qt::ISODate );
const QgsDateTimeRange date = QgsDateTimeRange( beginDate, endDate );
metadataDates << date;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/layertree/qgslayertreeview.cpp
View file
Expand Up @@ -710,7 +710,7 @@ QModelIndex QgsLayerTreeView::node2sourceIndex( QgsLayerTreeNode *node ) const

QgsLayerTreeModelLegendNode *QgsLayerTreeView::index2legendNode( const QModelIndex &index ) const
{
return layerTreeModel()->index2legendNode( mProxyModel->mapToSource( index ) );
return QgsLayerTreeModel::index2legendNode( mProxyModel->mapToSource( index ) );
}

QModelIndex QgsLayerTreeView::legendNode2index( QgsLayerTreeModelLegendNode *legendNode )
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsnewgeopackagelayerdialog.cpp
View file
Expand Up @@ -273,7 +273,7 @@ bool QgsNewGeoPackageLayerDialog::apply()

bool createNewDb = false;

if ( QFile( fileName ).exists( fileName ) )
if ( QFile::exists( fileName ) )
{
bool overwrite = false;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/app/testqgsattributetable.cpp
View file
Expand Up @@ -424,7 +424,7 @@ void TestQgsAttributeTable::testRegression15974()
std::unique_ptr< QgsVectorLayer> shpLayer( new QgsVectorLayer( path, QStringLiteral( "test" ), QStringLiteral( "ogr" ) ) );
QgsFeature f1( shpLayer->dataProvider()->fields(), 1 );
QgsGeometry geom;
geom = QgsGeometry().fromWkt( QStringLiteral( "polygon((0 0, 0 1, 1 1, 1 0, 0 0))" ) );
geom = QgsGeometry::fromWkt( QStringLiteral( "polygon((0 0, 0 1, 1 1, 1 0, 0 0))" ) );
QVERIFY( geom.isGeosValid() );
f1.setGeometry( geom );
QgsFeature f2( shpLayer->dataProvider()->fields(), 2 );
Expand Down
2 changes: 1 addition & 1 deletion tests/src/app/testqgsmaptoolcircle.cpp
View file
Expand Up @@ -296,7 +296,7 @@ void TestQgsMapToolCircle::testCircle_data()
rowStringName = coordinate + " " + mDrawFunctionUserNames[drawMethod];
const QgsAbstractGeometry *ageom = f.geometry().constGet();
Q_ASSERT( ageom != nullptr );
const QgsCompoundCurve *compoundCurveGeom = QgsCompoundCurve().cast( ageom );
const QgsCompoundCurve *compoundCurveGeom = QgsCompoundCurve::cast( ageom );
Q_ASSERT( compoundCurveGeom != nullptr );
const QgsCurve *curveGeom = compoundCurveGeom->curveAt( 0 );
Q_ASSERT( curveGeom != nullptr );
Expand Down
32 changes: 16 additions & 16 deletions tests/src/app/testqgsmaptoolellipse.cpp
View file
Expand Up @@ -144,40 +144,40 @@ void TestQgsMapToolEllipse::initAttributs()
mDrawFunctionPtrMap["FromFoci"] = std::bind( &TestQgsMapToolEllipse::drawEllipseFromFoci, this );
mDrawFunctionPtrMap["FromFociWithDeletedVertex"] = std::bind( &TestQgsMapToolEllipse::drawEllipseFromFociWithDeletedVertex, this );

mExpectedWkts[QStringLiteral( "XY" "CenterAndPoint" )] = QgsEllipse().fromCenterPoint( QgsPoint( 0, 0 ), QgsPoint( 1, -1 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "CenterAndPoint" )] = QgsEllipse::fromCenterPoint( QgsPoint( 0, 0 ), QgsPoint( 1, -1 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "CenterAndPointWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XY" "CenterAndPoint" )];
mExpectedWkts[QStringLiteral( "XY" "CenterAnd2Points" )] = QgsEllipse().fromCenter2Points( QgsPoint( 0, 0 ), QgsPoint( 0, 1 ), QgsPoint( 0, -1 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "CenterAnd2Points" )] = QgsEllipse::fromCenter2Points( QgsPoint( 0, 0 ), QgsPoint( 0, 1 ), QgsPoint( 0, -1 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "CenterAnd2PointsWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XY" "CenterAnd2Points" )];
mExpectedWkts[QStringLiteral( "XY" "FromExtent" )] = QgsEllipse().fromExtent( QgsPoint( 0, 0 ), QgsPoint( 2, 2 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "FromExtent" )] = QgsEllipse::fromExtent( QgsPoint( 0, 0 ), QgsPoint( 2, 2 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "FromExtentWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XY" "FromExtent" )];
mExpectedWkts[QStringLiteral( "XY" "FromFoci" )] = QgsEllipse().fromFoci( QgsPoint( 0, 0 ), QgsPoint( 1, -1 ), QgsPoint( 0, -1 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "FromFoci" )] = QgsEllipse::fromFoci( QgsPoint( 0, 0 ), QgsPoint( 1, -1 ), QgsPoint( 0, -1 ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XY" "FromFociWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XY" "FromFoci" )];

mExpectedWkts[QStringLiteral( "XYZ" "CenterAndPoint" )] = QgsEllipse().fromCenterPoint( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "CenterAndPoint" )] = QgsEllipse::fromCenterPoint( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "CenterAndPointWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZ" "CenterAndPoint" )];
mExpectedWkts[QStringLiteral( "XYZ" "CenterAnd2Points" )] = QgsEllipse().fromCenter2Points( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 0, 1, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "CenterAnd2Points" )] = QgsEllipse::fromCenter2Points( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 0, 1, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "CenterAnd2PointsWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZ" "CenterAnd2Points" )];
mExpectedWkts[QStringLiteral( "XYZ" "FromExtent" )] = QgsEllipse().fromExtent( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 2, 2, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "FromExtent" )] = QgsEllipse::fromExtent( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 2, 2, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "FromExtentWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZ" "FromExtent" )];
mExpectedWkts[QStringLiteral( "XYZ" "FromFoci" )] = QgsEllipse().fromFoci( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "FromFoci" )] = QgsEllipse::fromFoci( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZ ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZ ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZ" "FromFociWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZ" "FromFoci" )];

mExpectedWkts[QStringLiteral( "XYM" "CenterAndPoint" )] = QgsEllipse().fromCenterPoint( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "CenterAndPoint" )] = QgsEllipse::fromCenterPoint( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "CenterAndPointWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYM" "CenterAndPoint" )];
mExpectedWkts[QStringLiteral( "XYM" "CenterAnd2Points" )] = QgsEllipse().fromCenter2Points( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 0, 1, Z, M, QgsWkbTypes::PointM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "CenterAnd2Points" )] = QgsEllipse::fromCenter2Points( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 0, 1, Z, M, QgsWkbTypes::PointM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "CenterAnd2PointsWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYM" "CenterAnd2Points" )];
mExpectedWkts[QStringLiteral( "XYM" "FromExtent" )] = QgsEllipse().fromExtent( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 2, 2, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "FromExtent" )] = QgsEllipse::fromExtent( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 2, 2, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "FromExtentWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYM" "FromExtent" )];
mExpectedWkts[QStringLiteral( "XYM" "FromFoci" )] = QgsEllipse().fromFoci( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "FromFoci" )] = QgsEllipse::fromFoci( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYM" "FromFociWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYM" "FromFoci" )];

mExpectedWkts[QStringLiteral( "XYZM" "CenterAndPoint" )] = QgsEllipse().fromCenterPoint( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "CenterAndPoint" )] = QgsEllipse::fromCenterPoint( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "CenterAndPointWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZM" "CenterAndPoint" )];
mExpectedWkts[QStringLiteral( "XYZM" "CenterAnd2Points" )] = QgsEllipse().fromCenter2Points( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 0, 1, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "CenterAnd2Points" )] = QgsEllipse::fromCenter2Points( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 0, 1, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "CenterAnd2PointsWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZM" "CenterAnd2Points" )];
mExpectedWkts[QStringLiteral( "XYZM" "FromExtent" )] = QgsEllipse().fromExtent( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 2, 2, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "FromExtent" )] = QgsEllipse::fromExtent( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 2, 2, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "FromExtentWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZM" "FromExtent" )];
mExpectedWkts[QStringLiteral( "XYZM" "FromFoci" )] = QgsEllipse().fromFoci( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "FromFoci" )] = QgsEllipse::fromFoci( QgsPoint( 0, 0, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 1, -1, Z, M, QgsWkbTypes::PointZM ), QgsPoint( 0, -1, Z, M, QgsWkbTypes::PointZM ) ).toLineString( segments() )->asWkt( WKT_PRECISION );
mExpectedWkts[QStringLiteral( "XYZM" "FromFociWithDeletedVertex" )] = mExpectedWkts[QStringLiteral( "XYZM" "FromFoci" )];
}

Expand Down

0 comments on commit 4e50050

Please sign in to comment.