Use circles for digitized point marker, not square

qgis · Nov 19, 2022 · ec6cf0a · ec6cf0a
1 parent a6ede27
commit ec6cf0a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -57,6 +57,8 @@ std::unique_ptr<QgsHighlight> QgsMapToolAddFeature::createHighlight( QgsVectorLa
 {
   std::unique_ptr< QgsHighlight > highlight = std::make_unique< QgsHighlight >( mCanvas, f.geometry(), layer );
   highlight->applyDefaultStyle();
+  highlight->mPointSizeRadiusMM = 1.0;
+  highlight->mPointSymbol = QgsHighlight::PointSymbol::Circle;
   return highlight;
 };
 

diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
@@ -414,9 +414,9 @@ void QgsHighlight::paint( QPainter *p )
         setRenderContextVariables( p, mRenderContext );
 
         // default to 1.5 mm radius square points
-        double pointSizeRadius = 1.5;
+        double pointSizeRadius = mPointSizeRadiusMM;
         QgsUnitTypes::RenderUnit sizeUnit = QgsUnitTypes::RenderMillimeters;
-        PointSymbol symbol = Square;
+        PointSymbol symbol = mPointSymbol;
 
         // but for point clouds, use actual sizes (+a little margin!)
         if ( QgsPointCloudLayer *pcLayer = qobject_cast<QgsPointCloudLayer *>( mLayer ) )

diff --git a/src/gui/qgshighlight.h b/src/gui/qgshighlight.h
@@ -217,6 +217,11 @@ class GUI_EXPORT QgsHighlight : public QgsMapCanvasItem
     double mBuffer = 0; // line / stroke buffer in pixels
     double mMinWidth = 0; // line / stroke minimum width in pixels
     QgsRenderContext mRenderContext;
+
+    // we don't want to make PointSymbol public for now, so just grant access selectively via a friend
+    friend class QgsMapToolAddFeature;
+    double mPointSizeRadiusMM = 1.5;
+    PointSymbol mPointSymbol = PointSymbol::Square;
 };
 
 #endif