Skip to content

Commit 1ad2334

Browse files
volayavolaya
committedSep 24, 2013
[processing] improved lidar provider (contributed by Martin Isenburg)
·
ltr-3_40archive/master_2
1 parent 9d9d60a commit 1ad2334

39 files changed

+2142
-332
lines changed
 

‎python/plugins/processing/lidar/LidarToolsAlgorithmProvider.py

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
Date : August 2012
88
Copyright : (C) 2012 by Victor Olaya
99
Email : volayaf at gmail dot com
10+
---------------------
11+
Date : September 2013
12+
Copyright : (C) 2013 by Martin Isenburg
13+
Email : martin near rapidlasso point com
1014
***************************************************************************
1115
* *
1216
* This program is free software; you can redistribute it and/or modify *
@@ -26,22 +30,44 @@
2630
import os
2731
from PyQt4.QtCore import *
2832
from PyQt4.QtGui import *
33+
from processing.core.ProcessingConfig import ProcessingConfig, Setting
34+
from processing.tools.system import isWindows
35+
from processing.lidar.lastools.LAStoolsUtils import LAStoolsUtils
2936
from processing.core.AlgorithmProvider import AlgorithmProvider
30-
from processing.tools.system import *
31-
from processing.lidar.lastools.LasToolsUtils import LasToolsUtils
32-
from processing.core.ProcessingConfig import Setting, ProcessingConfig
33-
from processing.lidar.lastools.las2dem import las2dem
34-
from processing.lidar.lastools.las2iso import las2iso
35-
from processing.lidar.lastools.las2shp import las2shp
36-
from processing.lidar.lastools.lasboundary import lasboundary
37-
from processing.lidar.lastools.lasgrid import lasgrid
3837
from processing.lidar.lastools.lasground import lasground
38+
from processing.lidar.lastools.lasheight import lasheight
3939
from processing.lidar.lastools.lasclassify import lasclassify
40+
from processing.lidar.lastools.laszip import laszip
41+
from processing.lidar.lastools.lasindex import lasindex
4042
from processing.lidar.lastools.lasclip import lasclip
41-
from processing.lidar.lastools.lasheight import lasheight
43+
from processing.lidar.lastools.lasthin import lasthin
44+
from processing.lidar.lastools.lasnoise import lasnoise
45+
from processing.lidar.lastools.lassort import lassort
46+
from processing.lidar.lastools.lastile import lastile
47+
from processing.lidar.lastools.lasgrid import lasgrid
48+
from processing.lidar.lastools.lasview import lasview
49+
from processing.lidar.lastools.lasboundary import lasboundary
4250
from processing.lidar.lastools.lasinfo import lasinfo
51+
from processing.lidar.lastools.las2dem import las2dem
52+
from processing.lidar.lastools.blast2dem import blast2dem
53+
from processing.lidar.lastools.las2iso import las2iso
54+
from processing.lidar.lastools.las2las_filter import las2las_filter
55+
from processing.lidar.lastools.las2las_transform import las2las_transform
56+
from processing.lidar.lastools.blast2iso import blast2iso
4357
from processing.lidar.lastools.lasprecision import lasprecision
58+
from processing.lidar.lastools.lasvalidate import lasvalidate
59+
from processing.lidar.lastools.lasduplicate import lasduplicate
60+
from processing.lidar.lastools.las2txt import las2txt
61+
from processing.lidar.lastools.txt2las import txt2las
62+
from processing.lidar.lastools.las2shp import las2shp
63+
from processing.lidar.lastools.shp2las import shp2las
64+
from processing.lidar.lastools.lasmerge import lasmerge
4465
from processing.lidar.lastools.lassplit import lassplit
66+
from processing.lidar.lastools.lascanopy import lascanopy
67+
from processing.lidar.lastools.lasoverage import lasoverage
68+
from processing.lidar.lastools.lasoverlap import lasoverlap
69+
"""
70+
"""
4571
from processing.lidar.fusion.OpenViewerAction import OpenViewerAction
4672
from processing.lidar.fusion.CanopyMaxima import CanopyMaxima
4773
from processing.lidar.fusion.CanopyModel import CanopyModel
@@ -55,20 +81,18 @@
5581
from processing.lidar.fusion.FilterData import FilterData
5682
from processing.lidar.fusion.FusionUtils import FusionUtils
5783

58-
5984
class LidarToolsAlgorithmProvider(AlgorithmProvider):
6085

6186
def __init__(self):
6287
AlgorithmProvider.__init__(self)
6388
self.activate = False
6489
self.algsList = []
6590
if isWindows():
66-
lastools = [las2shp(), lasboundary(), las2dem(), las2iso(), lasgrid(), lasground(),
67-
lasinfo(), lasheight(), lasprecision(), lassplit(), lasclassify(), lasclip()]
91+
lastools = [lasground(), lasheight(), lasclassify(), lasclip(), lastile(), lasgrid(), las2dem(), blast2dem(), las2iso(), blast2iso(), lasview(), lasboundary(), lasinfo(), lasprecision(), lasvalidate(), lasduplicate(), las2txt(), txt2las(), laszip(), lasindex(), lasthin(), lassort(), lascanopy(), lasmerge(), las2shp(), shp2las(), lasnoise(), lassplit(), las2las_filter(), las2las_transform(), lasoverage(), lasoverlap()]
6892
else:
69-
lastools = [lasinfo(), lasprecision()]
93+
lastools = [lasinfo(), lasprecision(), lasvalidate(), las2txt(), txt2las(), laszip(), lasindex(), lasmerge(), las2las_filter(), las2las_transform()]
7094
for alg in lastools:
71-
alg.group = "LASTools"
95+
alg.group = "LAStools"
7296
self.algsList.extend(lastools)
7397

7498
if isWindows():
@@ -81,9 +105,8 @@ def __init__(self):
81105

82106
def initializeSettings(self):
83107
AlgorithmProvider.initializeSettings(self)
84-
ProcessingConfig.addSetting(Setting(self.getDescription(), LasToolsUtils.LASTOOLS_FOLDER, "LASTools folder", LasToolsUtils.LasToolsPath()))
85-
ProcessingConfig.addSetting(Setting(self.getDescription(), FusionUtils.FUSION_FOLDER, "Fusion folder",
86-
FusionUtils.FusionPath()))
108+
ProcessingConfig.addSetting(Setting(self.getDescription(), LAStoolsUtils.LASTOOLS_FOLDER, "LAStools folder", LAStoolsUtils.LAStoolsPath()))
109+
ProcessingConfig.addSetting(Setting(self.getDescription(), FusionUtils.FUSION_FOLDER, "Fusion folder", FusionUtils.FusionPath()))
87110

88111
def getName(self):
89112
return "lidartools"
@@ -98,4 +121,4 @@ def _loadAlgorithms(self):
98121
self.algs = self.algsList
99122

100123
def getSupportedOutputTableExtensions(self):
101-
return ["csv"]
124+
return ["csv"]

‎python/plugins/processing/lidar/fusion/FusionUtils.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@
1717
***************************************************************************
1818
"""
1919

20+
2021
__author__ = 'Victor Olaya'
2122
__date__ = 'August 2012'
2223
__copyright__ = '(C) 2012, Victor Olaya'
2324
# This will get replaced with a git SHA1 when you do a git archive
2425
__revision__ = '$Format:%H$'
2526

27+
import os
2628
from PyQt4.QtCore import *
2729
from PyQt4.QtGui import *
2830
import subprocess
2931
from processing.core.ProcessingLog import ProcessingLog
3032
from processing.core.ProcessingConfig import ProcessingConfig
31-
import os
32-
from processing.tools.system import *
33+
from processing.tools.system import userFolder
3334

3435
class FusionUtils():
3536

‎python/plugins/processing/lidar/fusion/OpenViewerAction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ def execute(self):
4343
if os.path.exists(f):
4444
subprocess.Popen(f)
4545
else:
46-
QtGui.QMessageBox.critical(None, "Unable to open viewer", "The current Fusion folder does not contain the viewer executable.\nPlease check the configuration in the processing settings dialog.")
46+
QtGui.QMessageBox.critical(None, "Unable to open viewer", "The current Fusion folder does not contain the viewer executable.\nPlease check the configuration in the Processing settings dialog.")

0 commit comments

Comments
 (0)
Please sign in to comment.