Skip to content

Commit

Permalink
[processing] fixed wrong indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
volaya authored and alexbruy committed Jun 2, 2016
1 parent d46f98d commit 568ddb3
Show file tree
Hide file tree
Showing 29 changed files with 93 additions and 93 deletions.
Expand Up @@ -41,7 +41,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -70,7 +70,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -58,7 +58,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -43,7 +43,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -67,7 +67,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -54,7 +54,7 @@ def defineCharacteristics(self):
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")]
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/lidar/lastools/las2txt.py
Expand Up @@ -47,7 +47,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -47,7 +47,7 @@ def defineCharacteristics(self):
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")]
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/lidar/lastools/lasdiff.py
Expand Up @@ -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')
Expand All @@ -53,7 +53,7 @@ def defineCharacteristics(self):
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")]
Expand All @@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
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)
Expand Down
Expand Up @@ -77,21 +77,21 @@ def processAlgorithm(self, progress):
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)
Expand Down
16 changes: 8 additions & 8 deletions python/plugins/processing/algs/lidar/lastools/lasground_new.py
Expand Up @@ -74,21 +74,21 @@ def processAlgorithm(self, progress):
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)

Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/lidar/lastools/lasheight.py
Expand Up @@ -44,8 +44,8 @@ def defineCharacteristics(self):
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,
Expand All @@ -63,8 +63,8 @@ def processAlgorithm(self, progress):
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):
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/lidar/lastools/lasheightPro.py
Expand Up @@ -44,8 +44,8 @@ def defineCharacteristics(self):
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,
Expand All @@ -67,8 +67,8 @@ def processAlgorithm(self, progress):
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):
Expand Down
Expand Up @@ -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"

Expand All @@ -51,8 +51,8 @@ def defineCharacteristics(self):
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,
Expand Down Expand Up @@ -86,32 +86,32 @@ def processAlgorithm(self, progress):
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)
Expand Down
28 changes: 14 additions & 14 deletions python/plugins/processing/algs/lidar/lastools/lasheight_classify.py
Expand Up @@ -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"

Expand All @@ -52,8 +52,8 @@ def defineCharacteristics(self):
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,
Expand Down Expand Up @@ -83,32 +83,32 @@ def processAlgorithm(self, progress):
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)

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/lidar/lastools/lasindex.py
Expand Up @@ -47,7 +47,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -48,7 +48,7 @@ def defineCharacteristics(self):
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")]
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/lidar/lastools/lasinfo.py
Expand Up @@ -79,7 +79,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -74,7 +74,7 @@ def defineCharacteristics(self):
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")]
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/lidar/lastools/lasmerge.py
Expand Up @@ -56,7 +56,7 @@ def defineCharacteristics(self):
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")]
Expand Down
Expand Up @@ -41,7 +41,7 @@ def defineCharacteristics(self):
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")]
Expand Down

0 comments on commit 568ddb3

Please sign in to comment.