sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-27 00:07:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] fixed wrong indentation

Browse Source
This commit is contained in:
volaya 2016-05-30 14:44:13 +02:00 committed by Alexander Bruy
parent d46f98d4e5
commit 568ddb349a
29 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/algs/lidar/lastools/las2lasPro_filter.py
View File

@ -41,7 +41,7 @@ class las2lasPro_filter(LAStoolsAlgorithm):
self.addParametersPointOutputGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las")]

2
python/plugins/processing/algs/lidar/lastools/las2lasPro_project.py
View File

@ -70,7 +70,7 @@ class las2lasPro_project(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las")]

2
python/plugins/processing/algs/lidar/lastools/las2lasPro_transform.py
View File

@ -58,7 +58,7 @@ class las2lasPro_transform(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las")]

2
python/plugins/processing/algs/lidar/lastools/las2las_filter.py
View File

@ -43,7 +43,7 @@ class las2las_filter(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las")]

2
python/plugins/processing/algs/lidar/lastools/las2las_project.py
View File

@ -67,7 +67,7 @@ class las2las_project(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las")]

2
python/plugins/processing/algs/lidar/lastools/las2las_transform.py
View File

@ -54,7 +54,7 @@ class las2las_transform(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2las")]

2
python/plugins/processing/algs/lidar/lastools/las2txt.py
View File

@ -47,7 +47,7 @@ class las2txt(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2txt.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2txt")]

2
python/plugins/processing/algs/lidar/lastools/las2txtPro.py
View File

@ -47,7 +47,7 @@ class las2txtPro(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2txt.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "las2txt")]

6
python/plugins/processing/algs/lidar/lastools/lasdiff.py
View File

@ -36,7 +36,7 @@ class lasdiff(LAStoolsAlgorithm):
OTHER_POINT_FILE = "OTHER_POINT_FILE"
CREATE_DIFFERENCE_FILE = "CREATE_DIFFERENCE_FILE"
SHUTUP = "SHUTUP"
SHUTUP_AFTER = ["5", "10", "50", "100", "1000", "10000", "50000"]
SHUTUP_AFTER = ["5", "10", "50", "100", "1000", "10000", "50000"]
def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('lasdiff')
@ -53,7 +53,7 @@ class lasdiff(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasdiff.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasdiff")]
@ -65,7 +65,7 @@ class lasdiff(LAStoolsAlgorithm):
commands.append('"' + file + '"')
shutup = self.getParameterValue(lasdiff.SHUTUP)
if (shutup != 0):
commands.append("-shutup")
commands.append("-shutup")
commands.append(lasdiff.SHUTUP_AFTER[shutup])
if self.getParameterValue(lasdiff.CREATE_DIFFERENCE_FILE):
self.addParametersPointOutputCommands(commands)

16
python/plugins/processing/algs/lidar/lastools/lasgroundPro_new.py
View File

@ -77,21 +77,21 @@ class lasgroundPro_new(LAStoolsAlgorithm):
self.addParametersHorizontalAndVerticalFeetCommands(commands)
method = self.getParameterValue(lasgroundPro_new.TERRAIN)
if (method == 5):
commands.append("-step")
commands.append("-step")
commands.append(unicode(self.getParameterValue(lasgroundPro_new.STEP)))
commands.append("-bulge")
commands.append("-bulge")
commands.append(unicode(self.getParameterValue(lasgroundPro_new.BULGE)))
commands.append("-spike")
commands.append("-spike")
commands.append(unicode(self.getParameterValue(lasgroundPro_new.SPIKE)))
commands.append("-spike_down")
commands.append("-spike_down")
commands.append(unicode(self.getParameterValue(lasgroundPro_new.DOWN_SPIKE)))
commands.append("-offset")
commands.append("-offset")
commands.append(unicode(self.getParameterValue(lasgroundPro_new.OFFSET)))
else:
else:
commands.append("-" + lasgroundPro_new.TERRAINS[method])
granularity = self.getParameterValue(lasgroundPro_new.GRANULARITY)
if (granularity != 1):
commands.append("-" + lasgroundPro_new.GRANULARITIES[granularity])
if (granularity != 1):
commands.append("-" + lasgroundPro_new.GRANULARITIES[granularity])
self.addParametersOutputDirectoryCommands(commands)
self.addParametersOutputAppendixCommands(commands)
self.addParametersPointOutputFormatCommands(commands)

16
python/plugins/processing/algs/lidar/lastools/lasground_new.py
View File

@ -74,21 +74,21 @@ class lasground_new(LAStoolsAlgorithm):
self.addParametersHorizontalAndVerticalFeetCommands(commands)
method = self.getParameterValue(lasground_new.TERRAIN)
if (method == 5):
commands.append("-step")
commands.append("-step")
commands.append(unicode(self.getParameterValue(lasground_new.STEP)))
commands.append("-bulge")
commands.append("-bulge")
commands.append(unicode(self.getParameterValue(lasground_new.BULGE)))
commands.append("-spike")
commands.append("-spike")
commands.append(unicode(self.getParameterValue(lasground_new.SPIKE)))
commands.append("-spike_down")
commands.append("-spike_down")
commands.append(unicode(self.getParameterValue(lasground_new.DOWN_SPIKE)))
commands.append("-offset")
commands.append("-offset")
commands.append(unicode(self.getParameterValue(lasground_new.OFFSET)))
else:
else:
commands.append("-" + lasground_new.TERRAINS[method])
granularity = self.getParameterValue(lasground_new.GRANULARITY)
if (granularity != 1):
commands.append("-" + lasground_new.GRANULARITIES[granularity])
if (granularity != 1):
commands.append("-" + lasground_new.GRANULARITIES[granularity])
self.addParametersPointOutputCommands(commands)
self.addParametersAdditionalCommands(commands)

8
python/plugins/processing/algs/lidar/lastools/lasheight.py
View File

@ -44,8 +44,8 @@ class lasheight(LAStoolsAlgorithm):
self.group, self.i18n_group = self.trAlgorithm('LAStools')
self.addParametersVerboseGUI()
self.addParametersPointInputGUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParameter(ParameterBoolean(lasheight.REPLACE_Z,
self.tr("replace z"), False))
self.addParameter(ParameterBoolean(lasheight.DROP_ABOVE,
@ -63,8 +63,8 @@ class lasheight(LAStoolsAlgorithm):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasheight")]
self.addParametersVerboseCommands(commands)
self.addParametersPointInputCommands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
if self.getParameterValue(lasheight.REPLACE_Z):
commands.append("-replace_z")
if self.getParameterValue(lasheight.DROP_ABOVE):

8
python/plugins/processing/algs/lidar/lastools/lasheightPro.py
View File

@ -44,8 +44,8 @@ class lasheightPro(LAStoolsAlgorithm):
self.name, self.i18n_name = self.trAlgorithm('lasheightPro')
self.group, self.i18n_group = self.trAlgorithm('LAStools Production')
self.addParametersPointInputFolderGUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParameter(ParameterBoolean(lasheightPro.REPLACE_Z,
self.tr("replace z"), False))
self.addParameter(ParameterBoolean(lasheightPro.DROP_ABOVE,
@ -67,8 +67,8 @@ class lasheightPro(LAStoolsAlgorithm):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasheight")]
self.addParametersVerboseCommands(commands)
self.addParametersPointInputFolderCommands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
if self.getParameterValue(lasheightPro.REPLACE_Z):
commands.append("-replace_z")
if self.getParameterValue(lasheightPro.DROP_ABOVE):

28
python/plugins/processing/algs/lidar/lastools/lasheightPro_classify.py
View File

@ -38,10 +38,10 @@ class lasheightPro_classify(LAStoolsAlgorithm):
CLASSIFY_BELOW_HEIGHT = "CLASSIFY_BELOW_HEIGHT"
CLASSIFY_BETWEEN1 = "CLASSIFY_BETWEEN1"
CLASSIFY_BETWEEN1_HEIGHT_FROM = "CLASSIFY_BETWEEN1_HEIGHT_FROM"
CLASSIFY_BETWEEN1_HEIGHT_TO= "CLASSIFY_BETWEEN1_HEIGHT_TO"
CLASSIFY_BETWEEN1_HEIGHT_TO = "CLASSIFY_BETWEEN1_HEIGHT_TO"
CLASSIFY_BETWEEN2 = "CLASSIFY_BETWEEN2"
CLASSIFY_BETWEEN2_HEIGHT_FROM = "CLASSIFY_BETWEEN2_HEIGHT_FROM"
CLASSIFY_BETWEEN2_HEIGHT_TO= "CLASSIFY_BETWEEN2_HEIGHT_TO"
CLASSIFY_BETWEEN2_HEIGHT_TO = "CLASSIFY_BETWEEN2_HEIGHT_TO"
CLASSIFY_ABOVE = "CLASSIFY_ABOVE"
CLASSIFY_ABOVE_HEIGHT = "CLASSIFY_ABOVE_HEIGHT"
@ -51,8 +51,8 @@ class lasheightPro_classify(LAStoolsAlgorithm):
self.name, self.i18n_name = self.trAlgorithm('lasheightPro_classify')
self.group, self.i18n_group = self.trAlgorithm('LAStools Production')
self.addParametersPointInputFolderGUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParameter(ParameterBoolean(lasheightPro_classify.REPLACE_Z,
self.tr("replace z"), False))
self.addParameter(ParameterSelection(lasheightPro_classify.CLASSIFY_BELOW,
@ -86,32 +86,32 @@ class lasheightPro_classify(LAStoolsAlgorithm):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasheight")]
self.addParametersVerboseCommands(commands)
self.addParametersPointInputFolderCommands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
if self.getParameterValue(lasheightPro_classify.REPLACE_Z):
commands.append("-replace_z")
classify = self.getParameterValue(lasheightPro_classify.CLASSIFY_BELOW)
if (classify != 0):
if (classify != 0):
commands.append("-classify_below")
commands.append(unicode(self.getParameterValue(lasheightPro_classify.CLASSIFY_BELOW_HEIGHT)))
commands.append(unicode(classify))
commands.append(unicode(classify))
classify = self.getParameterValue(lasheightPro_classify.CLASSIFY_BETWEEN1)
if (classify != 0):
if (classify != 0):
commands.append("-classify_between")
commands.append(unicode(self.getParameterValue(lasheightPro_classify.CLASSIFY_BETWEEN1_HEIGHT_FROM)))
commands.append(unicode(self.getParameterValue(lasheightPro_classify.CLASSIFY_BETWEEN1_HEIGHT_TO)))
commands.append(unicode(classify))
commands.append(unicode(classify))
classify = self.getParameterValue(lasheightPro_classify.CLASSIFY_BETWEEN2)
if (classify != 0):
if (classify != 0):
commands.append("-classify_between")
commands.append(unicode(self.getParameterValue(lasheightPro_classify.CLASSIFY_BETWEEN2_HEIGHT_FROM)))
commands.append(unicode(self.getParameterValue(lasheightPro_classify.CLASSIFY_BETWEEN2_HEIGHT_TO)))
commands.append(unicode(classify))
commands.append(unicode(classify))
classify = self.getParameterValue(lasheightPro_classify.CLASSIFY_ABOVE)
if (classify != 0):
if (classify != 0):
commands.append("-classify_above")
commands.append(unicode(self.getParameterValue(lasheightPro_classify.CLASSIFY_ABOVE_HEIGHT)))
commands.append(unicode(classify))
commands.append(unicode(classify))
self.addParametersOutputDirectoryCommands(commands)
self.addParametersOutputAppendixCommands(commands)
self.addParametersPointOutputFormatCommands(commands)

28
python/plugins/processing/algs/lidar/lastools/lasheight_classify.py
View File

@ -38,10 +38,10 @@ class lasheight_classify(LAStoolsAlgorithm):
CLASSIFY_BELOW_HEIGHT = "CLASSIFY_BELOW_HEIGHT"
CLASSIFY_BETWEEN1 = "CLASSIFY_BETWEEN1"
CLASSIFY_BETWEEN1_HEIGHT_FROM = "CLASSIFY_BETWEEN1_HEIGHT_FROM"
CLASSIFY_BETWEEN1_HEIGHT_TO= "CLASSIFY_BETWEEN1_HEIGHT_TO"
CLASSIFY_BETWEEN1_HEIGHT_TO = "CLASSIFY_BETWEEN1_HEIGHT_TO"
CLASSIFY_BETWEEN2 = "CLASSIFY_BETWEEN2"
CLASSIFY_BETWEEN2_HEIGHT_FROM = "CLASSIFY_BETWEEN2_HEIGHT_FROM"
CLASSIFY_BETWEEN2_HEIGHT_TO= "CLASSIFY_BETWEEN2_HEIGHT_TO"
CLASSIFY_BETWEEN2_HEIGHT_TO = "CLASSIFY_BETWEEN2_HEIGHT_TO"
CLASSIFY_ABOVE = "CLASSIFY_ABOVE"
CLASSIFY_ABOVE_HEIGHT = "CLASSIFY_ABOVE_HEIGHT"
@ -52,8 +52,8 @@ class lasheight_classify(LAStoolsAlgorithm):
self.group, self.i18n_group = self.trAlgorithm('LAStools')
self.addParametersVerboseGUI()
self.addParametersPointInputGUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParameter(ParameterBoolean(lasheight_classify.REPLACE_Z,
self.tr("replace z"), False))
self.addParameter(ParameterSelection(lasheight_classify.CLASSIFY_BELOW,
@ -83,32 +83,32 @@ class lasheight_classify(LAStoolsAlgorithm):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasheight")]
self.addParametersVerboseCommands(commands)
self.addParametersPointInputCommands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
if self.getParameterValue(lasheight_classify.REPLACE_Z):
commands.append("-replace_z")
classify = self.getParameterValue(lasheight_classify.CLASSIFY_BELOW)
if (classify != 0):
if (classify != 0):
commands.append("-classify_below")
commands.append(unicode(self.getParameterValue(lasheight_classify.CLASSIFY_BELOW_HEIGHT)))
commands.append(unicode(classify))
commands.append(unicode(classify))
classify = self.getParameterValue(lasheight_classify.CLASSIFY_BETWEEN1)
if (classify != 0):
if (classify != 0):
commands.append("-classify_between")
commands.append(unicode(self.getParameterValue(lasheight_classify.CLASSIFY_BETWEEN1_HEIGHT_FROM)))
commands.append(unicode(self.getParameterValue(lasheight_classify.CLASSIFY_BETWEEN1_HEIGHT_TO)))
commands.append(unicode(classify))
commands.append(unicode(classify))
classify = self.getParameterValue(lasheight_classify.CLASSIFY_BETWEEN2)
if (classify != 0):
if (classify != 0):
commands.append("-classify_between")
commands.append(unicode(self.getParameterValue(lasheight_classify.CLASSIFY_BETWEEN2_HEIGHT_FROM)))
commands.append(unicode(self.getParameterValue(lasheight_classify.CLASSIFY_BETWEEN2_HEIGHT_TO)))
commands.append(unicode(classify))
commands.append(unicode(classify))
classify = self.getParameterValue(lasheight_classify.CLASSIFY_ABOVE)
if (classify != 0):
if (classify != 0):
commands.append("-classify_above")
commands.append(unicode(self.getParameterValue(lasheight_classify.CLASSIFY_ABOVE_HEIGHT)))
commands.append(unicode(classify))
commands.append(unicode(classify))
self.addParametersPointOutputCommands(commands)
self.addParametersAdditionalCommands(commands)

2
python/plugins/processing/algs/lidar/lastools/lasindex.py
View File

@ -47,7 +47,7 @@ class lasindex(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasindex.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasindex")]

2
python/plugins/processing/algs/lidar/lastools/lasindexPro.py
View File

@ -48,7 +48,7 @@ class lasindexPro(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasindex.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasindex")]

2
python/plugins/processing/algs/lidar/lastools/lasinfo.py
View File

@ -79,7 +79,7 @@ class lasinfo(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasinfo.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasinfo")]

2
python/plugins/processing/algs/lidar/lastools/lasinfoPro.py
View File

@ -74,7 +74,7 @@ class lasinfoPro(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasinfo.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasinfo")]

2
python/plugins/processing/algs/lidar/lastools/lasmerge.py
View File

@ -56,7 +56,7 @@ class lasmerge(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasmerge.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasmerge")]

2
python/plugins/processing/algs/lidar/lastools/lasmergePro.py
View File

@ -41,7 +41,7 @@ class lasmergePro(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasmerge.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasmerge")]

10
python/plugins/processing/algs/lidar/lastools/laspublish.py
View File

@ -91,11 +91,11 @@ class laspublish(LAStoolsAlgorithm):
commands.append("-no_edl")
if not self.getParameterValue(laspublish.SHOW_SKYBOX):
commands.append("-no_skybox")
portal_directory = self.getParameterValue(laspublish.PORTAL_DIRECTORY)
portal_directory = self.getParameterValue(laspublish.PORTAL_DIRECTORY)
if portal_directory != "":
commands.append("-odir")
commands.append('"' + portal_directory + '"')
copy_or_move = self.getParameterValue(laspublish.COPY_OR_MOVE)
copy_or_move = self.getParameterValue(laspublish.COPY_OR_MOVE)
if (copy_or_move == 0):
commands.append("-copy_source_files")
elif (copy_or_move == 1):
@ -103,15 +103,15 @@ class laspublish(LAStoolsAlgorithm):
commands.append("-really_move")
if self.getParameterValue(laspublish.OVERWRITE_EXISTING):
commands.append("-overwrite")
portal_html_page = self.getParameterValue(laspublish.PORTAL_HTML_PAGE)
portal_html_page = self.getParameterValue(laspublish.PORTAL_HTML_PAGE)
if portal_html_page != "":
commands.append("-o")
commands.append('"' + portal_html_page + '"')
title = self.getParameterValue(laspublish.PORTAL_TITLE)
title = self.getParameterValue(laspublish.PORTAL_TITLE)
if title != "":
commands.append("-title")
commands.append('"' + title + '"')
description = self.getParameterValue(laspublish.PORTAL_DESCRIPTION)
description = self.getParameterValue(laspublish.PORTAL_DESCRIPTION)
if description != "":
commands.append("-description")
commands.append('"' + description + '"')

10
python/plugins/processing/algs/lidar/lastools/laspublishPro.py
View File

@ -91,11 +91,11 @@ class laspublishPro(LAStoolsAlgorithm):
commands.append("-no_edl")
if not self.getParameterValue(laspublishPro.SHOW_SKYBOX):
commands.append("-no_skybox")
portal_directory = self.getParameterValue(laspublishPro.PORTAL_DIRECTORY)
portal_directory = self.getParameterValue(laspublishPro.PORTAL_DIRECTORY)
if portal_directory != "":
commands.append("-odir")
commands.append('"' + portal_directory + '"')
copy_or_move = self.getParameterValue(laspublishPro.COPY_OR_MOVE)
copy_or_move = self.getParameterValue(laspublishPro.COPY_OR_MOVE)
if (copy_or_move == 0):
commands.append("-copy_source_files")
elif (copy_or_move == 1):
@ -103,15 +103,15 @@ class laspublishPro(LAStoolsAlgorithm):
commands.append("-really_move")
if self.getParameterValue(laspublishPro.OVERWRITE_EXISTING):
commands.append("-overwrite")
portal_html_page = self.getParameterValue(laspublishPro.PORTAL_HTML_PAGE)
portal_html_page = self.getParameterValue(laspublishPro.PORTAL_HTML_PAGE)
if portal_html_page != "":
commands.append("-o")
commands.append('"' + portal_html_page + '"')
title = self.getParameterValue(laspublishPro.PORTAL_TITLE)
title = self.getParameterValue(laspublishPro.PORTAL_TITLE)
if title != "":
commands.append("-title")
commands.append('"' + title + '"')
description = self.getParameterValue(laspublishPro.PORTAL_DESCRIPTION)
description = self.getParameterValue(laspublishPro.PORTAL_DESCRIPTION)
if description != "":
commands.append("-description")
commands.append('"' + description + '"')

10
python/plugins/processing/algs/lidar/lastools/lasthin.py
View File

@ -47,8 +47,8 @@ class lasthin(LAStoolsAlgorithm):
self.group, self.i18n_group = self.trAlgorithm('LAStools')
self.addParametersVerboseGUI()
self.addParametersPointInputGUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParameter(ParameterNumber(lasthin.THIN_STEP,
self.tr("size of grid used for thinning"), 0, None, 1.0))
self.addParameter(ParameterSelection(lasthin.OPERATION,
@ -68,8 +68,8 @@ class lasthin(LAStoolsAlgorithm):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasthin")]
self.addParametersVerboseCommands(commands)
self.addParametersPointInputCommands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
step = self.getParameterValue(lasthin.THIN_STEP)
if step != 0.0:
commands.append("-step")
@ -77,7 +77,7 @@ class lasthin(LAStoolsAlgorithm):
operation = self.getParameterValue(lasthin.OPERATION)
if operation != 0:
commands.append("-" + self.OPERATIONS[operation])
if (operation >= 4):
if (operation >= 4):
commands.append(unicode(self.getParameterValue(lasthin.THRESHOLD_OR_INTERVAL)))
if self.getParameterValue(lasthin.WITHHELD):
commands.append("-withheld")

10
python/plugins/processing/algs/lidar/lastools/lasthinPro.py
View File

@ -46,8 +46,8 @@ class lasthinPro(LAStoolsAlgorithm):
self.name, self.i18n_name = self.trAlgorithm('lasthinPro')
self.group, self.i18n_group = self.trAlgorithm('LAStools Production')
self.addParametersPointInputFolderGUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParametersIgnoreClass1GUI()
self.addParametersIgnoreClass2GUI()
self.addParameter(ParameterNumber(lasthinPro.THIN_STEP,
self.tr("size of grid used for thinning"), 0, None, 1.0))
self.addParameter(ParameterSelection(lasthinPro.OPERATION,
@ -71,8 +71,8 @@ class lasthinPro(LAStoolsAlgorithm):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "lasthin")]
self.addParametersVerboseCommands(commands)
self.addParametersPointInputFolderCommands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
self.addParametersIgnoreClass1Commands(commands)
self.addParametersIgnoreClass2Commands(commands)
step = self.getParameterValue(lasthinPro.THIN_STEP)
if step != 0.0:
commands.append("-step")
@ -80,7 +80,7 @@ class lasthinPro(LAStoolsAlgorithm):
operation = self.getParameterValue(lasthinPro.OPERATION)
if (operation != 0):
commands.append("-" + self.OPERATIONS[operation])
if (operation >= 4):
if (operation >= 4):
commands.append(unicode(self.getParameterValue(lasthinPro.THRESHOLD_OR_INTERVAL)))
if self.getParameterValue(lasthinPro.WITHHELD):
commands.append("-withheld")

2
python/plugins/processing/algs/lidar/lastools/laszip.py
View File

@ -51,7 +51,7 @@ class laszip(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "laszip.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "laszip")]

2
python/plugins/processing/algs/lidar/lastools/laszipPro.py
View File

@ -54,7 +54,7 @@ class laszipPro(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "laszip.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "laszip")]

2
python/plugins/processing/algs/lidar/lastools/txt2las.py
View File

@ -75,7 +75,7 @@ class txt2las(LAStoolsAlgorithm):
self.addParametersAdditionalGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "txt2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "txt2las")]

2
python/plugins/processing/algs/lidar/lastools/txt2lasPro.py
View File

@ -75,7 +75,7 @@ class txt2lasPro(LAStoolsAlgorithm):
self.addParametersVerboseGUI()
def processAlgorithm(self, progress):
if (LAStoolsUtils.hasWine()):
if (LAStoolsUtils.hasWine()):
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "txt2las.exe")]
else:
commands = [os.path.join(LAStoolsUtils.LAStoolsPath(), "bin", "txt2las")]