Refactor CAD editing alignment logic to new QgsCadUtils class

qgis · Oct 3, 2017 · 878dfdd · 878dfdd
1 parent 68bb68d
commit 878dfdd
Show file tree

Hide file tree

Showing 9 changed files with 808 additions and 348 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -476,6 +476,7 @@ QgsAdvancedDigitizingDockWidget        {#qgis_api_break_3_0_QgsAdvancedDigitizin
 
 - canvasPressEvent(), canvasReleaseEvent(), canvasMoveEvent() were removed. Handling of events is done in QgsMapToolAdvancedDigitizing.
 - snappingMode() was removed. Advanced digitizing now always uses project's snapping configuration.
+- lineCircleIntersection() was removed
 
 
 QgsApplication        {#qgis_api_break_3_0_QgsApplication}

diff --git a/python/gui/qgsadvanceddigitizingdockwidget.sip b/python/gui/qgsadvanceddigitizingdockwidget.sip
@@ -11,7 +11,6 @@
 
 
 
-
 class QgsAdvancedDigitizingDockWidget : QgsDockWidget
 {
 %Docstring
@@ -151,14 +150,6 @@ class QgsAdvancedDigitizingDockWidget : QgsDockWidget
 
     };
 
-    static bool lineCircleIntersection( const QgsPointXY &center, const double radius, const QList<QgsPointXY> &segment, QgsPointXY &intersection );
-%Docstring
-.. note::
-
-   from the two solutions, the intersection will be set to the closest point
- :rtype: bool
-%End
-
     explicit QgsAdvancedDigitizingDockWidget( QgsMapCanvas *canvas, QWidget *parent = 0 );
 %Docstring
  Create an advanced digitizing dock widget

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -139,6 +139,7 @@ SET(QGIS_CORE_SRCS
   qgscachedfeatureiterator.cpp
   qgscacheindex.cpp
   qgscacheindexfeatureid.cpp
+  qgscadutils.cpp
   qgsclipper.cpp
   qgscolorramp.cpp
   qgscolorscheme.cpp
@@ -792,6 +793,7 @@ SET(QGIS_CORE_HDRS
   qgscachedfeatureiterator.h
   qgscacheindex.h
   qgscacheindexfeatureid.h
+  qgscadutils.h
   qgsclipper.h
   qgscolorramp.h
   qgscolorscheme.h