- Increases the number of segments for QgsMapToolAddEllipse

lbartoletti · lbartoletti · commit 00e12bc303b9 · 2017-10-09T23:05:16.000+02:00
diff --git a/src/app/qgsmaptooladdellipse.cpp b/src/app/qgsmaptooladdellipse.cpp
@@ -66,7 +66,7 @@ void QgsMapToolAddEllipse::deactivate()
   }
 
   mParentTool->clearCurve();
-  mParentTool->addCurve( mEllipse.toLineString() );
+  mParentTool->addCurve( mEllipse.toLineString( segments() ) );
   clean();
 
   QgsMapToolCapture::deactivate();
diff --git a/src/app/qgsmaptooladdellipse.h b/src/app/qgsmaptooladdellipse.h
@@ -18,6 +18,7 @@
 
 #include "qgsmaptoolcapture.h"
 #include "qgsellipse.h"
+#include "qgssettings.h"
 
 class QgsGeometryRubberBand;
 
@@ -49,6 +50,8 @@ class QgsMapToolAddEllipse: public QgsMapToolCapture
     QgsGeometryRubberBand *mTempRubberBand = nullptr;
     //! Ellipse
     QgsEllipse mEllipse;
+    //! convenient method to return the number of segments
+    unsigned int segments( ) { return QgsSettings().value( QStringLiteral( "/qgis/digitizing/offset_quad_seg" ), 8 ).toInt() * 12; }
 
   private:
     //! convenient method to clean members
diff --git a/src/app/qgsmaptoolellipsecenter2points.cpp b/src/app/qgsmaptoolellipsecenter2points.cpp
@@ -73,7 +73,7 @@ void QgsMapToolEllipseCenter2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
       case 2:
       {
         mEllipse = QgsEllipse().fromCenter2Points( mPoints.at( 0 ), mPoints.at( 1 ), mapPoint );
-        mTempRubberBand->setGeometry( mEllipse.toPolygon() );
+        mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );
       }
       break;
       default:
diff --git a/src/app/qgsmaptoolellipsecenterpoint.cpp b/src/app/qgsmaptoolellipsecenterpoint.cpp
@@ -56,6 +56,6 @@ void QgsMapToolEllipseCenterPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
   if ( mTempRubberBand )
   {
     mEllipse = QgsEllipse().fromCenterPoint( mPoints.at( 0 ), mapPoint );
-    mTempRubberBand->setGeometry( mEllipse.toPolygon() );
+    mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );
   }
 }
diff --git a/src/app/qgsmaptoolellipseextent.cpp b/src/app/qgsmaptoolellipseextent.cpp
@@ -63,7 +63,7 @@ void QgsMapToolEllipseExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e )
         if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) )
         {
           mEllipse = QgsEllipse().fromExtent( mPoints.at( 0 ), mapPoint );
-          mTempRubberBand->setGeometry( mEllipse.toPolygon() );
+          mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ void QgsMapToolAddEllipse::deactivate()`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`mParentTool->clearCurve();`
`69`		`- mParentTool->addCurve( mEllipse.toLineString() );`
	`69`	`+ mParentTool->addCurve( mEllipse.toLineString( segments() ) );`
`70`	`70`	`clean();`
`71`	`71`
`72`	`72`	`QgsMapToolCapture::deactivate();`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void QgsMapToolEllipseCenter2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`73`	`73`	`case 2:`
`74`	`74`	`{`
`75`	`75`	`mEllipse = QgsEllipse().fromCenter2Points( mPoints.at( 0 ), mPoints.at( 1 ), mapPoint );`
`76`		`- mTempRubberBand->setGeometry( mEllipse.toPolygon() );`
	`76`	`+ mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );`
`77`	`77`	`}`
`78`	`78`	`break;`
`79`	`79`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ void QgsMapToolEllipseCenterPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`56`	`56`	`if ( mTempRubberBand )`
`57`	`57`	`{`
`58`	`58`	`mEllipse = QgsEllipse().fromCenterPoint( mPoints.at( 0 ), mapPoint );`
`59`		`- mTempRubberBand->setGeometry( mEllipse.toPolygon() );`
	`59`	`+ mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void QgsMapToolEllipseExtent::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`63`	`63`	`if ( qgsDoubleNear( mCanvas->rotation(), 0.0 ) )`
`64`	`64`	`{`
`65`	`65`	`mEllipse = QgsEllipse().fromExtent( mPoints.at( 0 ), mapPoint );`
`66`		`- mTempRubberBand->setGeometry( mEllipse.toPolygon() );`
	`66`	`+ mTempRubberBand->setGeometry( mEllipse.toPolygon( segments() ) );`
`67`	`67`	`}`
`68`	`68`	`else`
`69`	`69`	`{`