Skip to content
Permalink
Browse files

[needs-docs]Rename Node Editor and Node Tool (fixes #17807)

  • Loading branch information
DelazJ committed Jan 30, 2018
1 parent 1194c78 commit 5461d3c52ace8f7afe72b9215a0b0532574294e2
@@ -407,7 +407,7 @@ void QgsNodeTool::cadCanvasPressEvent( QgsMapMouseEvent *e )
if ( mLastMouseMoveMatch.isValid() && mLastMouseMoveMatch.layer() )
{
QMenu menu;
QAction *actionNodeEditor = menu.addAction( tr( "Node editor" ) );
QAction *actionNodeEditor = menu.addAction( tr( "Vertex editor" ) );
connect( actionNodeEditor, &QAction::triggered, this, &QgsNodeTool::showNodeEditor );
menu.exec( mCanvas->mapToGlobal( e->pos() ) );
}
@@ -362,11 +362,11 @@ class APP_EXPORT QgsNodeTool : public QgsMapToolAdvancedDigitizing
//! Geometry cache for fast access to geometries
QHash<const QgsVectorLayer *, QHash<QgsFeatureId, QgsGeometry> > mCache;

// support for node editor
// support for vertex editor

//! most recent match when moving mouse
QgsPointLocator::Match mLastMouseMoveMatch;
//! Selected feature for the node editor
//! Selected feature for the vertex editor
std::unique_ptr<QgsSelectedFeature> mSelectedFeature;
//! Dock widget which allows editing vertices
std::unique_ptr<QgsNodeEditor> mNodeEditor;
@@ -376,7 +376,7 @@ class APP_EXPORT QgsNodeTool : public QgsMapToolAdvancedDigitizing
//! data structure for validation of one geometry of a vector layer
struct GeometryValidation
{
QgsNodeTool *tool = nullptr; //!< Pointer to the parent node tool (for connections / canvas)
QgsNodeTool *tool = nullptr; //!< Pointer to the parent vertex tool (for connections / canvas)
QgsVectorLayer *layer = nullptr; //!< Pointer to the layer of the validated geometry (for reporojection)
QgsGeometryValidator *validator = nullptr; //!< Object that does validation. Non-null if active
QList<QgsVertexMarker *> errorMarkers; //!< Markers created by validation
@@ -76,7 +76,7 @@ QgsPoint QgsGeometryUtils::closestVertex( const QgsAbstractGeometry &geom, const
{
currentDist = QgsGeometryUtils::sqrDistance2D( pt, vertex );
// The <= is on purpose: for geometries with closing vertices, this ensures
// that the closing vertex is retuned. For the node tool, the rubberband
// that the closing vertex is returned. For the vertex tool, the rubberband
// of the closing vertex is above the opening vertex, hence with the <=
// situations where the covered opening vertex rubberband is selected are
// avoided.
@@ -841,7 +841,7 @@
</property>
<property name="toolTip">
<string>Move Feature(s)
&lt;p&gt;Try the Node Tool if snapping is needed&lt;/p&gt;</string>
&lt;p&gt;Try the Vertex Tool if snapping is needed&lt;/p&gt;</string>
</property>
</action>
<action name="mActionReshapeFeatures">
@@ -976,7 +976,7 @@
<normaloff>:/images/themes/default/mActionNodeTool.svg</normaloff>:/images/themes/default/mActionNodeTool.svg</iconset>
</property>
<property name="text">
<string>Node Tool</string>
<string>Vertex Tool</string>
</property>
</action>
<action name="mActionRotatePointSymbols">

0 comments on commit 5461d3c

Please sign in to comment.
You can’t perform that action at this time.