[FEATURE] New node tool implementation

qgis · Apr 17, 2017 · e73a52b · e73a52b
2 parents eff5a82 + 47a81f0
commit e73a52b
Show file tree

Hide file tree

Showing 22 changed files with 2,996 additions and 197 deletions.
diff --git a/python/core/geometry/qgsgeometry.sip b/python/core/geometry/qgsgeometry.sip
@@ -827,7 +827,7 @@ class QgsGeometry
      * @note added in QGIS 2.10
      * @see vertexNrFromVertexId
      */
-    bool vertexIdFromVertexNr( int nr, QgsVertexId& id ) const;
+    bool vertexIdFromVertexNr( int nr, QgsVertexId& id /Out/ ) const;
 
     /** Returns the vertex number corresponding to a vertex idd
      * @param i vertex id

diff --git a/python/core/geometry/qgsgeometryutils.sip b/python/core/geometry/qgsgeometryutils.sip
@@ -52,6 +52,12 @@ class QgsGeometryUtils
 
     static double circleTangentDirection( const QgsPointV2& tangentPoint, const QgsPointV2& cp1, const QgsPointV2& cp2, const QgsPointV2& cp3 );
 
+    static void segmentizeArc( const QgsPointV2 &p1, const QgsPointV2 &p2, const QgsPointV2 &p3, QList<QgsPointV2> &points /Out/, double tolerance = M_PI_2 / 90, QgsAbstractGeometry::SegmentationToleranceType toleranceType = QgsAbstractGeometry::MaximumAngle, bool hasZ = false, bool hasM = false );
+
+    static int segmentSide( const QgsPointV2 &pt1, const QgsPointV2 &pt3, const QgsPointV2 &pt2 );
+
+    static double interpolateArcValue( double angle, double a1, double a2, double a3, double zm1, double zm2, double zm3 );
+
     static double normalizedAngle( double angle );
 
     static double lineAngle( double x1, double y1, double x2, double y2 );

diff --git a/python/gui/qgsrubberband.sip b/python/gui/qgsrubberband.sip
@@ -13,7 +13,9 @@ class QgsRubberBand: QgsMapCanvasItem
       ICON_X,
       ICON_BOX,
       ICON_CIRCLE,
-      ICON_FULL_BOX
+      ICON_FULL_BOX,
+      ICON_DIAMOND,
+      ICON_FULL_DIAMOND
     };
 
     QgsRubberBand( QgsMapCanvas* mapCanvas /TransferThis/, QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry );

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -101,6 +101,7 @@ SET(QGIS_APP_SRCS
   nodetool/qgsselectedfeature.cpp
   nodetool/qgsvertexentry.cpp
   nodetool/qgsnodeeditor.cpp
+  nodetool/qgsnodetool2.cpp
 
   qgslayerstylingwidget.cpp
   qgsmeasuredialog.cpp
@@ -282,6 +283,7 @@ SET (QGIS_APP_MOC_HDRS
   nodetool/qgsmaptoolnodetool.h
   nodetool/qgsselectedfeature.h
   nodetool/qgsnodeeditor.h
+  nodetool/qgsnodetool2.h
 
   qgslayerstylingwidget.h
   qgsmeasuredialog.h