Skip to content

Commit

Permalink
Merge pull request #3918 from alexbruy/processing-providers
Browse files Browse the repository at this point in the history
Processing providers updates
  • Loading branch information
alexbruy authored Jan 5, 2017
2 parents 52b004a + c5835e9 commit 12ab928
Show file tree
Hide file tree
Showing 29 changed files with 466 additions and 442 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
os.path.split(os.path.dirname(__file__))[0], os.pardir))


class GdalOgrAlgorithmProvider(AlgorithmProvider):
class GdalAlgorithmProvider(AlgorithmProvider):

"""This provider incorporates GDAL-based algorithms into the
Processing framework.
Expand All @@ -100,10 +100,11 @@ def __init__(self):
self.createAlgsList()

def getDescription(self):
return self.tr('GDAL/OGR')
version = GdalUtils.readableVersion()
return 'GDAL ({})'.format(version)

def getName(self):
return 'gdalogr'
return 'gdal'

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdal.svg'))
Expand Down
4 changes: 4 additions & 0 deletions python/plugins/processing/algs/gdal/GdalUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,7 @@ def escapeAndJoin(strList):
@staticmethod
def version():
return int(gdal.VersionInfo('VERSION_NUM'))

@staticmethod
def readableVersion():
return gdal.VersionInfo('RELEASE_NAME')
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridAverage.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))

def commandLineName(self):
return "gdalogr:gridaverage"
return "gdal:gridaverage"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Moving average)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridDataMetrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))

def commandLineName(self):
return "gdalogr:griddatametrics"
return "gdal:griddatametrics"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Data metrics)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridInvDist.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))

def commandLineName(self):
return "gdalogr:gridinvdist"
return "gdal:gridinvdist"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Inverse distance to a power)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridNearest.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))

def commandLineName(self):
return "gdalogr:gridnearestneighbor"
return "gdal:gridnearestneighbor"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Nearest neighbor)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdal2tiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class gdal2tiles(GdalAlgorithm):
WEBVIEWERS = ['all', 'google', 'openlayers', 'leaflet', 'none']

def commandLineName(self):
return "gdalogr:gdal2tiles"
return "gdal:gdal2tiles"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('gdal2tiles')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdaladdo.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-overview.png'))

def commandLineName(self):
return "gdalogr:overviews"
return "gdal:overviews"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Build overviews (pyramids)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/information.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-info.png'))

def commandLineName(self):
return "gdalorg:rasterinfo"
return "gdal:gdalinfo"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Information')
Expand Down
3 changes: 3 additions & 0 deletions python/plugins/processing/algs/gdal/ogrinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ class OgrInfo(GdalAlgorithm):
SUMMARY_ONLY = 'SUMMARY_ONLY'
OUTPUT = 'OUTPUT'

def commandLineName(self):
return "gdal:ogrinfo"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Information')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/polygonize.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'polygonize.png'))

def commandLineName(self):
return "gdalogr:polygonize"
return "gdal:polygonize"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Polygonize (raster to vector)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/proximity.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'proximity.png'))

def commandLineName(self):
return "gdalogr:proximity"
return "gdal:proximity"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Proximity (raster distance)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/rasterize.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'rasterize.png'))

def commandLineName(self):
return "gdalogr:rasterize"
return "gdal:rasterize"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Rasterize (vector to raster)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/rasterize_over.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'rasterize.png'))

def commandLineName(self):
return "gdalogr:rasterize_over"
return "gdal:rasterize_over"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Rasterize (write over existing raster)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/retile.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class retile(GdalAlgorithm):
ALGO = ['near', 'bilinear', 'cubic', 'cubicspline', 'lanczos']

def commandLineName(self):
return "gdalogr:retile"
return "gdal:retile"

def commandName(self):
return "gdal_retile"
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/translate.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'translate.png'))

def commandLineName(self):
return "gdalogr:translate"
return "gdal:translate"

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Translate (convert format)')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ def _loadAlgorithms(self):
self.algs = self.preloadedAlgs

def getDescription(self):
return self.tr('GRASS GIS 7 commands')
version = Grass7Utils.installedVersion()
return 'GRASS GIS ({})'.format(version) if version is not None else "GRASS GIS"

def getName(self):
return 'grass70'
return 'grass7'

def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
Expand Down
43 changes: 38 additions & 5 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from qgis.PyQt.QtCore import QCoreApplication
from processing.core.ProcessingConfig import ProcessingConfig
from processing.core.ProcessingLog import ProcessingLog
from processing.core.SilentProgress import SilentProgress
from processing.tools.system import userFolder, isWindows, isMac, tempFolder, mkdir
from processing.tests.TestData import points

Expand All @@ -56,6 +57,8 @@ class Grass7Utils(object):

isGrass7Installed = False

version = None

@staticmethod
def grassBatchJobFilename():
'''This is used in Linux. This is the batch job that we assign to
Expand All @@ -74,11 +77,41 @@ def grassScriptFilename():
filename = os.path.join(userFolder(), filename)
return filename

#~ @staticmethod
#~ def installedVersion():
#~ out = Grass7Utils.executeGrass7("grass -v")
#~ # FIXME: I do not know if this should be removed or let the user enter it
#~ # or something like that... This is just a temporary thing
#~ return '7.0.0'


@staticmethod
def getGrassVersion():
# FIXME: I do not know if this should be removed or let the user enter it
# or something like that... This is just a temporary thing
return '7.0.0'
def installedVersion(run=False):
if Grass7Utils.isGrass7Installed and not run:
return Grass7Utils.version

if Grass7Utils.grassPath() is None:
return None
commands = ["grass70 -v"]
with subprocess.Popen(
commands,
shell=True,
stdout=subprocess.PIPE,
stdin=subprocess.DEVNULL,
stderr=subprocess.STDOUT,
universal_newlines=True,
) as proc:
try:
lines = proc.stdout.readlines()
for line in lines:
if "GRASS GIS " in line:
Grass7Utils.version = line.split(" ")[-1].strip()
break
except:
pass

return Grass7Utils.version


@staticmethod
def grassPath():
Expand Down Expand Up @@ -140,7 +173,7 @@ def createGrass7Script(commands):
output.write('if "%GRASS_ADDON_PATH%"=="" set PATH=%WINGISBASE%\\bin;%WINGISBASE%\\lib;%PATH%\n')
output.write('if not "%GRASS_ADDON_PATH%"=="" set PATH=%WINGISBASE%\\bin;%WINGISBASE%\\lib;%GRASS_ADDON_PATH%;%PATH%\n')
output.write('\n')
output.write('set GRASS_VERSION=' + Grass7Utils.getGrassVersion() + '\n')
output.write('set GRASS_VERSION=' + Grass7Utils.installedVersion() + '\n')
output.write('if not "%LANG%"=="" goto langset\n')
output.write('FOR /F "usebackq delims==" %%i IN (`"%WINGISBASE%\\etc\\winlocale"`) DO @set LANG=%%i\n')
output.write(':langset\n')
Expand Down
3 changes: 2 additions & 1 deletion python/plugins/processing/algs/otb/OTBAlgorithmProvider.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ def __init__(self):
self.activate = True

def getDescription(self):
return self.tr("Orfeo Toolbox (Image analysis)")
version = OTBUtils.getInstalledVersion()
return "Orfeo ToolBox ({})".format(version) if version is not None else "Orfeo ToolBox"

def getName(self):
return "otb"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ def getName(self):
return 'qgis'

def getDescription(self):
return self.tr('QGIS geoalgorithms')
return 'QGIS'

def getIcon(self):
return self._icon
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def unload(self):

def _loadAlgorithms(self):
self.algs = []
version = SagaUtils.getSagaInstalledVersion(True)
version = SagaUtils.getInstalledVersion(True)
if version is None:
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'))
Expand Down Expand Up @@ -121,8 +121,8 @@ def _loadAlgorithm(self, descriptionFile, version):
self.tr('Could not open SAGA algorithm: %s\n%s' % (descriptionFile, str(e))))

def getDescription(self):
version = SagaUtils.getSagaInstalledVersion()
return 'SAGA (%s)' % version if version is not None else 'SAGA'
version = SagaUtils.getInstalledVersion()
return 'SAGA ({})'.format(version) if version is not None else 'SAGA'

def getName(self):
return 'saga'
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/SagaUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def createSagaBatchJobFileFromSagaCommands(commands):
_installedVersionFound = False


def getSagaInstalledVersion(runSaga=False):
def getInstalledVersion(runSaga=False):
global _installedVersion
global _installedVersionFound

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/core/Processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
from processing.algs.qgis.QGISAlgorithmProvider import QGISAlgorithmProvider
from processing.algs.grass7.Grass7AlgorithmProvider import Grass7AlgorithmProvider
from processing.algs.lidar.LidarToolsAlgorithmProvider import LidarToolsAlgorithmProvider
from processing.algs.gdal.GdalOgrAlgorithmProvider import GdalOgrAlgorithmProvider
from processing.algs.gdal.GdalAlgorithmProvider import GdalAlgorithmProvider
from processing.algs.otb.OTBAlgorithmProvider import OTBAlgorithmProvider
from processing.algs.r.RAlgorithmProvider import RAlgorithmProvider
from processing.algs.saga.SagaAlgorithmProvider import SagaAlgorithmProvider
Expand Down
34 changes: 17 additions & 17 deletions python/plugins/processing/gui/algnames.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
gdalogr:executesql,Execute SQL on vector layer
gdalogr:rasterinfo,Raster layer information
gdalogr:merge,Merge raster layers
gdalogr:ogr2ogr,Export vector layer
gdalogr:vectorinfo,Vector layer information
gdalogr:pcttorgb,PCT to RGB
gdalogr:rgbtopct,RGB to PCT
gdalogr:sieve,Remove small pixel clumps (nearest neighbour)
gdalogr:translate,Export raster layer
gdalogr:warpreproject,Reproject raster layer
gdalogr:polygonize,Vectorize raster layer
gdalogr:gridrasterize,Rasterize vector layer
gdalogr:gridnearestneighbor,Interpolate (Nearest Neighbor)
gdalogr:griddatametrics,Interpolate (Data metrics)
gdalogr:gridinvdist,Interpolate (Inverse distance weighting)
gdalogr:gridaverage,Interpolate (Average)
gdalogr:contour,Contour lines
gdal:executesql,Execute SQL on vector layer
gdal:rasterinfo,Raster layer information
gdal:merge,Merge raster layers
gdal:ogr2ogr,Export vector layer
gdal:vectorinfo,Vector layer information
gdal:pcttorgb,PCT to RGB
gdal:rgbtopct,RGB to PCT
gdal:sieve,Remove small pixel clumps (nearest neighbour)
gdal:translate,Export raster layer
gdal:warpreproject,Reproject raster layer
gdal:polygonize,Vectorize raster layer
gdal:gridrasterize,Rasterize vector layer
gdal:gridnearestneighbor,Interpolate (Nearest Neighbor)
gdal:griddatametrics,Interpolate (Data metrics)
gdal:gridinvdist,Interpolate (Inverse distance weighting)
gdal:gridaverage,Interpolate (Average)
gdal:contour,Contour lines
qgis:creategrid,Create graticule
saga:changegridvalues,Reclassify (simple)
saga:creategraticule,Create graticule from extent
Expand Down
Loading

0 comments on commit 12ab928

Please sign in to comment.