Skip to content

Commit

Permalink
Merge pull request #2399 from NaturalGIS/processing_fix_grass7_v_out_ogr
Browse files Browse the repository at this point in the history
fix processing GRASS 7 v.out.ogr
  • Loading branch information
volaya committed Oct 28, 2015
2 parents c866dcc + 77451f9 commit b339ad1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions python/plugins/processing/algs/grass7/Grass7Algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,21 +402,21 @@ def processAlgorithm(self, progress):
outtype = ('auto' if typeidx
is None else self.OUTPUT_TYPES[typeidx])
if self.grass7Name == 'r.flow':
command = 'v.out.ogr type=line layer=0 -c -s -e input=' + out.name + uniqueSufix
command = 'v.out.ogr type=line layer=0 -s -e input=' + out.name + uniqueSufix
elif self.grass7Name == 'v.voronoi':
if '-l' in command:
command = 'v.out.ogr type=line layer=0 -c -s -e input=' + out.name + uniqueSufix
command = 'v.out.ogr type=line layer=0 -s -e input=' + out.name + uniqueSufix
else:
command = 'v.out.ogr -c -s -e input=' + out.name + uniqueSufix
command = 'v.out.ogr -s -e input=' + out.name + uniqueSufix
command += ' type=' + outtype
elif self.grass7Name == 'v.sample':
command = 'v.out.ogr type=point -c -s -e input=' + out.name + uniqueSufix
command = 'v.out.ogr type=point -s -e input=' + out.name + uniqueSufix
else:
command = 'v.out.ogr -c -s -e input=' + out.name + uniqueSufix
command = 'v.out.ogr -s -e input=' + out.name + uniqueSufix
command += ' type=' + outtype
command += ' output="' + os.path.dirname(out.value) + '"'
command += ' format=ESRI_Shapefile'
command += ' olayer=' + os.path.basename(out.value)[:-4]
command += ' output_layer=' + os.path.basename(out.value)[:-4]
commands.append(command)
outputCommands.append(command)

Expand Down

0 comments on commit b339ad1

Please sign in to comment.