Fixes #18252 - Shape digitize (and circular string) tools do not show

rubberband fill color when drawing polygons
2025-03-04 00:30:59 -05:00 · 2018-09-24 12:09:04 +02:00 · 2018-09-24 12:09:04 +02:00 · c0ff2f48f1
commit c0ff2f48f1
parent e8c98f8915
28 changed files with 54 additions and 26 deletions
--- a/src/app/qgsmaptooladdcircle.cpp
+++ b/src/app/qgsmaptooladdcircle.cpp
@ -110,4 +110,8 @@ void QgsMapToolAddCircle::clean()
  }

  mCircle = QgsCircle();
+
+  QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
+  if ( vLayer )
+    layerType = vLayer->geometryType();
 }
--- a/src/app/qgsmaptooladdcircle.h
+++ b/src/app/qgsmaptooladdcircle.h
@ -56,6 +56,8 @@ class APP_EXPORT QgsMapToolAddCircle: public QgsMapToolCapture
    QgsGeometryRubberBand *mTempRubberBand = nullptr;
    //! Circle
    QgsCircle mCircle;
+    //! Layertype which will be used for rubberband
+    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;

 };

--- a/src/app/qgsmaptooladdcircularstring.cpp
+++ b/src/app/qgsmaptooladdcircularstring.cpp
@ -106,6 +106,10 @@ void QgsMapToolAddCircularString::deactivate()

 void QgsMapToolAddCircularString::activate()
 {
+
+  QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
+  if ( vLayer )
+    layerType = vLayer->geometryType();
  if ( mParentTool )
  {
    mParentTool->deleteTempRubberBand();
@ -124,7 +128,7 @@ void QgsMapToolAddCircularString::activate()
          mPoints.append( QgsPoint( mapPoint ) );
          if ( !mTempRubberBand )
          {
-            mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+            mTempRubberBand = createGeometryRubberBand( layerType, true );
            mTempRubberBand->show();
          }
          QgsCircularString *c = new QgsCircularString();
--- a/src/app/qgsmaptooladdcircularstring.h
+++ b/src/app/qgsmaptooladdcircularstring.h
@ -59,6 +59,8 @@ class APP_EXPORT QgsMapToolAddCircularString: public QgsMapToolCapture
    void createCenterPointRubberBand();
    void updateCenterPointRubberBand( const QgsPoint &pt );
    void removeCenterPointRubberBand();
+    //! Layertype which will be used for rubberband
+    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
 };

 #endif // QGSMAPTOOLADDCIRCULARSTRING_H
--- a/src/app/qgsmaptooladdellipse.cpp
+++ b/src/app/qgsmaptooladdellipse.cpp
@ -110,4 +110,8 @@ void QgsMapToolAddEllipse::clean()
  }

  mEllipse = QgsEllipse();
+
+  QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
+  if ( vLayer )
+    layerType = vLayer->geometryType();
 }
--- a/src/app/qgsmaptooladdellipse.h
+++ b/src/app/qgsmaptooladdellipse.h
@ -54,6 +54,8 @@ class APP_EXPORT QgsMapToolAddEllipse: public QgsMapToolCapture
    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; }
+    //! Layertype which will be used for rubberband
+    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;

 };

--- a/src/app/qgsmaptooladdrectangle.cpp
+++ b/src/app/qgsmaptooladdrectangle.cpp
@ -183,4 +183,8 @@ void QgsMapToolAddRectangle::clean()
  }

  mRectangle = QgsBox3d();
+
+  QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
+  if ( vLayer )
+    layerType = vLayer->geometryType();
 }
--- a/src/app/qgsmaptooladdrectangle.h
+++ b/src/app/qgsmaptooladdrectangle.h
@ -77,6 +77,9 @@ class APP_EXPORT QgsMapToolAddRectangle: public QgsMapToolCapture
    //! Returns the side. \see mSide
    int side( ) const { return mSide; }

+    //! Layertype which will be used for rubberband
+    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
+
  private:
    //! Convenient member for the azimuth of the rotated rectangle or when map is rotated.
    double mAzimuth = 0.0;
--- a/src/app/qgsmaptooladdregularpolygon.cpp
+++ b/src/app/qgsmaptooladdregularpolygon.cpp
@ -134,4 +134,9 @@ void QgsMapToolAddRegularPolygon::clean()
  }

  mRegularPolygon = QgsRegularPolygon();
+
+
+  QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
+  if ( vLayer )
+    layerType = vLayer->geometryType();
 }
--- a/src/app/qgsmaptooladdregularpolygon.h
+++ b/src/app/qgsmaptooladdregularpolygon.h
@ -62,6 +62,9 @@ class APP_EXPORT QgsMapToolAddRegularPolygon: public QgsMapToolCapture
    //! Regular shape as a regular polygon
    QgsRegularPolygon mRegularPolygon;

+    //! Layertype which will be used for rubberband
+    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
+
 };

 #endif // QGSMAPTOOLADDREGULARPOLYGON_H
--- a/src/app/qgsmaptoolcircle2points.cpp
+++ b/src/app/qgsmaptoolcircle2points.cpp
@ -36,7 +36,7 @@ void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolcircle2tangentspoint.cpp
+++ b/src/app/qgsmaptoolcircle2tangentspoint.cpp
@ -108,10 +108,7 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
  {
    if ( !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
-      mTempRubberBand->setFillColor( QColor( 0, 0, 255 ) );
-      mTempRubberBand->setStrokeColor( QColor( 0, 0, 255 ) );
-      mTempRubberBand->setStrokeWidth( 2 );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
    else
--- a/src/app/qgsmaptoolcircle3points.cpp
+++ b/src/app/qgsmaptoolcircle3points.cpp
@ -37,7 +37,7 @@ void QgsMapToolCircle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
      mPoints.append( point );
    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolcircle3tangents.cpp
+++ b/src/app/qgsmaptoolcircle3tangents.cpp
@ -79,10 +79,7 @@ void QgsMapToolCircle3Tangents::cadCanvasMoveEvent( QgsMapMouseEvent *e )

  if ( !mTempRubberBand )
  {
-    mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
-    mTempRubberBand->setFillColor( QColor( 0, 0, 255 ) );
-    mTempRubberBand->setStrokeColor( QColor( 0, 0, 255 ) );
-    mTempRubberBand->setStrokeWidth( 2 );
+    mTempRubberBand = createGeometryRubberBand( layerType, true );
    mTempRubberBand->show();
  }
  else
--- a/src/app/qgsmaptoolcirclecenterpoint.cpp
+++ b/src/app/qgsmaptoolcirclecenterpoint.cpp
@ -37,7 +37,7 @@ void QgsMapToolCircleCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }

--- a/src/app/qgsmaptoolcircularstringcurvepoint.cpp
+++ b/src/app/qgsmaptoolcircularstringcurvepoint.cpp
@ -43,7 +43,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent
    {
      if ( !mTempRubberBand )
      {
-        mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+        mTempRubberBand = createGeometryRubberBand( layerType, true );
        mTempRubberBand->show();
      }

@ -57,7 +57,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent
    {
      if ( !mRubberBand )
      {
-        mRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry );
+        mRubberBand = createGeometryRubberBand( layerType );
        mRubberBand->show();
      }

--- a/src/app/qgsmaptoolcircularstringradius.cpp
+++ b/src/app/qgsmaptoolcircularstringradius.cpp
@ -110,7 +110,7 @@ void QgsMapToolCircularStringRadius::recalculateRubberBand()
    int rubberBandSize = mPoints.size() - ( mPoints.size() + 1 ) % 2;
    cString->setPoints( mPoints.mid( 0, rubberBandSize ) );
    delete mRubberBand;
-    mRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry );
+    mRubberBand = createGeometryRubberBand( layerType );
    mRubberBand->setGeometry( cString );
    mRubberBand->show();
  }
@ -141,7 +141,7 @@ void QgsMapToolCircularStringRadius::recalculateTempRubberBand( const QgsPointXY
  QgsCircularString *cString = new QgsCircularString();
  cString->setPoints( rubberBandPoints );
  delete mTempRubberBand;
-  mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+  mTempRubberBand = createGeometryRubberBand( layerType, true );
  mTempRubberBand->setGeometry( cString );
  mTempRubberBand->show();
 }
--- a/src/app/qgsmaptoolellipsecenter2points.cpp
+++ b/src/app/qgsmaptoolellipsecenter2points.cpp
@ -40,7 +40,7 @@ void QgsMapToolEllipseCenter2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolellipsecenterpoint.cpp
+++ b/src/app/qgsmaptoolellipsecenterpoint.cpp
@ -36,7 +36,7 @@ void QgsMapToolEllipseCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolellipseextent.cpp
+++ b/src/app/qgsmaptoolellipseextent.cpp
@ -38,7 +38,7 @@ void QgsMapToolEllipseExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolellipsefoci.cpp
+++ b/src/app/qgsmaptoolellipsefoci.cpp
@ -38,7 +38,7 @@ void QgsMapToolEllipseFoci::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolrectangle3points.cpp
+++ b/src/app/qgsmaptoolrectangle3points.cpp
@ -40,7 +40,7 @@ void QgsMapToolRectangle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolrectanglecenter.cpp
+++ b/src/app/qgsmaptoolrectanglecenter.cpp
@ -39,7 +39,7 @@ void QgsMapToolRectangleCenter::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolrectangleextent.cpp
+++ b/src/app/qgsmaptoolrectangleextent.cpp
@ -39,7 +39,7 @@ void QgsMapToolRectangleExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

    if ( !mPoints.isEmpty() && !mTempRubberBand )
    {
-      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand = createGeometryRubberBand( layerType, true );
      mTempRubberBand->show();
    }
  }
--- a/src/app/qgsmaptoolregularpolygon2points.cpp
+++ b/src/app/qgsmaptoolregularpolygon2points.cpp
@ -46,7 +46,7 @@ void QgsMapToolRegularPolygon2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e
    {
      if ( !mTempRubberBand )
      {
-        mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+        mTempRubberBand = createGeometryRubberBand( layerType, true );
        mTempRubberBand->show();

        createNumberSidesSpinBox();
--- a/src/app/qgsmaptoolregularpolygon2points.h
+++ b/src/app/qgsmaptoolregularpolygon2points.h
@ -30,6 +30,7 @@ class APP_EXPORT QgsMapToolRegularPolygon2Points: public QgsMapToolAddRegularPol

    void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override;
    void cadCanvasMoveEvent( QgsMapMouseEvent *e ) override;
+
 };

 #endif // QGSMAPTOOLREGULARPOLYGON2POINTS_H
--- a/src/app/qgsmaptoolregularpolygoncentercorner.cpp
+++ b/src/app/qgsmaptoolregularpolygoncentercorner.cpp
@ -43,7 +43,7 @@ void QgsMapToolRegularPolygonCenterCorner::cadCanvasReleaseEvent( QgsMapMouseEve
    {
      if ( !mTempRubberBand )
      {
-        mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+        mTempRubberBand = createGeometryRubberBand( layerType, true );
        mTempRubberBand->show();

        createNumberSidesSpinBox();
--- a/src/app/qgsmaptoolregularpolygoncenterpoint.cpp
+++ b/src/app/qgsmaptoolregularpolygoncenterpoint.cpp
@ -43,7 +43,7 @@ void QgsMapToolRegularPolygonCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEven
    {
      if ( !mTempRubberBand )
      {
-        mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+        mTempRubberBand = createGeometryRubberBand( layerType, true );
        mTempRubberBand->show();

        createNumberSidesSpinBox();