Skip to content
Permalink
Browse files

Revert "Simplify code"

This reverts commit dea911d.
  • Loading branch information
m-kuhn committed Aug 26, 2018
1 parent 3cd6899 commit 43afffc4a6f17750714a230ef1940d4706a4b2fe
Showing with 6 additions and 1 deletion.
  1. +4 −1 src/gui/qgsmaptoolcapture.cpp
  2. +2 −0 src/gui/qgsmaptoolcapture.h
@@ -42,6 +42,7 @@ QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas *canvas, QgsAdvancedDigitizin
: QgsMapToolAdvancedDigitizing( canvas, cadDockWidget )
, mCaptureMode( mode )
{
mCaptureModeFromLayer = mode == CaptureNone;
mCapturing = false;

mSnapIndicator.reset( new QgsSnapIndicator( canvas ) );
@@ -95,9 +96,11 @@ void QgsMapToolCapture::validationFinished()

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

mCaptureMode = CaptureNone;

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

bool mCaptureModeFromLayer;

std::unique_ptr<QgsSnapIndicator> mSnapIndicator;

/**

0 comments on commit 43afffc

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