Fix snapping configuration to snap only to editable layers

wonder-sk · wonder-sk · commit 9619d5e75d87 · 2017-04-06T18:59:45.000+08:00
diff --git a/src/app/nodetool/qgsnodetool2.cpp b/src/app/nodetool/qgsnodetool2.cpp
@@ -601,11 +601,11 @@ QgsPointLocator::Match QgsNodeTool2::snapToEditableLayer( QgsMapMouseEvent *e )
   Q_FOREACH ( QgsMapLayer *layer, canvas()->layers() )
   {
     QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
-    if ( !vlayer || !vlayer->isEditable() )
+    if ( !vlayer )
       continue;
 
     config.setIndividualLayerSettings( vlayer, QgsSnappingConfig::IndividualLayerSettings(
-                                         true, QgsSnappingConfig::VertexAndSegment, tol, QgsTolerance::ProjectUnits ) );
+                                         vlayer->isEditable(), QgsSnappingConfig::VertexAndSegment, tol, QgsTolerance::ProjectUnits ) );
   }
 
   QgsSnappingUtils *snapUtils = canvas()->snappingUtils();

Original file line number	Diff line number	Diff line change
`@@ -601,11 +601,11 @@ QgsPointLocator::Match QgsNodeTool2::snapToEditableLayer( QgsMapMouseEvent *e )`
`601`	`601`	`Q_FOREACH ( QgsMapLayer *layer, canvas()->layers() )`
`602`	`602`	`{`
`603`	`603`	`QgsVectorLayer vlayer = qobject_cast<QgsVectorLayer >( layer );`
`604`		`- if ( !vlayer \|\| !vlayer->isEditable() )`
	`604`	`+ if ( !vlayer )`
`605`	`605`	`continue;`
`606`	`606`
`607`	`607`	`config.setIndividualLayerSettings( vlayer, QgsSnappingConfig::IndividualLayerSettings(`
`608`		`- true, QgsSnappingConfig::VertexAndSegment, tol, QgsTolerance::ProjectUnits ) );`
	`608`	`+ vlayer->isEditable(), QgsSnappingConfig::VertexAndSegment, tol, QgsTolerance::ProjectUnits ) );`
`609`	`609`	`}`
`610`	`610`
`611`	`611`	`QgsSnappingUtils *snapUtils = canvas()->snappingUtils();`