Skip to content

Commit 470431d

Browse files
committed
[processing] fixes cmake for lastools, removes the interface module and adds import iface module where lacking
1 parent 4988bc5 commit 470431d

8 files changed

+3
-9
lines changed

python/plugins/processing/algs/grass/GrassAlgorithm.py

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
from PyQt4.QtGui import *
3535
from qgis.utils import iface
3636

37-
from processing import interface
3837
from processing.core.GeoAlgorithm import GeoAlgorithm
3938
from processing.core.ProcessingConfig import ProcessingConfig
4039
from processing.core.ProcessingLog import ProcessingLog
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
FILE(GLOB PY_FILES *.py)
22

3-
PLUGIN_INSTALL(processing ./lidar/lastools ${PY_FILES})
3+
PLUGIN_INSTALL(processing ./algs/lidar/lastools ${PY_FILES})

python/plugins/processing/algs/qgis/PointsToPaths.py

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
from qgis.core import *
3535

36-
from processing import interface
3736
from processing.core.GeoAlgorithm import GeoAlgorithm
3837
from processing.core.ProcessingLog import ProcessingLog
3938
from processing.parameters.ParameterVector import ParameterVector

python/plugins/processing/algs/qgis/RandomPointsAlongLines.py

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
from qgis.core import *
3434

35-
from processing import interface
3635
from processing.core.GeoAlgorithm import GeoAlgorithm
3736
from processing.core.ProcessingLog import ProcessingLog
3837
from processing.parameters.ParameterVector import ParameterVector

python/plugins/processing/algs/qgis/RandomPointsExtent.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
from PyQt4.QtCore import *
3232

3333
from qgis.core import *
34+
from qgis.utils import iface
3435

35-
from processing import interface
3636
from processing.core.GeoAlgorithm import GeoAlgorithm
3737
from processing.core.ProcessingLog import ProcessingLog
3838
from processing.parameters.ParameterExtent import ParameterExtent
@@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
7171

7272
fields = QgsFields()
7373
fields.append(QgsField('id', QVariant.Int, '', 10, 0))
74-
mapCRS = interface.iface.mapCanvas().mapSettings().destinationCrs()
74+
mapCRS = iface.mapCanvas().mapSettings().destinationCrs()
7575
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
7676
fields, QGis.WKBPoint, mapCRS)
7777

python/plugins/processing/algs/qgis/RandomPointsLayer.py

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
from qgis.core import *
3434

35-
from processing import interface
3635
from processing.core.GeoAlgorithm import GeoAlgorithm
3736
from processing.core.ProcessingLog import ProcessingLog
3837
from processing.parameters.ParameterVector import ParameterVector

python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
from qgis.core import *
3434

35-
from processing import interface
3635
from processing.core.GeoAlgorithm import GeoAlgorithm
3736
from processing.core.ProcessingLog import ProcessingLog
3837
from processing.parameters.ParameterVector import ParameterVector

python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
from qgis.core import *
3434

35-
from processing import interface
3635
from processing.core.GeoAlgorithm import GeoAlgorithm
3736
from processing.core.ProcessingLog import ProcessingLog
3837
from processing.parameters.ParameterVector import ParameterVector

0 commit comments

Comments
 (0)