From 42885bfbb7f15eb83bbc9812123734cc9b22839b Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Sun, 5 Jan 2020 14:55:12 +1000 Subject: [PATCH] [needs-docs][processing] Move Build Vector VRT to gdal provider and setup alias to avoid script/model breakage. This algorithm uses GDAL utilities and fits better alongside the other GDAL based algorithm rather than in the qgis provider. --- .../algs/{qgis => gdal}/Datasources2Vrt.py | 14 ++++++++++---- .../processing/algs/gdal/GdalAlgorithmProvider.py | 3 +++ .../processing/algs/qgis/QgisAlgorithmProvider.py | 2 -- 3 files changed, 13 insertions(+), 6 deletions(-) rename python/plugins/processing/algs/{qgis => gdal}/Datasources2Vrt.py (93%) diff --git a/python/plugins/processing/algs/qgis/Datasources2Vrt.py b/python/plugins/processing/algs/gdal/Datasources2Vrt.py similarity index 93% rename from python/plugins/processing/algs/qgis/Datasources2Vrt.py rename to python/plugins/processing/algs/gdal/Datasources2Vrt.py index a3f64116a66..99409dd43c5 100644 --- a/python/plugins/processing/algs/qgis/Datasources2Vrt.py +++ b/python/plugins/processing/algs/gdal/Datasources2Vrt.py @@ -30,21 +30,24 @@ from qgis.core import (QgsProcessing, QgsProcessingParameterVectorDestination, QgsProcessingOutputString ) -from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm +from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalUtils import GdalUtils -class Datasources2Vrt(QgisAlgorithm): +class Datasources2Vrt(GdalAlgorithm): INPUT = 'INPUT' UNIONED = 'UNIONED' OUTPUT = 'OUTPUT' VRT_STRING = 'VRT_STRING' + def createCustomParametersWidget(self, parent): + return None + def group(self): - return self.tr('Vector general') + return self.tr('Vector miscellaneous') def groupId(self): - return 'vectorgeneral' + return 'vectormiscellaneous' def name(self): return 'buildvirtualvector' @@ -52,6 +55,9 @@ class Datasources2Vrt(QgisAlgorithm): def displayName(self): return self.tr('Build virtual vector') + def tags(self): + return ['ogr', 'gdal', 'vrt', 'create'] + def __init__(self): super().__init__() diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py index 988599ff801..bd10cdbf107 100644 --- a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py +++ b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py @@ -38,6 +38,7 @@ from .ClipRasterByExtent import ClipRasterByExtent from .ClipRasterByMask import ClipRasterByMask from .ColorRelief import ColorRelief from .contour import contour +from .Datasources2Vrt import Datasources2Vrt from .fillnodata import fillnodata from .gdalinfo import gdalinfo from .gdal2tiles import gdal2tiles @@ -99,6 +100,7 @@ class GdalAlgorithmProvider(QgsProcessingProvider): def __init__(self): super().__init__() self.algs = [] + QgsApplication.processingRegistry().addAlgorithmAlias('qgis:buildvirtualvector', 'gdal:buildvirtualvector') def load(self): ProcessingConfig.settingIcons[self.name()] = self.icon() @@ -145,6 +147,7 @@ class GdalAlgorithmProvider(QgsProcessingProvider): ClipRasterByMask(), ColorRelief(), contour(), + Datasources2Vrt(), fillnodata(), gdalinfo(), gdal2tiles(), diff --git a/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py index 44c40a9ae10..9d141b174c0 100644 --- a/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py +++ b/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py @@ -35,7 +35,6 @@ from .BoxPlot import BoxPlot from .CheckValidity import CheckValidity from .Climb import Climb from .ConcaveHull import ConcaveHull -from .Datasources2Vrt import Datasources2Vrt from .DefineProjection import DefineProjection from .Delaunay import Delaunay from .DeleteColumn import DeleteColumn @@ -117,7 +116,6 @@ class QgisAlgorithmProvider(QgsProcessingProvider): CheckValidity(), Climb(), ConcaveHull(), - Datasources2Vrt(), DefineProjection(), Delaunay(), DeleteColumn(),