Skip to content
Permalink
Browse files

Merge pull request #7696 from m-kuhn/initializeCaptureModeNone

Initialize capture mode none
  • Loading branch information
m-kuhn committed Aug 24, 2018
2 parents bf0962f + dea911d commit 61c3fe4a9d0570ba6f7daef8c51595d5c77e6619
Showing with 3 additions and 6 deletions.
  1. +3 −4 src/gui/qgsmaptoolcapture.cpp
  2. +0 −2 src/gui/qgsmaptoolcapture.h
@@ -42,7 +42,6 @@ QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas *canvas, QgsAdvancedDigitizin
: QgsMapToolAdvancedDigitizing( canvas, cadDockWidget )
, mCaptureMode( mode )
{
mCaptureModeFromLayer = mode == CaptureNone;
mCapturing = false;

mSnapIndicator.reset( new QgsSnapIndicator( canvas ) );
@@ -51,6 +50,8 @@ QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas *canvas, QgsAdvancedDigitizin

connect( canvas, &QgsMapCanvas::currentLayerChanged,
this, &QgsMapToolCapture::currentLayerChanged );

currentLayerChanged( canvas->currentLayer() );
}

QgsMapToolCapture::~QgsMapToolCapture()
@@ -94,11 +95,9 @@ void QgsMapToolCapture::validationFinished()

void QgsMapToolCapture::currentLayerChanged( QgsMapLayer *layer )
{
if ( !mCaptureModeFromLayer )
if ( mCaptureMode != CaptureNone )
return;

mCaptureMode = CaptureNone;

QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
if ( !vlayer )
{
@@ -268,8 +268,6 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
QList< QgsGeometry::Error > mGeomErrors;
QList< QgsVertexMarker * > mGeomErrorMarkers;

bool mCaptureModeFromLayer;

std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

/**

0 comments on commit 61c3fe4

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