sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Take into account z dimension from center points

Browse Source
This commit is contained in:
Blottiere Paul 2018-01-15 08:30:53 +00:00
parent 12392f75b3
commit d91bd45749
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/geometry/qgscircle.cpp
View File

@ -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 );
}

4
src/core/geometry/qgsellipse.cpp
View File

@ -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 );
}