[otb] add multiple input support

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@88 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Apr 13, 2012 · 8e3bc87 · 8e3bc87
1 parent effb815
commit 8e3bc87
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 2 deletions.
diff --git a/src/sextante/otb/description/BandMath.txt b/src/sextante/otb/description/BandMath.txt
@@ -1,6 +1,7 @@
 otbcli_BandMath
 BandMath
 OTB
+ParameterMultipleInput|-il|Input image list|3|False
 OutputRaster|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
 ParameterString|-exp|Expression|
diff --git a/src/sextante/otb/description/ComputeImagesStatistics.txt b/src/sextante/otb/description/ComputeImagesStatistics.txt
@@ -1,4 +1,5 @@
 otbcli_ComputeImagesStatistics
 ComputeImagesStatistics
 OTB
+ParameterMultipleInput|-il|Input images|3|False
 ParameterString|-out|Output XML file|
diff --git a/src/sextante/otb/description/ConcatenateImages.txt b/src/sextante/otb/description/ConcatenateImages.txt
@@ -1,5 +1,6 @@
 otbcli_ConcatenateImages
 ConcatenateImages
 OTB
+ParameterMultipleInput|-il|Input images list|3|False
 OutputRaster|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
diff --git a/src/sextante/otb/description/ConcatenateVectorData.txt b/src/sextante/otb/description/ConcatenateVectorData.txt
@@ -1,4 +1,5 @@
 otbcli_ConcatenateVectorData
 ConcatenateVectorData
 OTB
+ParameterMultipleInput|-vd|Input VectorDatas to concatenate|-1|False
 OutputVector|-out|Concatenated VectorData|
diff --git a/src/sextante/otb/description/TrainSVMImagesClassifier.txt b/src/sextante/otb/description/TrainSVMImagesClassifier.txt
@@ -1,6 +1,8 @@
 otbcli_TrainSVMImagesClassifier
 TrainSVMImagesClassifier
 OTB
+ParameterMultipleInput|-io.il|Input Image List|3|False
+ParameterMultipleInput|-io.vd|Vector Data List|-1|False
 ParameterString|-io.imstat|XML image statistics file|
 ParameterString|-io.out|Output SVM model|
 ParameterSelection|-elev|Elevation management|dem;average;

diff --git a/src/sextante/otb/description/ValidateSVMImagesClassifier.txt b/src/sextante/otb/description/ValidateSVMImagesClassifier.txt
@@ -1,6 +1,8 @@
 otbcli_ValidateSVMImagesClassifier
 ValidateSVMImagesClassifier
 OTB
+ParameterMultipleInput|-il|Input Image List|3|False
+ParameterMultipleInput|-vd|Vector Data List|-1|False
 ParameterString|-imstat|XML image statistics file|
 ParameterSelection|-elev|Elevation management|dem;average;
 ParameterString|-elev.dem.path|DEM directory|

diff --git a/src/sextante/otb/helper/generate_application_descriptors.py b/src/sextante/otb/helper/generate_application_descriptors.py
@@ -194,7 +194,21 @@ def generate_parameter_InputImage( appInstance, paramKey ):
 
 
 def generate_parameter_InputImageList( appInstance, paramKey ):
-  return ""
+  out = "ParameterMultipleInput"
+  out += "|"
+
+  out += "-" + paramKey
+  out += "|"
+
+  out += convertendl(appInstance.GetParameterName(paramKey))
+  out += "|"
+
+  out += "3"
+  out += "|"
+
+  out += str(not appInstance.IsMandatory(paramKey))
+
+  return out
 
 def generate_parameter_InputVectorData( appInstance, paramKey ):
   out = "ParameterVector"
@@ -212,7 +226,21 @@ def generate_parameter_InputVectorData( appInstance, paramKey ):
 
 
 def generate_parameter_InputVectorDataList( appInstance, paramKey ):
-  return ""
+  out = "ParameterMultipleInput"
+  out += "|"
+
+  out += "-" + paramKey
+  out += "|"
+
+  out += convertendl(appInstance.GetParameterName(paramKey))
+  out += "|"
+
+  out += "-1"
+  out += "|"
+
+  out += str(not appInstance.IsMandatory(paramKey))
+
+  return out
 
 
 def generate_parameter_OutputImage( appInstance, paramKey ):