28
28
29
29
from processing .core .parameters import getParameterFromString , ParameterVector , ParameterNumber , ParameterBoolean , ParameterString
30
30
31
+
31
32
def processCommand (alg ):
32
33
""" Handle data preparation for v.net.distance:
33
34
* Integrate point layers into network vector map.
@@ -51,15 +52,15 @@ def processCommand(alg):
51
52
for i , layer in enumerate ([u'from' , u'to' ]):
52
53
# Get a temp layer name
53
54
intLayer = alg .getTempFilename ()
54
-
55
+
55
56
# Grab the from point layer and delete this parameter (not used by v.net.distance)
56
57
point_layer = alg .getParameterValue (layer + u'_points' )
57
58
if point_layer :
58
59
point_layer = alg .exportedLayers [point_layer ]
59
60
paramsToDelete .append (alg .getParameterFromName (layer + u'_points' ))
60
61
61
62
# Create the v.net connect command for point layer integration
62
- command = u"v.net -s input={} points={} out={} op=connect threshold={} arc_layer=1 node_layer={}" .format ( line_layer , point_layer , intLayer , threshold , i + 2 )
63
+ command = u"v.net -s input={} points={} out={} op=connect threshold={} arc_layer=1 node_layer={}" .format (line_layer , point_layer , intLayer , threshold , i + 2 )
63
64
alg .commands .append (command )
64
65
line_layer = intLayer
65
66
@@ -68,20 +69,20 @@ def processCommand(alg):
68
69
if not parameter :
69
70
parameter = getParameterFromString (u'ParameterNumber|{0}_layer|{0} layer number|1|3|2|False' .format (layer ))
70
71
alg .addParameter (parameter )
71
- parameter .setValue (i + 2 )
72
+ parameter .setValue (i + 2 )
72
73
73
74
# Make the connection with attribute table
74
- command = u"v.db.connect -o map={} table={} layer={}" .format (line_layer , point_layer , i + 2 )
75
+ command = u"v.db.connect -o map={} table={} layer={}" .format (line_layer , point_layer , i + 2 )
75
76
alg .commands .append (command )
76
-
77
+
77
78
alg .setParameterValue (u'input' , line_layer )
78
79
79
80
# Delete some unnecessary parameters
80
81
for param in paramsToDelete :
81
82
alg .parameters .remove (param )
82
83
83
84
alg .processCommand ()
84
-
85
+
85
86
# Bring back the parameters:
86
87
for param in paramsToDelete :
87
88
alg .parameters .append (param )
0 commit comments