Skip to content

Commit d03a0fb

Browse files
author
volayaf@gmail.com
committedJun 18, 2012
fixed bad imports in lidar package
fixed problem with non-ascii filenames (both patches supplied by Alexander Bruy) git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@250 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
·
ltr-3_40Before-merge-new_vector_api
1 parent 3d9f712 commit d03a0fb

23 files changed

+53
-53
lines changed
 

‎src/sextante/core/QGisLayers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def getVectorLayers(shapetype=-1):
3030
for layer in layers:
3131
if layer.type() == layer.VectorLayer:
3232
if shapetype == QGisLayers.ALL_TYPES or layer.geometryType() == shapetype:
33-
uri = str(layer.source())
33+
uri = unicode(layer.source())
3434
if not uri.endswith("csv") and not uri.endswith("dbf"):
3535
vector.append(layer)
3636
return vector
@@ -48,7 +48,7 @@ def getTables():
4848
tables = list()
4949
for layer in layers:
5050
if layer.type() == layer.VectorLayer :
51-
uri = str(layer.source())
51+
uri = unicode(layer.source())
5252
if uri.endswith("csv") or uri.endswith("dbf"):
5353
tables.append(layer)
5454
return tables
@@ -100,7 +100,7 @@ def load(layer, name = None, crs = None, style = None):
100100
else:
101101
if prjSetting:
102102
settings.setValue("/Projections/defaultBehaviour", prjSetting)
103-
raise RuntimeError("Could not load layer: " + str(layer)
103+
raise RuntimeError("Could not load layer: " + unicode(layer)
104104
+"\nCheck the SEXTANTE log to look for errors in algorithm execution")
105105
if prjSetting:
106106
settings.setValue("/Projections/defaultBehaviour", prjSetting)

‎src/sextante/lidar/fusion/CanopyMaxima.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from sextante.parameters.ParameterFile import ParameterFile
33
from sextante.outputs.OutputTable import OutputTable
44
from sextante.core.GeoAlgorithm import GeoAlgorithm
5-
from sextante.fusion.FusionUtils import FusionUtils
5+
from sextante.lidar.fusion.FusionUtils import FusionUtils
66
from PyQt4 import QtGui
77
from sextante.parameters.ParameterNumber import ParameterNumber
8-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
8+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
99

1010
class CanopyMaxima(FusionAlgorithm):
1111

‎src/sextante/lidar/fusion/CanopyModel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
3-
from sextante.fusion.FusionUtils import FusionUtils
3+
from sextante.lidar.fusion.FusionUtils import FusionUtils
44
from sextante.parameters.ParameterNumber import ParameterNumber
55
from sextante.outputs.OutputRaster import OutputRaster
66
from sextante.parameters.ParameterSelection import ParameterSelection
77
import subprocess
8-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
8+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
99

1010
class CanopyModel(FusionAlgorithm):
1111

@@ -55,4 +55,4 @@ def processAlgorithm(self, progress):
5555
commands.append(outFile)
5656
commands.append(self.getOutputValue(self.OUTPUT))
5757
p = subprocess.Popen(commands, shell=True)
58-
p.wait()
58+
p.wait()

‎src/sextante/lidar/fusion/ClipData.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
3-
from sextante.fusion.FusionUtils import FusionUtils
3+
from sextante.lidar.fusion.FusionUtils import FusionUtils
44
from PyQt4 import QtGui
55
import subprocess
66
from sextante.parameters.ParameterExtent import ParameterExtent
77
from sextante.outputs.OutputFile import OutputFile
88
from sextante.parameters.ParameterSelection import ParameterSelection
9-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
9+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
1010

1111
class ClipData(FusionAlgorithm):
1212

@@ -48,4 +48,4 @@ def processAlgorithm(self, progress):
4848
commands.append(outFile)
4949
commands.append(self.getOutputValue(self.OUTPUT))
5050
p = subprocess.Popen(commands, shell=True)
51-
p.wait()
51+
p.wait()

‎src/sextante/lidar/fusion/CloudMetrics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
33
from sextante.outputs.OutputTable import OutputTable
4-
from sextante.fusion.FusionUtils import FusionUtils
5-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
4+
from sextante.lidar.fusion.FusionUtils import FusionUtils
5+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
66

77
class CloudMetrics(FusionAlgorithm):
88

‎src/sextante/lidar/fusion/Cover.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
33
from sextante.core.GeoAlgorithm import GeoAlgorithm
4-
from sextante.fusion.FusionUtils import FusionUtils
4+
from sextante.lidar.fusion.FusionUtils import FusionUtils
55
from PyQt4 import QtGui
66
from sextante.parameters.ParameterNumber import ParameterNumber
77
from sextante.outputs.OutputRaster import OutputRaster
88
from sextante.parameters.ParameterSelection import ParameterSelection
99
import subprocess
10-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
10+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
1111

1212
class Cover(FusionAlgorithm):
1313

@@ -59,4 +59,4 @@ def processAlgorithm(self, progress):
5959
commands.append(outFile)
6060
commands.append(self.getOutputValue(self.OUTPUT))
6161
p = subprocess.Popen(commands, shell=True)
62-
p.wait()
62+
p.wait()

‎src/sextante/lidar/fusion/FilterData.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
3-
from sextante.fusion.FusionUtils import FusionUtils
3+
from sextante.lidar.fusion.FusionUtils import FusionUtils
44
import subprocess
55
from sextante.outputs.OutputFile import OutputFile
6-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
6+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
77
from sextante.parameters.ParameterNumber import ParameterNumber
88

99
class FilterData(FusionAlgorithm):
@@ -44,4 +44,4 @@ def processAlgorithm(self, progress):
4444
commands.append(outFile)
4545
commands.append(self.getOutputValue(self.OUTPUT))
4646
p = subprocess.Popen(commands, shell=True)
47-
p.wait()
47+
p.wait()

‎src/sextante/lidar/fusion/GridMetrics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
33
from sextante.outputs.OutputTable import OutputTable
4-
from sextante.fusion.FusionUtils import FusionUtils
5-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
4+
from sextante.lidar.fusion.FusionUtils import FusionUtils
5+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
66
from sextante.parameters.ParameterNumber import ParameterNumber
77

88
class GridMetrics(FusionAlgorithm):

‎src/sextante/lidar/fusion/GridSurfaceCreate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
3-
from sextante.fusion.FusionUtils import FusionUtils
3+
from sextante.lidar.fusion.FusionUtils import FusionUtils
44
from sextante.parameters.ParameterNumber import ParameterNumber
55
from sextante.parameters.ParameterSelection import ParameterSelection
6-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
6+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
77
from sextante.outputs.OutputFile import OutputFile
88

99
class GridSurfaceCreate(FusionAlgorithm):
@@ -43,4 +43,4 @@ def processAlgorithm(self, progress):
4343
else:
4444
FusionUtils.createFileList(files)
4545
commands.append(FusionUtils.tempFileListFilepath())
46-
FusionUtils.runFusion(commands, progress)
46+
FusionUtils.runFusion(commands, progress)

‎src/sextante/lidar/fusion/GroundFilter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
3-
from sextante.fusion.FusionUtils import FusionUtils
3+
from sextante.lidar.fusion.FusionUtils import FusionUtils
44
import subprocess
55
from sextante.outputs.OutputFile import OutputFile
6-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
6+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
77
from sextante.parameters.ParameterNumber import ParameterNumber
88

99
class GroundFilter(FusionAlgorithm):
@@ -39,4 +39,4 @@ def processAlgorithm(self, progress):
3939
commands.append(outFile)
4040
commands.append(self.getOutputValue(self.OUTPUT))
4141
p = subprocess.Popen(commands, shell=True)
42-
p.wait()
42+
p.wait()

‎src/sextante/lidar/fusion/MergeData.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
22
from sextante.parameters.ParameterFile import ParameterFile
3-
from sextante.fusion.FusionUtils import FusionUtils
3+
from sextante.lidar.fusion.FusionUtils import FusionUtils
44
from sextante.outputs.OutputFile import OutputFile
5-
from sextante.fusion.FusionAlgorithm import FusionAlgorithm
5+
from sextante.lidar.fusion.FusionAlgorithm import FusionAlgorithm
66

77
class MergeData(FusionAlgorithm):
88

‎src/sextante/lidar/lastools/las2dem.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import os
22
from PyQt4 import QtGui
33
from sextante.parameters.ParameterString import ParameterString
4-
from sextante.lastools.LasToolsUtils import LasToolsUtils
4+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
55
from sextante.parameters.ParameterBoolean import ParameterBoolean
66
from sextante.outputs.OutputRaster import OutputRaster
7-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
7+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
88
from sextante.parameters.ParameterFile import ParameterFile
99

1010
class las2dem(LasToolsAlgorithm):

‎src/sextante/lidar/lastools/las2iso.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
2-
from sextante.lastools.LasToolsUtils import LasToolsUtils
3-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
2+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
3+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
44
from sextante.parameters.ParameterNumber import ParameterNumber
55
from sextante.outputs.OutputVector import OutputVector
66
from sextante.parameters.ParameterFile import ParameterFile

‎src/sextante/lidar/lastools/las2shp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
from sextante.outputs.OutputVector import OutputVector
3-
from sextante.lastools.LasToolsUtils import LasToolsUtils
4-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
3+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
4+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
55
from sextante.parameters.ParameterFile import ParameterFile
66

77
class las2shp(LasToolsAlgorithm):

‎src/sextante/lidar/lastools/lasboundary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from sextante.core.GeoAlgorithm import GeoAlgorithm
44
from sextante.parameters.ParameterString import ParameterString
55
from sextante.outputs.OutputVector import OutputVector
6-
from sextante.lastools.LasToolsUtils import LasToolsUtils
6+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
77
from sextante.parameters.ParameterBoolean import ParameterBoolean
88
from sextante.parameters.ParameterNumber import ParameterNumber
9-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
9+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
1010
from sextante.parameters.ParameterFile import ParameterFile
1111

1212
class lasboundary(LasToolsAlgorithm):

‎src/sextante/lidar/lastools/lasclassify.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
2-
from sextante.lastools.LasToolsUtils import LasToolsUtils
3-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
2+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
3+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
44
from sextante.parameters.ParameterFile import ParameterFile
55
from sextante.outputs.OutputFile import OutputFile
66

‎src/sextante/lidar/lastools/lasclip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
2-
from sextante.lastools.LasToolsUtils import LasToolsUtils
3-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
2+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
3+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
44
from sextante.parameters.ParameterFile import ParameterFile
55
from sextante.outputs.OutputFile import OutputFile
66
from sextante.parameters.ParameterVector import ParameterVector

‎src/sextante/lidar/lastools/lasgrid.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import os
22
from PyQt4 import QtGui
33
from sextante.parameters.ParameterString import ParameterString
4-
from sextante.lastools.LasToolsUtils import LasToolsUtils
4+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
55
from sextante.parameters.ParameterBoolean import ParameterBoolean
66
from sextante.outputs.OutputRaster import OutputRaster
7-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
7+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
88
from sextante.parameters.ParameterSelection import ParameterSelection
99
from sextante.parameters.ParameterFile import ParameterFile
1010

‎src/sextante/lidar/lastools/lasground.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
from PyQt4 import QtGui
3-
from sextante.lastools.LasToolsUtils import LasToolsUtils
4-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
3+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
4+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
55
from sextante.parameters.ParameterSelection import ParameterSelection
66
from sextante.parameters.ParameterFile import ParameterFile
77
from sextante.outputs.OutputFile import OutputFile

‎src/sextante/lidar/lastools/lasheight.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
2-
from sextante.lastools.LasToolsUtils import LasToolsUtils
3-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
2+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
3+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
44
from sextante.parameters.ParameterFile import ParameterFile
55
from sextante.outputs.OutputFile import OutputFile
66

‎src/sextante/lidar/lastools/lasinfo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
2-
from sextante.lastools.LasToolsUtils import LasToolsUtils
3-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
2+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
3+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
44
from sextante.parameters.ParameterFile import ParameterFile
55
from sextante.outputs.OutputHTML import OutputHTML
66

‎src/sextante/lidar/lastools/lasprecision.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
from PyQt4 import QtGui
3-
from sextante.lastools.LasToolsUtils import LasToolsUtils
4-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
3+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
4+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
55
from sextante.parameters.ParameterFile import ParameterFile
66
from sextante.outputs.OutputHTML import OutputHTML
77

‎src/sextante/lidar/lastools/lassplit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
2-
from sextante.lastools.LasToolsUtils import LasToolsUtils
3-
from sextante.lastools.LasToolsAlgorithm import LasToolsAlgorithm
2+
from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
3+
from sextante.lidar.lastools.LasToolsAlgorithm import LasToolsAlgorithm
44
from sextante.parameters.ParameterFile import ParameterFile
55
from sextante.outputs.OutputFile import OutputFile
66
from sextante.parameters.ParameterNumber import ParameterNumber

0 commit comments

Comments
 (0)
Please sign in to comment.