Skip to content

Commit e73a52b

Browse files
wonder-skwonder-sk
authoredApr 17, 2017
[FEATURE] New node tool implementation
·
ltr-3_40final-3_0_0
2 parents eff5a82 + 47a81f0 commit e73a52b

22 files changed

+2996
-197
lines changed
 

‎python/core/geometry/qgsgeometry.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ class QgsGeometry
827827
* @note added in QGIS 2.10
828828
* @see vertexNrFromVertexId
829829
*/
830-
bool vertexIdFromVertexNr( int nr, QgsVertexId& id ) const;
830+
bool vertexIdFromVertexNr( int nr, QgsVertexId& id /Out/ ) const;
831831

832832
/** Returns the vertex number corresponding to a vertex idd
833833
* @param i vertex id

‎python/core/geometry/qgsgeometryutils.sip

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ class QgsGeometryUtils
5252

5353
static double circleTangentDirection( const QgsPointV2& tangentPoint, const QgsPointV2& cp1, const QgsPointV2& cp2, const QgsPointV2& cp3 );
5454

55+
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 );
56+
57+
static int segmentSide( const QgsPointV2 &pt1, const QgsPointV2 &pt3, const QgsPointV2 &pt2 );
58+
59+
static double interpolateArcValue( double angle, double a1, double a2, double a3, double zm1, double zm2, double zm3 );
60+
5561
static double normalizedAngle( double angle );
5662

5763
static double lineAngle( double x1, double y1, double x2, double y2 );

‎python/gui/qgsrubberband.sip

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ class QgsRubberBand: QgsMapCanvasItem
1313
ICON_X,
1414
ICON_BOX,
1515
ICON_CIRCLE,
16-
ICON_FULL_BOX
16+
ICON_FULL_BOX,
17+
ICON_DIAMOND,
18+
ICON_FULL_DIAMOND
1719
};
1820

1921
QgsRubberBand( QgsMapCanvas* mapCanvas /TransferThis/, QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry );

‎src/app/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ SET(QGIS_APP_SRCS
101101
nodetool/qgsselectedfeature.cpp
102102
nodetool/qgsvertexentry.cpp
103103
nodetool/qgsnodeeditor.cpp
104+
nodetool/qgsnodetool2.cpp
104105

105106
qgslayerstylingwidget.cpp
106107
qgsmeasuredialog.cpp
@@ -282,6 +283,7 @@ SET (QGIS_APP_MOC_HDRS
282283
nodetool/qgsmaptoolnodetool.h
283284
nodetool/qgsselectedfeature.h
284285
nodetool/qgsnodeeditor.h
286+
nodetool/qgsnodetool2.h
285287

286288
qgslayerstylingwidget.h
287289
qgsmeasuredialog.h

0 commit comments

Comments
 (0)
Please sign in to comment.