[processing] fixes cmake for lastools, removes the interface module a…

…nd adds import iface module where lacking
qgis · May 21, 2014 · 470431d · 470431d
1 parent 4988bc5
commit 470431d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 9 deletions.
diff --git a/python/plugins/processing/algs/grass/GrassAlgorithm.py b/python/plugins/processing/algs/grass/GrassAlgorithm.py
@@ -34,7 +34,6 @@
 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
@@ -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
@@ -33,7 +33,6 @@
 
 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
@@ -32,7 +32,6 @@
 
 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
@@ -31,8 +31,8 @@
 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 @@ def processAlgorithm(self, progress):
 
         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
@@ -32,7 +32,6 @@
 
 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
@@ -32,7 +32,6 @@
 
 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
@@ -32,7 +32,6 @@
 
 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