sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-17 00:09:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2469 from spono/patch-13

Browse Source 
[Processing] Update FilterData.py
This commit is contained in:
volaya 2015-12-15 08:14:10 +01:00
commit 9c0ee36c49
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/plugins/processing/algs/lidar/fusion/CanopyModel.py
View File

@ -28,6 +28,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
import os import os
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterFile from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.core.parameters import ParameterSelection from processing.core.parameters import ParameterSelection
@ -65,7 +66,7 @@ class CanopyModel(FusionAlgorithm):
self.addParameter(ParameterSelection( self.addParameter(ParameterSelection(
self.ZUNITS, self.tr('Z Units'), self.UNITS)) self.ZUNITS, self.tr('Z Units'), self.UNITS))
self.addOutput(OutputFile( self.addOutput(OutputFile(
self.OUTPUT_DTM, self.tr('DTM Output Surface'), 'dtm')) self.OUTPUT_DTM, self.tr('.dtm output surface'), 'dtm'))
ground = ParameterFile( ground = ParameterFile(
self.GROUND, self.tr('Input ground DTM layer'), False, True) self.GROUND, self.tr('Input ground DTM layer'), False, True)
ground.isAdvanced = True ground.isAdvanced = True

12
python/plugins/processing/algs/lidar/fusion/FilterData.py
View File

@ -26,7 +26,6 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$' __revision__ = '$Format:%H$'
import os import os
import subprocess
from processing.core.parameters import ParameterFile from processing.core.parameters import ParameterFile
from processing.core.parameters import ParameterNumber from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputFile from processing.core.outputs import OutputFile
@ -50,7 +49,7 @@ class FilterData(FusionAlgorithm):
self.addParameter(ParameterNumber( self.addParameter(ParameterNumber(
self.VALUE, self.tr('Standard Deviation multiplier'))) self.VALUE, self.tr('Standard Deviation multiplier')))
self.addParameter(ParameterNumber( self.addParameter(ParameterNumber(
self.VALUE, self.tr('Window size'), None, None, 10)) self.WINDOWSIZE, self.tr('Window size'), None, None, 10))
self.addOutput(OutputFile( self.addOutput(OutputFile(
self.OUTPUT, self.tr('Output filtered LAS file'))) self.OUTPUT, self.tr('Output filtered LAS file')))
self.addAdvancedModifiers() self.addAdvancedModifiers()
@ -59,10 +58,10 @@ class FilterData(FusionAlgorithm):
commands = [os.path.join(FusionUtils.FusionPath(), 'FilterData.exe')] commands = [os.path.join(FusionUtils.FusionPath(), 'FilterData.exe')]
commands.append('/verbose') commands.append('/verbose')
self.addAdvancedModifiersToCommand(commands) self.addAdvancedModifiersToCommand(commands)
commands.append('outlier') commands.append('/outlier')
commands.append(unicode(self.getParameterValue(self.VALUE))) commands.append(unicode(self.getParameterValue(self.VALUE)))
commands.append(unicode(self.getParameterValue(self.WINDOWSIZE))) commands.append(unicode(self.getParameterValue(self.WINDOWSIZE)))
outFile = self.getOutputValue(self.OUTPUT) + '.lda' outFile = self.getOutputValue(self.OUTPUT)
commands.append(outFile) commands.append(outFile)
files = self.getParameterValue(self.INPUT).split(';') files = self.getParameterValue(self.INPUT).split(';')
if len(files) == 1: if len(files) == 1:
@ -71,8 +70,3 @@ class FilterData(FusionAlgorithm):
FusionUtils.createFileList(files) FusionUtils.createFileList(files)
commands.append(FusionUtils.tempFileListFilepath()) commands.append(FusionUtils.tempFileListFilepath())
FusionUtils.runFusion(commands, progress) FusionUtils.runFusion(commands, progress)
commands = [os.path.join(FusionUtils.FusionPath(), 'LDA2LAS.exe')]
commands.append(outFile)
commands.append(self.getOutputValue(self.OUTPUT))
p = subprocess.Popen(commands, shell=True)
p.wait()