From 2b5ea3669eeecca795087c5215ee2bf3aff3ef64 Mon Sep 17 00:00:00 2001 From: volaya Date: Fri, 10 Jul 2015 15:27:45 +0200 Subject: [PATCH] [processing] fixes for lastools algorithms by Martin Isenburg --- python/plugins/processing/algs/lidar/lastools/lasmerge.py | 2 +- .../plugins/processing/algs/lidar/lastools/lasmergePro.py | 2 +- python/plugins/processing/algs/lidar/lastools/shp2las.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python/plugins/processing/algs/lidar/lastools/lasmerge.py b/python/plugins/processing/algs/lidar/lastools/lasmerge.py index 5ca57c659c7..cf5e5f6f246 100644 --- a/python/plugins/processing/algs/lidar/lastools/lasmerge.py +++ b/python/plugins/processing/algs/lidar/lastools/lasmerge.py @@ -83,7 +83,7 @@ class lasmerge(LAStoolsAlgorithm): commands.append("-i") commands.append(file7) self.addParametersFilesAreFlightlinesCommands(commands) - self.addParametersApplyFileSourceIdsCommands(commands) + self.addParametersApplyFileSourceIdCommands(commands) self.addParametersPointOutputCommands(commands) self.addParametersAdditionalCommands(commands) diff --git a/python/plugins/processing/algs/lidar/lastools/lasmergePro.py b/python/plugins/processing/algs/lidar/lastools/lasmergePro.py index bcda4c81ca0..4331c7fa266 100644 --- a/python/plugins/processing/algs/lidar/lastools/lasmergePro.py +++ b/python/plugins/processing/algs/lidar/lastools/lasmergePro.py @@ -44,7 +44,7 @@ class lasmergePro(LAStoolsAlgorithm): self.addParametersVerboseCommands(commands) self.addParametersPointInputFolderCommands(commands) self.addParametersFilesAreFlightlinesCommands(commands) - self.addParametersApplyFileSourceIdsCommands(commands) + self.addParametersApplyFileSourceIdCommands(commands) self.addParametersPointOutputCommands(commands) self.addParametersAdditionalCommands(commands) diff --git a/python/plugins/processing/algs/lidar/lastools/shp2las.py b/python/plugins/processing/algs/lidar/lastools/shp2las.py index 2a7d3dcc536..3d16dac8f8a 100644 --- a/python/plugins/processing/algs/lidar/lastools/shp2las.py +++ b/python/plugins/processing/algs/lidar/lastools/shp2las.py @@ -2,7 +2,7 @@ """ *************************************************************************** - las2txt.py + shp2las.py --------------------- Date : September 2013 Copyright : (C) 2013 by Martin Isenburg @@ -43,9 +43,9 @@ class shp2las(LAStoolsAlgorithm): self.addParameter(ParameterFile(shp2las.INPUT, self.tr("Input SHP file"))) self.addParameter(ParameterNumber(shp2las.SCALE_FACTOR_XY, - self.tr("resolution of x and y coordinate"), False, False, 0.01)) + self.tr("resolution of x and y coordinate"), 0, None, 0.01)) self.addParameter(ParameterNumber(shp2las.SCALE_FACTOR_Z, - self.tr("resolution of z coordinate"), False, False, 0.01)) + self.tr("resolution of z coordinate"), 0, None, 0.01)) self.addParametersPointOutputGUI() self.addParametersAdditionalGUI()