sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-04 00:04:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3514 from volaya/grass_icon_fix

Browse Source 
[processing] fixed grass icon loading
This commit is contained in:
volaya 2016-09-21 13:29:35 +02:00 committed by GitHub
commit e4e5cda685
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/plugins/processing/algs/grass/GrassAlgorithm.py
View File

@ -84,6 +84,7 @@ class GrassAlgorithm(GeoAlgorithm):
self.descriptionFile = descriptionfile
self.defineCharacteristicsFromFile()
self.numExportedLayers = 0
self._icon = None
def getCopy(self):
newone = GrassAlgorithm(self.descriptionFile)
@ -91,7 +92,10 @@ class GrassAlgorithm(GeoAlgorithm):
return newone
def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
if self._icon is None:
self._icon = QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
return self._icon
def help(self):
return False, 'http://grass.osgeo.org/grass64/manuals/' + self.grassName + '.html'
@ -158,7 +162,7 @@ class GrassAlgorithm(GeoAlgorithm):
elif isinstance(output, OutputVector):
vectorOutputs += 1
if isinstance(output, OutputHTML):
self.addOutput(OutputFile("rawoutput", output.description +
self.addOutput(OutputFile("rawoutput", output.description +
" (raw output)", "txt"))
line = lines.readline().strip('\n').strip()
except Exception as e:
@ -180,7 +184,7 @@ class GrassAlgorithm(GeoAlgorithm):
if hasVectorInput:
param = ParameterNumber(self.GRASS_SNAP_TOLERANCE_PARAMETER,
'v.in.ogr snap tolerance (-1 = no snap)',
-1, None, -1.0)
- 1, None, -1.0)
param.isAdvanced = True
self.addParameter(param)
param = ParameterNumber(self.GRASS_MIN_AREA_PARAMETER,

9
python/plugins/processing/algs/grass7/Grass7Algorithm.py
View File

@ -83,6 +83,7 @@ class Grass7Algorithm(GeoAlgorithm):
self.descriptionFile = descriptionfile
self.defineCharacteristicsFromFile()
self.numExportedLayers = 0
self._icon = None
self.uniqueSufix = unicode(uuid.uuid4()).replace('-', '')
# Use the ext mechanism
@ -98,7 +99,9 @@ class Grass7Algorithm(GeoAlgorithm):
return newone
def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
if self._icon is None:
self._icon = QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
return self._icon
def help(self):
localDoc = None
@ -192,7 +195,7 @@ class Grass7Algorithm(GeoAlgorithm):
elif isinstance(output, OutputVector):
vectorOutputs += 1
if isinstance(output, OutputHTML):
self.addOutput(OutputFile("rawoutput", output.description +
self.addOutput(OutputFile("rawoutput", output.description +
" (raw output)", "txt"))
line = lines.readline().strip('\n').strip()
except Exception as e:
@ -214,7 +217,7 @@ class Grass7Algorithm(GeoAlgorithm):
if hasVectorInput:
param = ParameterNumber(self.GRASS_SNAP_TOLERANCE_PARAMETER,
'v.in.ogr snap tolerance (-1 = no snap)',
-1, None, -1.0)
- 1, None, -1.0)
param.isAdvanced = True
self.addParameter(param)
param = ParameterNumber(self.GRASS_MIN_AREA_PARAMETER,