[cad] Implement locked distance logic for 2-circle intersection tool

qgis · Jul 31, 2024 · 99c1c1d · 99c1c1d
1 parent e739843
commit 99c1c1d
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 5 deletions.
diff --git a/python/PyQt6/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in b/python/PyQt6/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in
@@ -403,6 +403,13 @@ Returns the X value of the X soft lock. The value is NaN is the constraint isn't
     double softLockY() const;
 %Docstring
 Returns the Y value of the Y soft lock. The value is NaN is the constraint isn't magnetized to a line
+%End
+
+    void toggleConstraintDistance();
+%Docstring
+Toggles the distance constraint.
+
+.. versionadded:: 3.40
 %End
 
     QgsPointLocator::Match mapPointMatch() const;

diff --git a/python/PyQt6/gui/auto_generated/qgsadvanceddigitizingtools.sip.in b/python/PyQt6/gui/auto_generated/qgsadvanceddigitizingtools.sip.in
@@ -90,6 +90,8 @@ Handles canvas release event.
 Requests a new painting event to the advanced digitizing canvas item.
 %End
 
+  protected:
+
 };
 
 

diff --git a/python/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in b/python/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in
@@ -403,6 +403,13 @@ Returns the X value of the X soft lock. The value is NaN is the constraint isn't
     double softLockY() const;
 %Docstring
 Returns the Y value of the Y soft lock. The value is NaN is the constraint isn't magnetized to a line
+%End
+
+    void toggleConstraintDistance();
+%Docstring
+Toggles the distance constraint.
+
+.. versionadded:: 3.40
 %End
 
     QgsPointLocator::Match mapPointMatch() const;

diff --git a/python/gui/auto_generated/qgsadvanceddigitizingtools.sip.in b/python/gui/auto_generated/qgsadvanceddigitizingtools.sip.in
@@ -90,6 +90,8 @@ Handles canvas release event.
 Requests a new painting event to the advanced digitizing canvas item.
 %End
 
+  protected:
+
 };
 
 

diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -1753,6 +1753,13 @@ void QgsAdvancedDigitizingDockWidget::setPoints( const QList<QgsPointXY> &points
   }
 }
 
+void QgsAdvancedDigitizingDockWidget::toggleConstraintDistance()
+{
+  mDistanceConstraint->toggleLocked();
+  emit lockDistanceChanged( mDistanceConstraint->isLocked() );
+  emit pointChangedV2( mCadPointList.value( 0 ) );
+}
+
 bool QgsAdvancedDigitizingDockWidget::eventFilter( QObject *obj, QEvent *event )
 {
   if ( !cadEnabled() )
@@ -1965,9 +1972,7 @@ bool QgsAdvancedDigitizingDockWidget::filterKeyPress( QKeyEvent *e )
       {
         if ( mCapacities.testFlag( RelativeCoordinates ) && mCapacities.testFlag( Distance ) )
         {
-          mDistanceConstraint->toggleLocked();
-          emit lockDistanceChanged( mDistanceConstraint->isLocked() );
-          emit pointChangedV2( mCadPointList.value( 0 ) );
+          toggleConstraintDistance();
           e->accept();
         }
       }

diff --git a/src/gui/qgsadvanceddigitizingdockwidget.h b/src/gui/qgsadvanceddigitizingdockwidget.h
@@ -410,6 +410,12 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
     //! Returns the Y value of the Y soft lock. The value is NaN is the constraint isn't magnetized to a line
     double softLockY() const { return mSoftLockY; }
 
+    /**
+     * Toggles the distance constraint.
+     * \since QGIS 3.40
+     */
+    void toggleConstraintDistance();
+
     /**
      * Returns the point locator match
      * \since QGIS 3.4

diff --git a/src/gui/qgsadvanceddigitizingtools.cpp b/src/gui/qgsadvanceddigitizingtools.cpp
@@ -142,7 +142,34 @@ QWidget *QgsAdvancedDigitizingCirclesIntersectionTool::createWidget()
   connect( mCircle2Y, static_cast < void ( QgsDoubleSpinBox::* )( double ) > ( &QgsDoubleSpinBox::valueChanged ), this, [ = ]( double ) { processParameters(); } );
   connect( mCircle2Distance, static_cast < void ( QgsDoubleSpinBox::* )( double ) > ( &QgsDoubleSpinBox::valueChanged ), this, [ = ]( double ) { processParameters(); } );
 
-  mCircle1Digitize->setChecked( true );
+
+  bool focusOnCircle2 = false;
+  if ( mCadDockWidget )
+  {
+    if ( mCadDockWidget->constraintDistance()->isLocked() )
+    {
+      QgsPoint point = mCadDockWidget->previousPointV2();
+      if ( !point.isEmpty() )
+      {
+        whileBlocking( mCircle1Distance )->setValue( mCadDockWidget->constraintDistance()->value() );
+        whileBlocking( mCircle1X )->setValue( point.x() );
+        whileBlocking( mCircle1Y )->setValue( point.y() );
+        mP1 = point;
+        focusOnCircle2 = true;
+
+        mCadDockWidget->toggleConstraintDistance();
+      }
+    }
+  }
+
+  if ( focusOnCircle2 )
+  {
+    mCircle2Digitize->setChecked( true );
+  }
+  else
+  {
+    mCircle1Digitize->setChecked( true );
+  }
 
   mToolWidget = toolWidget;
   return toolWidget;
@@ -187,6 +214,7 @@ void QgsAdvancedDigitizingCirclesIntersectionTool::canvasReleaseEvent( QgsMapMou
     mCircle1Y->setValue( event->mapPoint().y() );
     mCircle1Digitize->setChecked( false );
     mCircle1Distance->setFocus();
+    mCircle1Distance->selectAll();
     event->setAccepted( false );
     return;
   }
@@ -196,6 +224,7 @@ void QgsAdvancedDigitizingCirclesIntersectionTool::canvasReleaseEvent( QgsMapMou
     mCircle2Y->setValue( event->mapPoint().y() );
     mCircle2Digitize->setChecked( false );
     mCircle2Distance->setFocus();
+    mCircle2Distance->selectAll();
     event->setAccepted( false );
     return;
   }

diff --git a/src/gui/qgsadvanceddigitizingtools.h b/src/gui/qgsadvanceddigitizingtools.h
@@ -103,7 +103,7 @@ class GUI_EXPORT QgsAdvancedDigitizingTool : public QObject
      */
     void paintRequested();
 
-  private:
+  protected:
 
     QgsMapCanvas *mMapCanvas = nullptr;
     QPointer< QgsAdvancedDigitizingDockWidget > mCadDockWidget;