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

Cleanup some imports, remove use of dataobjects

Browse Source
This commit is contained in:
Nyall Dawson 2017-07-12 07:44:39 +10:00
parent d92583c10e
commit 7bb1b7ade0
10 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/plugins/processing/algs/qgis/Aspect.py
View File

@ -32,13 +32,8 @@ from qgis.PyQt.QtGui import QIcon
from qgis.analysis import QgsAspectFilter from qgis.analysis import QgsAspectFilter
from qgis.core import (QgsProcessingParameterRasterLayer, from qgis.core import (QgsProcessingParameterRasterLayer,
QgsProcessingParameterNumber, QgsProcessingParameterNumber,
QgsProcessingParameterRasterDestination, QgsProcessingParameterRasterDestination)
QgsProcessingOutputRasterLayer,
QgsFeatureSink)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputRaster
from processing.tools import raster from processing.tools import raster
from processing.tools.dataobjects import exportRasterLayer from processing.tools.dataobjects import exportRasterLayer

2
python/plugins/processing/algs/qgis/BasicStatistics.py
View File

@ -32,11 +32,9 @@ from qgis.PyQt.QtCore import QVariant
from qgis.PyQt.QtGui import QIcon from qgis.PyQt.QtGui import QIcon
from qgis.core import (QgsStatisticalSummary, from qgis.core import (QgsStatisticalSummary,
QgsFeatureSink,
QgsStringStatisticalSummary, QgsStringStatisticalSummary,
QgsDateTimeStatisticalSummary, QgsDateTimeStatisticalSummary,
QgsFeatureRequest, QgsFeatureRequest,
QgsProcessingUtils,
QgsProcessingParameterFeatureSource, QgsProcessingParameterFeatureSource,
QgsProcessingParameterField, QgsProcessingParameterField,
QgsProcessingParameterFileDestination, QgsProcessingParameterFileDestination,

4
python/plugins/processing/algs/qgis/ConcaveHull.py
View File

@ -26,9 +26,7 @@ __copyright__ = '(C) 2014, Piotr Pociask'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
from qgis.core import (QgsFeatureRequest, from qgis.core import (QgsFeature,
QgsFeature,
QgsGeometry,
QgsFeatureSink, QgsFeatureSink,
QgsWkbTypes, QgsWkbTypes,
QgsProcessing, QgsProcessing,

1
python/plugins/processing/algs/qgis/CreateAttributeIndex.py
View File

@ -29,7 +29,6 @@ from qgis.core import (QgsVectorDataProvider,
QgsFields, QgsFields,
QgsProcessingParameterVectorLayer, QgsProcessingParameterVectorLayer,
QgsProcessingParameterField, QgsProcessingParameterField,
QgsProcessingParameterDefinition,
QgsProcessingOutputVectorLayer) QgsProcessingOutputVectorLayer)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

2
python/plugins/processing/algs/qgis/ImportIntoPostGIS.py
View File

@ -27,9 +27,7 @@ __revision__ = '$Format:%H$'
from qgis.core import (QgsVectorLayerExporter, from qgis.core import (QgsVectorLayerExporter,
QgsSettings, QgsSettings,
QgsApplication,
QgsFeatureSink, QgsFeatureSink,
QgsProcessingUtils,
QgsProcessingParameterFeatureSource, QgsProcessingParameterFeatureSource,
QgsProcessingParameterString, QgsProcessingParameterString,
QgsProcessingParameterField, QgsProcessingParameterField,

3
python/plugins/processing/algs/qgis/PostGISExecuteSQL.py
View File

@ -26,8 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya, Carterix Geomatics'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
from qgis.core import (QgsApplication, from qgis.core import (QgsProcessingParameterString)
QgsProcessingParameterString)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
from processing.tools import postgis from processing.tools import postgis

2
python/plugins/processing/algs/qgis/SelectByAttribute.py
View File

@ -25,10 +25,8 @@ __copyright__ = '(C) 2010, Michael Minn'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
from qgis.core import (QgsApplication)
from qgis.PyQt.QtCore import QVariant from qgis.PyQt.QtCore import QVariant
from qgis.core import (QgsExpression, from qgis.core import (QgsExpression,
QgsProcessingUtils,
QgsProcessingParameterVectorLayer, QgsProcessingParameterVectorLayer,
QgsProcessingParameterField, QgsProcessingParameterField,
QgsProcessingParameterEnum, QgsProcessingParameterEnum,

4
python/plugins/processing/algs/qgis/SimplifyGeometries.py
View File

@ -32,13 +32,13 @@ from qgis.PyQt.QtGui import QIcon
from qgis.core import (QgsMapToPixelSimplifier, from qgis.core import (QgsMapToPixelSimplifier,
QgsMessageLog, QgsMessageLog,
QgsFeatureSink, QgsFeatureSink,
QgsProcessing,
QgsProcessingParameterFeatureSource, QgsProcessingParameterFeatureSource,
QgsProcessingParameterFeatureSink, QgsProcessingParameterFeatureSink,
QgsProcessingParameterEnum, QgsProcessingParameterEnum,
QgsProcessingParameterNumber) QgsProcessingParameterNumber)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.tools import dataobjects
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0] pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@ -62,7 +62,7 @@ class SimplifyGeometries(QgisAlgorithm):
def initAlgorithm(self, config=None): def initAlgorithm(self, config=None):
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
self.tr('Input layer'), self.tr('Input layer'),
[dataobjects.TYPE_VECTOR_POLYGON, dataobjects.TYPE_VECTOR_LINE])) [QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine]))
self.methods = [self.tr('Distance (Douglas-Peucker)'), self.methods = [self.tr('Distance (Douglas-Peucker)'),
'Snap to grid', 'Snap to grid',
'Area (Visvalingam)'] 'Area (Visvalingam)']

4
python/plugins/processing/algs/qgis/Smooth.py
View File

@ -26,13 +26,13 @@ __copyright__ = '(C) 2015, Nyall Dawson'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
from qgis.core import (QgsFeatureSink, from qgis.core import (QgsFeatureSink,
QgsProcessing,
QgsProcessingParameterFeatureSource, QgsProcessingParameterFeatureSource,
QgsProcessingParameterFeatureSink, QgsProcessingParameterFeatureSink,
QgsProcessingParameterNumber) QgsProcessingParameterNumber)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
from processing.tools import dataobjects
class Smooth(QgisAlgorithm): class Smooth(QgisAlgorithm):
@ -51,7 +51,7 @@ class Smooth(QgisAlgorithm):
def initAlgorithm(self, config=None): def initAlgorithm(self, config=None):
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT, self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POLYGON, dataobjects.TYPE_VECTOR_LINE])) self.tr('Input layer'), [QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorLine]))
self.addParameter(QgsProcessingParameterNumber(self.ITERATIONS, self.addParameter(QgsProcessingParameterNumber(self.ITERATIONS,
self.tr('Iterations'), self.tr('Iterations'),
defaultValue=1, minValue=1, maxValue=10)) defaultValue=1, minValue=1, maxValue=10))

1
python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py
View File

@ -27,7 +27,6 @@ __copyright__ = '(C) 2016, Mathieu Pellerin'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
from qgis.core import (QgsDataSourceUri, from qgis.core import (QgsDataSourceUri,
QgsApplication,
QgsProcessingParameterVectorLayer, QgsProcessingParameterVectorLayer,
QgsProcessingParameterString) QgsProcessingParameterString)