reorganized lidar tools

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@242 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Jun 14, 2012 · 9f7013a · 9f7013a
1 parent 1fd5368
commit 9f7013a
Show file tree

Hide file tree

Showing 39 changed files with 98 additions and 68 deletions.
diff --git a/src/sextante/core/Sextante.py b/src/sextante/core/Sextante.py
@@ -23,6 +23,7 @@
 from sextante.fusion.FusionAlgorithmProvider import FusionAlgorithmProvider
 from sextante.pymorph.PymorphAlgorithmProvider import PymorphAlgorithmProvider
 from sextante.mmqgisx.MMQGISXAlgorithmProvider import MMQGISXAlgorithmProvider
+from sextante.lidar.LidarToolsAlgorithmProvider import LidarToolsAlgorithmProvider
 
 class Sextante:
 
@@ -89,9 +90,7 @@ def initialize():
         Sextante.addProvider(ModelerOnlyAlgorithmProvider())
         Sextante.addProvider(GdalAlgorithmProvider())
         Sextante.addProvider(PymorphAlgorithmProvider())
-        Sextante.addProvider(LasToolsAlgorithmProvider())
-        if SextanteUtils.isWindows():
-            Sextante.addProvider(FusionAlgorithmProvider())
+        Sextante.addProvider(LidarToolsAlgorithmProvider())
         Sextante.addProvider(OTBAlgorithmProvider())
         Sextante.addProvider(RAlgorithmProvider())
         Sextante.addProvider(SagaAlgorithmProvider())
@@ -316,7 +315,7 @@ def runandload(name, *args):
             Sextante.alghelp(name)
             return
 
-        alg = alg.getCopy()#copy.deepcopy(alg)
+        alg = alg.getCopy()
         i = 0
         for param in alg.parameters:
             if not param.setValue(args[i]):
@@ -343,12 +342,12 @@ def finish():
             QApplication.restoreOverrideCursor()
         def error(msg):
             QApplication.restoreOverrideCursor()
-            QMessageBox.critical(self, "Error", msg)
+            QMessageBox.critical(None, "Error", msg)
             SextanteLog.addToLog(SextanteLog.LOG_ERROR, msg)
         algEx.error.connect(error)
         algEx.finished.connect(finish)
         algEx.start()
-        
-        
+
+
 
 
diff --git a/src/sextante/gui/AlgorithmExecutor.py b/src/sextante/gui/AlgorithmExecutor.py
@@ -57,9 +57,9 @@ def runalg(self):
             # if self.algorithm.canceled:
             #    self.canceled.emit()
             #===================================================================
-        except GeoAlgorithmExecutionException as e :
+        except GeoAlgorithmExecutionException,e :
             self.error.emit(e.msg)
-        except BaseException as e:
+        except BaseException,e:
             self.error.emit(str(e))
 
     def runalgIterating(self):

diff --git a/src/sextante/gui/BatchProcessingDialog.py b/src/sextante/gui/BatchProcessingDialog.py
@@ -16,6 +16,7 @@
 from sextante.outputs.OutputHTML import OutputHTML
 from sextante.core.SextanteResults import SextanteResults
 from sextante.gui.ResultsDialog import ResultsDialog
+from sextante.core.SextanteLog import SextanteLog
 
 class BatchProcessingDialog(QtGui.QDialog):
     def __init__(self, alg):
@@ -101,9 +102,9 @@ def okPressed(self):
         self.progress.setMaximum(len(self.algs))
         self.progress.setValue(0)
         self.nextAlg(0)
-            
+
         self.table.setEnabled(False)
-        
+
     def loadHTMLResults(self, alg, i):
         for out in alg.outputs:
             if out.hidden or not out.open:
@@ -131,13 +132,13 @@ def error(self, msg):
         QMessageBox.critical(self, "Error", msg)
         SextanteLog.addToLog(SextanteLog.LOG_ERROR, msg)
         self.close()
-            
+
     def nextAlg(self, i):
         self.algEx = AlgorithmExecutor(self.algs[i]);
         self.algEx.error.connect(self.error)
         self.algEx.finished.connect(lambda: self.finish(i))
         self.algEx.start()
-    
+
     def finishAll(self):
         i = 0
         for alg in self.algs:

diff --git a/src/sextante/gui/ParametersDialog.py b/src/sextante/gui/ParametersDialog.py
@@ -161,6 +161,7 @@ def accept(self):
                 QMessageBox.critical(self.dialog, "Unable to execute algorithm", msg)
                 return
             self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(False)
+            self.buttonBox.button(QtGui.QDialogButtonBox.Close).setEnabled(False)
             buttons = self.paramTable.iterateButtons
             iterateParam = None
 
@@ -193,15 +194,14 @@ def accept(self):
     def finish(self):
         self.dialog.executed = True
         QApplication.restoreOverrideCursor()
-
         keepOpen = SextanteConfig.getSetting(SextanteConfig.KEEP_DIALOG_OPEN)
-
         if not keepOpen:
             self.dialog.close()
         else:
             self.progressLabel.setText("")
             self.progress.setValue(0)
             self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled(True)
+            self.buttonBox.button(QtGui.QDialogButtonBox.Close).setEnabled(True)
         self.buttonBox.button(QtGui.QDialogButtonBox.Cancel).setEnabled(False)
         SextantePostprocessing.handleAlgorithmResults(self.alg, not keepOpen)
 
@@ -211,6 +211,7 @@ def error(self, msg):
         QApplication.restoreOverrideCursor()
         QMessageBox.critical(self, "Error", msg)
         SextanteLog.addToLog(SextanteLog.LOG_ERROR, msg)
+        keepOpen = SextanteConfig.getSetting(SextanteConfig.KEEP_DIALOG_OPEN)
         if not keepOpen:
             self.dialog.close()
         else:

diff --git a/src/sextante/lastools/LasToolsAlgorithmProvider.py b/src/sextante/lastools/LasToolsAlgorithmProvider.py
diff --git a/src/sextante/lidar/LidarToolsAlgorithmProvider.py b/src/sextante/lidar/LidarToolsAlgorithmProvider.py
@@ -0,0 +1,75 @@
+import os
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from sextante.core.AlgorithmProvider import AlgorithmProvider
+from sextante.core.SextanteUtils import SextanteUtils
+from sextante.lidar.lastools.LasToolsUtils import LasToolsUtils
+from sextante.core.SextanteConfig import Setting, SextanteConfig
+from sextante.lidar.lastools.las2dem import las2dem
+from sextante.lidar.lastools.las2iso import las2iso
+from sextante.lidar.lastools.las2shp import las2shp
+from sextante.lidar.lastools.lasboundary import lasboundary
+from sextante.lidar.lastools.lasgrid import lasgrid
+from sextante.lidar.lastools.lasground import lasground
+from sextante.lidar.lastools.lasclassify import lasclassify
+from sextante.lidar.lastools.lasclip import lasclip
+from sextante.lidar.lastools.lasheight import lasheight
+from sextante.lidar.lastools.lasinfo import lasinfo
+from sextante.lidar.lastools.lasprecision import lasprecision
+from sextante.lidar.lastools.lassplit import lassplit
+from sextante.lidar.fusion.OpenViewerAction import OpenViewerAction
+from sextante.lidar.fusion.CanopyMaxima import CanopyMaxima
+from sextante.lidar.fusion.CanopyModel import CanopyModel
+from sextante.lidar.fusion.ClipData import ClipData
+from sextante.lidar.fusion.CloudMetrics import CloudMetrics
+from sextante.lidar.fusion.Cover import Cover
+from sextante.lidar.fusion.GridMetrics import GridMetrics
+from sextante.lidar.fusion.GridSurfaceCreate import GridSurfaceCreate
+from sextante.lidar.fusion.GroundFilter import GroundFilter
+from sextante.lidar.fusion.MergeData import MergeData
+from sextante.lidar.fusion.FilterData import FilterData
+from sextante.lidar.fusion.FusionUtils import FusionUtils
+
+
+class LidarToolsAlgorithmProvider(AlgorithmProvider):
+
+    def __init__(self):
+        AlgorithmProvider.__init__(self)
+        self.algsList = []
+        if SextanteUtils.isWindows():
+            lastools = [las2shp(), lasboundary(), las2dem(), las2iso(), lasgrid(), lasground(),
+                         lasinfo(), lasheight(), lasprecision(), lassplit(), lasclassify(), lasclip()]
+        else:
+            self.lastools = [lasinfo(), lasprecision()]
+        for alg in lastools:
+            alg.group = "LASTools"
+        self.algsList.extend(lastools)
+
+        if SextanteUtils.isWindows():
+            self.actions.append(OpenViewerAction())
+            fusiontools = [CloudMetrics(), CanopyMaxima(), CanopyModel(), ClipData(), Cover(), FilterData(),
+                         GridMetrics(), GroundFilter(), GridSurfaceCreate(), MergeData()]
+            for alg in fusiontools:
+                alg.group = "Fusion"
+            self.algsList.extend(fusiontools)
+
+    def initializeSettings(self):
+        AlgorithmProvider.initializeSettings(self)
+        SextanteConfig.addSetting(Setting(self.getDescription(), LasToolsUtils.LASTOOLS_FOLDER, "LASTools folder", LasToolsUtils.LasToolsPath()))
+        SextanteConfig.addSetting(Setting(self.getDescription(), FusionUtils.FUSION_FOLDER, "Fusion folder",
+                                          FusionUtils.FusionPath()))
+
+    def getName(self):
+        return "lidartools"
+
+    def getDescription(self):
+        return "Tools for LiDAR data"
+
+    def getIcon(self):
+        return QIcon(os.path.dirname(__file__) + "/../images/tool.png")
+
+    def _loadAlgorithms(self):
+        self.algs = self.algsList
+
+    def getSupportedOutputTableExtensions(self):
+        return ["csv"]
diff --git a/src/sextante/fusion/__init__.py → src/sextante/lidar/__init__.py b/src/sextante/fusion/__init__.py → src/sextante/lidar/__init__.py
diff --git a/src/sextante/fusion/CanopyMaxima.py → src/sextante/lidar/fusion/CanopyMaxima.py b/src/sextante/fusion/CanopyMaxima.py → src/sextante/lidar/fusion/CanopyMaxima.py
diff --git a/src/sextante/fusion/CanopyModel.py → src/sextante/lidar/fusion/CanopyModel.py b/src/sextante/fusion/CanopyModel.py → src/sextante/lidar/fusion/CanopyModel.py
diff --git a/src/sextante/fusion/ClipData.py → src/sextante/lidar/fusion/ClipData.py b/src/sextante/fusion/ClipData.py → src/sextante/lidar/fusion/ClipData.py
diff --git a/src/sextante/fusion/CloudMetrics.py → src/sextante/lidar/fusion/CloudMetrics.py b/src/sextante/fusion/CloudMetrics.py → src/sextante/lidar/fusion/CloudMetrics.py
diff --git a/src/sextante/fusion/Cover.py → src/sextante/lidar/fusion/Cover.py b/src/sextante/fusion/Cover.py → src/sextante/lidar/fusion/Cover.py
diff --git a/src/sextante/fusion/DensityMetrics.py → src/sextante/lidar/fusion/DensityMetrics.py b/src/sextante/fusion/DensityMetrics.py → src/sextante/lidar/fusion/DensityMetrics.py
diff --git a/src/sextante/fusion/FilterData.py → src/sextante/lidar/fusion/FilterData.py b/src/sextante/fusion/FilterData.py → src/sextante/lidar/fusion/FilterData.py
diff --git a/src/sextante/fusion/FusionAlgorithm.py → src/sextante/lidar/fusion/FusionAlgorithm.py b/src/sextante/fusion/FusionAlgorithm.py → src/sextante/lidar/fusion/FusionAlgorithm.py
diff --git a/...extante/fusion/FusionAlgorithmProvider.py → ...e/lidar/fusion/FusionAlgorithmProvider.py b/...extante/fusion/FusionAlgorithmProvider.py → ...e/lidar/fusion/FusionAlgorithmProvider.py
diff --git a/src/sextante/fusion/FusionUtils.py → src/sextante/lidar/fusion/FusionUtils.py b/src/sextante/fusion/FusionUtils.py → src/sextante/lidar/fusion/FusionUtils.py
diff --git a/src/sextante/fusion/GridMetrics.py → src/sextante/lidar/fusion/GridMetrics.py b/src/sextante/fusion/GridMetrics.py → src/sextante/lidar/fusion/GridMetrics.py
diff --git a/src/sextante/fusion/GridSurfaceCreate.py → ...extante/lidar/fusion/GridSurfaceCreate.py b/src/sextante/fusion/GridSurfaceCreate.py → ...extante/lidar/fusion/GridSurfaceCreate.py
diff --git a/src/sextante/fusion/GroundFilter.py → src/sextante/lidar/fusion/GroundFilter.py b/src/sextante/fusion/GroundFilter.py → src/sextante/lidar/fusion/GroundFilter.py
diff --git a/src/sextante/fusion/MergeData.py → src/sextante/lidar/fusion/MergeData.py b/src/sextante/fusion/MergeData.py → src/sextante/lidar/fusion/MergeData.py
diff --git a/src/sextante/fusion/OpenViewerAction.py → ...sextante/lidar/fusion/OpenViewerAction.py b/src/sextante/fusion/OpenViewerAction.py → ...sextante/lidar/fusion/OpenViewerAction.py
diff --git a/src/sextante/lastools/__init__.py → src/sextante/lidar/fusion/__init__.py b/src/sextante/lastools/__init__.py → src/sextante/lidar/fusion/__init__.py
diff --git a/src/sextante/lastools/LasToolsAlgorithm.py → ...tante/lidar/lastools/LasToolsAlgorithm.py b/src/sextante/lastools/LasToolsAlgorithm.py → ...tante/lidar/lastools/LasToolsAlgorithm.py
diff --git a/src/sextante/lastools/LasToolsUtils.py → src/sextante/lidar/lastools/LasToolsUtils.py b/src/sextante/lastools/LasToolsUtils.py → src/sextante/lidar/lastools/LasToolsUtils.py
diff --git a/src/sextante/lidar/lastools/__init__.py b/src/sextante/lidar/lastools/__init__.py
diff --git a/src/sextante/lastools/las2dem.py → src/sextante/lidar/lastools/las2dem.py b/src/sextante/lastools/las2dem.py → src/sextante/lidar/lastools/las2dem.py
diff --git a/src/sextante/lastools/las2iso.py → src/sextante/lidar/lastools/las2iso.py b/src/sextante/lastools/las2iso.py → src/sextante/lidar/lastools/las2iso.py
diff --git a/src/sextante/lastools/las2shp.py → src/sextante/lidar/lastools/las2shp.py b/src/sextante/lastools/las2shp.py → src/sextante/lidar/lastools/las2shp.py
diff --git a/src/sextante/lastools/lasboundary.py → src/sextante/lidar/lastools/lasboundary.py b/src/sextante/lastools/lasboundary.py → src/sextante/lidar/lastools/lasboundary.py
diff --git a/src/sextante/lastools/lasclassify.py → src/sextante/lidar/lastools/lasclassify.py b/src/sextante/lastools/lasclassify.py → src/sextante/lidar/lastools/lasclassify.py
diff --git a/src/sextante/lastools/lasclip.py → src/sextante/lidar/lastools/lasclip.py b/src/sextante/lastools/lasclip.py → src/sextante/lidar/lastools/lasclip.py
diff --git a/src/sextante/lastools/lasgrid.py → src/sextante/lidar/lastools/lasgrid.py b/src/sextante/lastools/lasgrid.py → src/sextante/lidar/lastools/lasgrid.py
diff --git a/src/sextante/lastools/lasground.py → src/sextante/lidar/lastools/lasground.py b/src/sextante/lastools/lasground.py → src/sextante/lidar/lastools/lasground.py
diff --git a/src/sextante/lastools/lasheight.py → src/sextante/lidar/lastools/lasheight.py b/src/sextante/lastools/lasheight.py → src/sextante/lidar/lastools/lasheight.py
diff --git a/src/sextante/lastools/lasinfo.py → src/sextante/lidar/lastools/lasinfo.py b/src/sextante/lastools/lasinfo.py → src/sextante/lidar/lastools/lasinfo.py
diff --git a/src/sextante/lastools/lasprecision.py → src/sextante/lidar/lastools/lasprecision.py b/src/sextante/lastools/lasprecision.py → src/sextante/lidar/lastools/lasprecision.py
diff --git a/src/sextante/lastools/lassplit.py → src/sextante/lidar/lastools/lassplit.py b/src/sextante/lastools/lassplit.py → src/sextante/lidar/lastools/lassplit.py
diff --git a/src/sextante/saga/description/ReclassifyGridValues.txt b/src/sextante/saga/description/ReclassifyGridValues.txt
@@ -2,17 +2,17 @@ Reclassify Grid Values
 grid_tools
 ParameterRaster|INPUT|Grid|False
 ParameterSelection|METHOD|Method|[0] single;[1] range;[2] simple table
-ParameterNumber|OLD|old value (for single value change)|None|None|0
-ParameterNumber|NEW|new value (for single value change)|None|None|1
+ParameterNumber|OLD|old value (for single value change)|None|None|0.0
+ParameterNumber|NEW|new value (for single value change)|None|None|1.0
 ParameterSelection|SOPERATOR|operator (for single value change)|[0] =;[1] <;[2] <=;[3] >=;[4] >
-ParameterNumber|MIN|minimum value (for range)|None|None|0
-ParameterNumber|MAX|maximum value (for range)|None|None|1
-ParameterNumber|RNEW|new value(for range)|None|None|2
+ParameterNumber|MIN|minimum value (for range)|None|None|0.0
+ParameterNumber|MAX|maximum value (for range)|None|None|1.0
+ParameterNumber|RNEW|new value(for range)|None|None|2.0
 ParameterSelection|ROPERATOR|operator (for range)|[0] <=;[1] <
 ParameterFixedTable|RETAB|Lookup Table|3|minimum;maximum;new|False
 ParameterSelection|TOPERATOR|operator (for table)|[0] min <= value < max;[1] min <= value <= max;[2] min < value <= max;[3] min < value < max
 ParameterBoolean|NODATAOPT      |replace no data values|True
-ParameterNumber|NODATA|new value for no data values|None|None|0
+ParameterNumber|NODATA|new value for no data values|None|None|0.0
 ParameterBoolean|OTHEROPT       |replace other values|True
-ParameterNumber|OTHERS|new value for other values|None|None|0
+ParameterNumber|OTHERS|new value for other values|None|None|0.0
 OutputRaster|RESULT|Reclassified Grid