Take into account z dimension from center points

pblottiere · pblottiere · commit d91bd4574970 · 2018-02-16T10:06:42.000Z
diff --git a/src/core/geometry/qgscircle.cpp b/src/core/geometry/qgscircle.cpp
@@ -183,7 +183,7 @@ QgsCircle QgsCircle::fromCenterPoint( const QgsPoint &center, const QgsPoint &pt
   double azimuth = QgsGeometryUtils::lineAngle( center.x(), center.y(), pt1.x(), pt1.y() ) * 180.0 / M_PI;
 
   QgsPoint centerPt( center );
-  QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << pt1, centerPt );
+  QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << center << pt1, centerPt );
 
   return QgsCircle( centerPt, centerPt.distance( pt1 ), azimuth );
 }
diff --git a/src/core/geometry/qgsellipse.cpp b/src/core/geometry/qgsellipse.cpp
@@ -81,7 +81,7 @@ QgsEllipse QgsEllipse::fromCenterPoint( const QgsPoint &center, const QgsPoint &
   double azimuth = 90.0;
 
   QgsPoint centerPt( center );
-  QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << pt1, centerPt );
+  QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << center << pt1, centerPt );
 
   return QgsEllipse( centerPt, axis_a, axis_b, azimuth );
 }
@@ -96,7 +96,7 @@ QgsEllipse QgsEllipse::fromCenter2Points( const QgsPoint &center, const QgsPoint
   double axis_b = center.distance( pp );
 
   QgsPoint centerPt( center );
-  QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << pt1 << pt2, centerPt );
+  QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << center << pt1 << pt2, centerPt );
 
   return QgsEllipse( centerPt, axis_a, axis_b, azimuth );
 }

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ QgsCircle QgsCircle::fromCenterPoint( const QgsPoint &center, const QgsPoint &pt`
`183`	`183`	`double azimuth = QgsGeometryUtils::lineAngle( center.x(), center.y(), pt1.x(), pt1.y() ) * 180.0 / M_PI;`
`184`	`184`
`185`	`185`	`QgsPoint centerPt( center );`
`186`		`- QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << pt1, centerPt );`
	`186`	`+ QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << center << pt1, centerPt );`
`187`	`187`
`188`	`188`	`return QgsCircle( centerPt, centerPt.distance( pt1 ), azimuth );`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ QgsEllipse QgsEllipse::fromCenterPoint( const QgsPoint &center, const QgsPoint &`
`81`	`81`	`double azimuth = 90.0;`
`82`	`82`
`83`	`83`	`QgsPoint centerPt( center );`
`84`		`- QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << pt1, centerPt );`
	`84`	`+ QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << center << pt1, centerPt );`
`85`	`85`
`86`	`86`	`return QgsEllipse( centerPt, axis_a, axis_b, azimuth );`
`87`	`87`	`}`
`@@ -96,7 +96,7 @@ QgsEllipse QgsEllipse::fromCenter2Points( const QgsPoint &center, const QgsPoint`
`96`	`96`	`double axis_b = center.distance( pp );`
`97`	`97`
`98`	`98`	`QgsPoint centerPt( center );`
`99`		`- QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << pt1 << pt2, centerPt );`
	`99`	`+ QgsGeometryUtils::setZValueFromPoints( QgsPointSequence() << center << pt1 << pt2, centerPt );`
`100`	`100`
`101`	`101`	`return QgsEllipse( centerPt, axis_a, axis_b, azimuth );`
`102`	`102`	`}`