Fix #38493 Circle Shape tool when layer crs != map crs

qgis · Apr 2, 2023 · 5f732bd · 5f732bd
1 parent 66e038e
commit 5f732bd
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/app/maptools/qgsmaptoolshapecircleabstract.cpp b/src/app/maptools/qgsmaptoolshapecircleabstract.cpp
@@ -15,6 +15,9 @@
 
 #include "qgsmaptoolshapecircleabstract.h"
 #include "qgsmaptoolcapture.h"
+#include "qgsmapcanvas.h"
+#include "qgssettingsentryimpl.h"
+#include "qgssettingsregistrycore.h"
 
 void QgsMapToolShapeCircleAbstract::clean()
 {
@@ -29,7 +32,19 @@ void QgsMapToolShapeCircleAbstract::addCircleToParentTool()
 
   mParentTool->clearCurve();
 
-  std::unique_ptr<QgsCircularString> lineString( mCircle.toCircularString() );
-
-  mParentTool->addCurve( lineString.release() );
+  // Check whether to draw the circle as a polygon or a circular string
+  auto layerCrs = mParentTool->layer()->crs();
+  auto mapCrs = mParentTool->canvas()->mapSettings().destinationCrs();
+  bool drawAsPolygon = layerCrs != mapCrs;
+  if ( drawAsPolygon )
+  {
+    int segments = QgsSettingsRegistryCore::settingsDigitizingOffsetQuadSeg->value() * 12;
+    std::unique_ptr<QgsLineString> ls( mCircle.toLineString( segments ) );
+    mParentTool->addCurve( ls.release() );
+  }
+  else
+  {
+    std::unique_ptr<QgsCircularString> ls( mCircle.toCircularString() );
+    mParentTool->addCurve( ls.release() );
+  }
 }