From 470431d6b41c1f28e84ed6fcb5d477be11755d2d Mon Sep 17 00:00:00 2001 From: Salvatore Larosa Date: Wed, 21 May 2014 22:03:08 +0200 Subject: [PATCH] [processing] fixes cmake for lastools, removes the interface module and adds import iface module where lacking --- python/plugins/processing/algs/grass/GrassAlgorithm.py | 1 - python/plugins/processing/algs/lidar/lastools/CMakeLists.txt | 2 +- python/plugins/processing/algs/qgis/PointsToPaths.py | 1 - python/plugins/processing/algs/qgis/RandomPointsAlongLines.py | 1 - python/plugins/processing/algs/qgis/RandomPointsExtent.py | 4 ++-- python/plugins/processing/algs/qgis/RandomPointsLayer.py | 1 - .../plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py | 1 - .../processing/algs/qgis/RandomPointsPolygonsVariable.py | 1 - 8 files changed, 3 insertions(+), 9 deletions(-) diff --git a/python/plugins/processing/algs/grass/GrassAlgorithm.py b/python/plugins/processing/algs/grass/GrassAlgorithm.py index 4d5eba31ffc..7f030486967 100644 --- a/python/plugins/processing/algs/grass/GrassAlgorithm.py +++ b/python/plugins/processing/algs/grass/GrassAlgorithm.py @@ -34,7 +34,6 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * from qgis.utils import iface -from processing import interface from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.ProcessingConfig import ProcessingConfig from processing.core.ProcessingLog import ProcessingLog diff --git a/python/plugins/processing/algs/lidar/lastools/CMakeLists.txt b/python/plugins/processing/algs/lidar/lastools/CMakeLists.txt index 5dadff5483d..c2249094617 100644 --- a/python/plugins/processing/algs/lidar/lastools/CMakeLists.txt +++ b/python/plugins/processing/algs/lidar/lastools/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB PY_FILES *.py) -PLUGIN_INSTALL(processing ./lidar/lastools ${PY_FILES}) +PLUGIN_INSTALL(processing ./algs/lidar/lastools ${PY_FILES}) diff --git a/python/plugins/processing/algs/qgis/PointsToPaths.py b/python/plugins/processing/algs/qgis/PointsToPaths.py index 52f41640641..4f8963458f6 100644 --- a/python/plugins/processing/algs/qgis/PointsToPaths.py +++ b/python/plugins/processing/algs/qgis/PointsToPaths.py @@ -33,7 +33,6 @@ from PyQt4.QtCore import * from qgis.core import * -from processing import interface from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.ProcessingLog import ProcessingLog from processing.parameters.ParameterVector import ParameterVector diff --git a/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py b/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py index 5352ec1db49..42df3fa39a6 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py +++ b/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py @@ -32,7 +32,6 @@ from PyQt4.QtCore import * from qgis.core import * -from processing import interface from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.ProcessingLog import ProcessingLog from processing.parameters.ParameterVector import ParameterVector diff --git a/python/plugins/processing/algs/qgis/RandomPointsExtent.py b/python/plugins/processing/algs/qgis/RandomPointsExtent.py index 5ae68b4ed24..accfaafa00a 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsExtent.py +++ b/python/plugins/processing/algs/qgis/RandomPointsExtent.py @@ -31,8 +31,8 @@ import random from PyQt4.QtCore import * from qgis.core import * +from qgis.utils import iface -from processing import interface from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.ProcessingLog import ProcessingLog from processing.parameters.ParameterExtent import ParameterExtent @@ -71,7 +71,7 @@ class RandomPointsExtent(GeoAlgorithm): fields = QgsFields() fields.append(QgsField('id', QVariant.Int, '', 10, 0)) - mapCRS = interface.iface.mapCanvas().mapSettings().destinationCrs() + mapCRS = iface.mapCanvas().mapSettings().destinationCrs() writer = self.getOutputFromName(self.OUTPUT).getVectorWriter( fields, QGis.WKBPoint, mapCRS) diff --git a/python/plugins/processing/algs/qgis/RandomPointsLayer.py b/python/plugins/processing/algs/qgis/RandomPointsLayer.py index 899a7a81075..5660bd3895c 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsLayer.py +++ b/python/plugins/processing/algs/qgis/RandomPointsLayer.py @@ -32,7 +32,6 @@ from PyQt4.QtCore import * from qgis.core import * -from processing import interface from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.ProcessingLog import ProcessingLog from processing.parameters.ParameterVector import ParameterVector diff --git a/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py b/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py index bca9063b836..a95619d6789 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py +++ b/python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py @@ -32,7 +32,6 @@ from PyQt4.QtCore import * from qgis.core import * -from processing import interface from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.ProcessingLog import ProcessingLog from processing.parameters.ParameterVector import ParameterVector diff --git a/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py b/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py index d25938a8831..360035d09cd 100644 --- a/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py +++ b/python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py @@ -32,7 +32,6 @@ from PyQt4.QtCore import * from qgis.core import * -from processing import interface from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.ProcessingLog import ProcessingLog from processing.parameters.ParameterVector import ParameterVector