[cad] fix graphical glitches

olivierdalang · m-kuhn · commit 8fe1271c33f9 · 2019-06-11T17:59:06.000+02:00
diff --git a/python/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in b/python/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in
@@ -264,6 +264,13 @@ Removes all points from the CAD point list
 Adds point to the CAD point list
 
 .. versionadded:: 3.0
+%End
+
+    void removePreviousPoint();
+%Docstring
+Remove previous point in the CAD point list
+
+.. versionadded:: 3.8
 %End
 
     void setPoints( const QList<QgsPointXY> &points );
diff --git a/python/gui/auto_generated/qgsmaptooladvanceddigitizing.sip.in b/python/gui/auto_generated/qgsmaptooladvanceddigitizing.sip.in
@@ -117,6 +117,8 @@ This method is protected because it should be a decision of the map tool and not
 .. versionadded:: 3.0
 %End
 
+
+
   public:
 
     virtual void cadCanvasPressEvent( QgsMapMouseEvent *e );
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -1020,6 +1020,7 @@ void QgsAdvancedDigitizingDockWidget::addPoint( const QgsPointXY &point )
   }
 
   updateCapacity();
+  updateCadPaintItem();
 }
 
 void QgsAdvancedDigitizingDockWidget::removePreviousPoint()
@@ -1030,6 +1031,7 @@ void QgsAdvancedDigitizingDockWidget::removePreviousPoint()
   int i = pointsCount() > 1 ? 1 : 0;
   mCadPointList.removeAt( i );
   updateCapacity();
+  updateCadPaintItem();
 }
 
 void QgsAdvancedDigitizingDockWidget::clearPoints()
@@ -1038,6 +1040,7 @@ void QgsAdvancedDigitizingDockWidget::clearPoints()
   mSnappedSegment.clear();
 
   updateCapacity();
+  updateCadPaintItem();
 }
 
 void QgsAdvancedDigitizingDockWidget::updateCurrentPoint( const QgsPointXY &point )
@@ -1051,6 +1054,7 @@ void QgsAdvancedDigitizingDockWidget::updateCurrentPoint( const QgsPointXY &poin
   {
     mCadPointList[0] = point;
   }
+  updateCadPaintItem();
 }
 
 
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.h b/src/gui/qgsadvanceddigitizingdockwidget.h
@@ -278,6 +278,12 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
      */
     void addPoint( const QgsPointXY &point );
 
+    /**
+     * Remove previous point in the CAD point list
+     * \since QGIS 3.8
+     */
+    void removePreviousPoint();
+
     /**
      * Configures list of current CAD points
      *
@@ -426,8 +432,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
 
     //! update the current point in the CAD point list
     void updateCurrentPoint( const QgsPointXY &point );
-    //! remove previous point in the CAD point list
-    void removePreviousPoint();
+
 
     /**
      * filters key press
diff --git a/src/gui/qgsmaptooladvanceddigitizing.h b/src/gui/qgsmaptooladvanceddigitizing.h
@@ -107,6 +107,9 @@ class GUI_EXPORT QgsMapToolAdvancedDigitizing : public QgsMapToolEdit
      */
     void setAutoSnapEnabled( bool enabled ) { mAutoSnapEnabled = enabled; }
 
+
+    QgsAdvancedDigitizingDockWidget *mCadDockWidget = nullptr;
+
   public:
 
     /**
@@ -172,7 +175,6 @@ class GUI_EXPORT QgsMapToolAdvancedDigitizing : public QgsMapToolEdit
     void onCurrentLayerChanged();
 
   private:
-    QgsAdvancedDigitizingDockWidget *mCadDockWidget = nullptr;
 
     //! Whether to allow use of advanced digitizing dock at this point
     bool mAdvancedDigitizingAllowed = true;
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -30,6 +30,8 @@
 #include "qgsvectorlayer.h"
 #include "qgsvertexmarker.h"
 #include "qgssettings.h"
+#include "qgsapplication.h"
+#include "qgsadvanceddigitizingdockwidget.h"
 
 #include <QAction>
 #include <QCursor>
@@ -584,6 +586,12 @@ void QgsMapToolCapture::undo()
     mCaptureCurve.deleteVertex( vertexToRemove );
     mSnappingMatches.removeAt( vertexToRemove.vertex );
 
+    // If Cad is enabled, update the points accordingly
+    if ( mCadDockWidget->cadEnabled() )
+    {
+      mCadDockWidget->removePreviousPoint();
+    }
+
     validateGeometry();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1020,6 +1020,7 @@ void QgsAdvancedDigitizingDockWidget::addPoint( const QgsPointXY &point )`
`1020`	`1020`	`}`
`1021`	`1021`
`1022`	`1022`	`updateCapacity();`
	`1023`	`+ updateCadPaintItem();`
`1023`	`1024`	`}`
`1024`	`1025`
`1025`	`1026`	`void QgsAdvancedDigitizingDockWidget::removePreviousPoint()`
`@@ -1030,6 +1031,7 @@ void QgsAdvancedDigitizingDockWidget::removePreviousPoint()`
`1030`	`1031`	`int i = pointsCount() > 1 ? 1 : 0;`
`1031`	`1032`	`mCadPointList.removeAt( i );`
`1032`	`1033`	`updateCapacity();`
	`1034`	`+ updateCadPaintItem();`
`1033`	`1035`	`}`
`1034`	`1036`
`1035`	`1037`	`void QgsAdvancedDigitizingDockWidget::clearPoints()`
`@@ -1038,6 +1040,7 @@ void QgsAdvancedDigitizingDockWidget::clearPoints()`
`1038`	`1040`	`mSnappedSegment.clear();`
`1039`	`1041`
`1040`	`1042`	`updateCapacity();`
	`1043`	`+ updateCadPaintItem();`
`1041`	`1044`	`}`
`1042`	`1045`
`1043`	`1046`	`void QgsAdvancedDigitizingDockWidget::updateCurrentPoint( const QgsPointXY &point )`
`@@ -1051,6 +1054,7 @@ void QgsAdvancedDigitizingDockWidget::updateCurrentPoint( const QgsPointXY &poin`
`1051`	`1054`	`{`
`1052`	`1055`	`mCadPointList[0] = point;`
`1053`	`1056`	`}`
	`1057`	`+ updateCadPaintItem();`
`1054`	`1058`	`}`
`1055`	`1059`
`1056`	`1060`