Skip to content

Commit

Permalink
Change vertex marker to box and segment marker to double triangle
Browse files Browse the repository at this point in the history
  • Loading branch information
wonder-sk committed Oct 27, 2017
1 parent b508bf7 commit b726ba2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion python/gui/qgsvertexmarker.sip
Expand Up @@ -37,7 +37,8 @@ class QgsVertexMarker : QgsMapCanvasItem
ICON_CROSS,
ICON_X,
ICON_BOX,
ICON_CIRCLE
ICON_CIRCLE,
ICON_DOUBLE_TRIANGLE,
};

QgsVertexMarker( QgsMapCanvas *mapCanvas /TransferThis/ );
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgssnapindicator.cpp
Expand Up @@ -57,13 +57,13 @@ void QgsSnapIndicator::setMatch( const QgsPointLocator::Match &match )
if ( match.hasVertex() )
{
if ( match.layer() )
iconType = QgsVertexMarker::ICON_CROSS; // vertex snap
iconType = QgsVertexMarker::ICON_BOX; // vertex snap
else
iconType = QgsVertexMarker::ICON_X; // intersection snap
}
else // must be segment snap
{
iconType = QgsVertexMarker::ICON_BOX;
iconType = QgsVertexMarker::ICON_DOUBLE_TRIANGLE;
}
mSnappingMarker->setIconType( iconType );

Expand Down
7 changes: 7 additions & 0 deletions src/gui/qgsvertexmarker.cpp
Expand Up @@ -91,6 +91,13 @@ void QgsVertexMarker::paint( QPainter *p )
case ICON_CIRCLE:
p->drawEllipse( QPointF( 0, 0 ), s, s );
break;

case ICON_DOUBLE_TRIANGLE:
p->drawLine( QLineF( -s, -s, s, -s ) );
p->drawLine( QLineF( -s, s, s, s ) );
p->drawLine( QLineF( -s, -s, s, s ) );
p->drawLine( QLineF( s, -s, -s, s ) );
break;
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/gui/qgsvertexmarker.h
Expand Up @@ -53,7 +53,8 @@ class GUI_EXPORT QgsVertexMarker : public QgsMapCanvasItem
ICON_CROSS,
ICON_X,
ICON_BOX,
ICON_CIRCLE
ICON_CIRCLE,
ICON_DOUBLE_TRIANGLE, //!< Added in QGIS 3.0
};

QgsVertexMarker( QgsMapCanvas *mapCanvas SIP_TRANSFERTHIS );
Expand Down

0 comments on commit b726ba2

Please sign in to comment.