Skip to content
Permalink
Browse files

Merge 5de6e1a into cherry-pick-backport-9365-on-release-3_4-8f9db113-…

…3115-45b1-bee7-365fbdbd7383
  • Loading branch information
backporting committed Mar 13, 2019
2 parents 175eef5 + 5de6e1a commit 90b997a8e361bd0e91e5131e50a9c824338a6e0f
Showing with 1 addition and 5 deletions.
  1. +0 −3 src/gui/qgsadvanceddigitizingdockwidget.cpp
  2. +1 −2 src/gui/qgsadvanceddigitizingdockwidget.h
@@ -555,8 +555,6 @@ bool QgsAdvancedDigitizingDockWidget::applyConstraints( QgsMapMouseEvent *e )

mSnapMatch = context.snappingUtils->snapToMap( point );

mSnappedToVertex = mSnapMatch.hasVertex();

// update the point list
updateCurrentPoint( point );

@@ -1028,7 +1026,6 @@ void QgsAdvancedDigitizingDockWidget::clearPoints()
{
mCadPointList.clear();
mSnappedSegment.clear();
mSnappedToVertex = false;

updateCapacity();
}
@@ -316,7 +316,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
/**
* Is it snapped to a vertex
*/
inline bool snappedToVertex() const { return mSnappedToVertex; }
inline bool snappedToVertex() const { return ( mSnapMatch.isValid() && mSnapMatch.hasVertex() ); }

/**
* Snapped to a segment
@@ -484,7 +484,6 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
// point list and current snap point / segment
QList<QgsPointXY> mCadPointList;
QList<QgsPointXY> mSnappedSegment;
bool mSnappedToVertex = false;

bool mSessionActive = false;

0 comments on commit 90b997a

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