[otb] use new ParameterFile and OutputFile type

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@126 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Apr 19, 2012 · 32d684f · 32d684f
1 parent e7deb79
commit 32d684f
Show file tree

Hide file tree

Showing 24 changed files with 92 additions and 50 deletions.
diff --git a/src/sextante/otb/description/BundleToPerfectSensor.txt b/src/sextante/otb/description/BundleToPerfectSensor.txt
@@ -4,8 +4,8 @@ Geometry
 ParameterRaster|-inp|Input PAN Image|False
 ParameterRaster|-inxs|Input XS Image|False
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterNumber|-lms|Spacing of the deformation field|None|None|0.0
 OutputRaster|-out|Output image|

diff --git a/src/sextante/otb/description/ColorMapping.txt b/src/sextante/otb/description/ColorMapping.txt
@@ -7,7 +7,7 @@ ParameterNumber|-ram|Available RAM (Mb)|None|None|128
 ParameterSelection|-op|Operation|labeltocolor;colortolabel
 ParameterNumber|-op.colortolabel.notfound|Not Found Label|None|None|404
 ParameterSelection|-method|Color mapping method|custom;continuous;optimal;image
-ParameterString|-method.custom.lut|Look-up table file|
+ParameterFile|-method.custom.lut|Look-up table file|
 ParameterSelection|-method.continuous.lut|Look-up tables|red;green;blue;grey;hot;cool;spring;summer;autumn;winter;copper;jet;hsv;overunder;relief
 ParameterNumber|-method.continuous.min|Mapping range lower value|None|None|0.0
 ParameterNumber|-method.continuous.max|Mapping range higher value|None|None|255.0

diff --git a/src/sextante/otb/description/ComputeImagesStatistics.txt b/src/sextante/otb/description/ComputeImagesStatistics.txt
@@ -2,4 +2,4 @@ otbcli_ComputeImagesStatistics
 Compute Images second order statistics
 Learning
 ParameterMultipleInput|-il|Input images|3|False
-ParameterString|-out|Output XML file|
+OutputFile|-out|Output XML file|
diff --git a/src/sextante/otb/description/ComputePolylineFeatureFromImage.txt b/src/sextante/otb/description/ComputePolylineFeatureFromImage.txt
@@ -4,8 +4,8 @@ Feature Extraction
 ParameterRaster|-in|Input Image|False
 ParameterVector|-vd|Vector Data|-1|False
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterString|-expr|Feature expression|
 ParameterString|-field|Feature name|

diff --git a/src/sextante/otb/description/ConnectedComponentSegmentation.txt b/src/sextante/otb/description/ConnectedComponentSegmentation.txt
@@ -8,6 +8,6 @@ ParameterString|-expr|Connected Component Expression|
 ParameterNumber|-minsize|Minimum Object Size|None|None|2
 ParameterString|-obia|OBIA Expression|
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
diff --git a/src/sextante/otb/description/DSFuzzyModelEstimation.txt b/src/sextante/otb/description/DSFuzzyModelEstimation.txt
@@ -5,7 +5,7 @@ ParameterVector|-psin|Input Positive Vector Data|-1|False
 ParameterVector|-nsin|Input Negative Vector Data|-1|False
 ParameterString|-cri|Criterion|((Belief + Plausibility)/2.)
 ParameterNumber|-wgt|Weighting|None|None|0.5
-ParameterString|-initmod|initialization model|
+ParameterFile|-initmod|initialization model|
 ParameterNumber|-maxnbit|Maximum number of iterations|None|None|200
 ParameterBoolean|-optobs|Optimizer Observer|
-ParameterString|-out|Output filename|
+OutputFile|-out|Output filename|
diff --git a/src/sextante/otb/description/ImageEnvelope.txt b/src/sextante/otb/description/ImageEnvelope.txt
@@ -4,7 +4,7 @@ Geometry
 ParameterRaster|-in|Input Image|False
 OutputVector|-out|Output Vector Data|
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterString|-proj|Projection|
diff --git a/src/sextante/otb/description/ImageSVMClassifier.txt b/src/sextante/otb/description/ImageSVMClassifier.txt
@@ -3,7 +3,7 @@ Image SVM Classification
 Learning
 ParameterRaster|-in|Input Image|False
 ParameterRaster|-mask|Input Mask|True
-ParameterString|-svm|SVM Model file|
-ParameterString|-imstat|Statistics file|
+ParameterFile|-svm|SVM Model file|
+ParameterFile|-imstat|Statistics file|
 OutputRaster|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
diff --git a/src/sextante/otb/description/KMeansClassification.txt b/src/sextante/otb/description/KMeansClassification.txt
@@ -9,5 +9,5 @@ ParameterNumber|-ts|Training set size|None|None|100
 ParameterNumber|-nc|Number of classes|None|None|5
 ParameterNumber|-maxit|Maximum number of iterations|None|None|1000
 ParameterNumber|-ct|Convergence threshold|None|None|9.99999974738e-05
-ParameterString|-outmeans|Centroid filename|
+OutputFile|-outmeans|Centroid filename|
 ParameterNumber|-rand|set user defined seed|None|None|0
diff --git a/src/sextante/otb/description/KmzExport.txt b/src/sextante/otb/description/KmzExport.txt
@@ -2,11 +2,11 @@ otbcli_KmzExport
 Image to KMZ Export
 Miscellaneous
 ParameterRaster|-in|Input image|False
-ParameterString|-out|Output .kmz product|
+OutputFile|-out|Output .kmz product|
 ParameterNumber|-tilesize|Tile Size|None|None|0
 ParameterRaster|-logo|Image logo|True
 ParameterRaster|-legend|Image legend|True
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
diff --git a/src/sextante/otb/description/LineSegmentDetection.txt b/src/sextante/otb/description/LineSegmentDetection.txt
@@ -4,7 +4,7 @@ Feature Extraction
 ParameterRaster|-in|Input Image|False
 OutputVector|-out|Output Detected lines|
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterBoolean|-norescale|No rescaling in [0, 255]|
diff --git a/src/sextante/otb/description/MultiResolutionPyramid.txt b/src/sextante/otb/description/MultiResolutionPyramid.txt
@@ -2,7 +2,7 @@ otbcli_MultiResolutionPyramid
 Multi Resolution Pyramid
 Image Manipulation
 ParameterRaster|-in|Input Image|False
-ParameterString|-out|Output Image|
+OutputFile|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
 ParameterNumber|-level|Number Of Levels|None|None|1
 ParameterNumber|-sfactor|Subsampling factor|None|None|2

diff --git a/src/sextante/otb/description/OSMDownloader.txt b/src/sextante/otb/description/OSMDownloader.txt
@@ -6,7 +6,7 @@ ParameterRaster|-support|Support image|False
 ParameterString|-key|OSM tag key|
 ParameterString|-value|OSM tag value|
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterBoolean|-printclasses|option to display available key/value classes|
diff --git a/src/sextante/otb/description/OpticalCalibration.txt b/src/sextante/otb/description/OpticalCalibration.txt
@@ -6,10 +6,10 @@ OutputRaster|-out|Output|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
 ParameterSelection|-level|Calibration Level|toa;toc
 ParameterBoolean|-milli|Convert to milli reflectance|
-ParameterString|-rsr|Relative Spectral Response File|
+ParameterFile|-rsr|Relative Spectral Response File|
 ParameterSelection|-atmo.aerosol|Aerosol Model|noaersol;continental;maritime;urban;desertic
 ParameterNumber|-atmo.oz|Ozone Amount|None|None|0.0
 ParameterNumber|-atmo.wa|Water Vapor Amount|None|None|2.5
 ParameterNumber|-atmo.pressure|Atmospheric Pressure|None|None|1030.0
 ParameterNumber|-atmo.opt|Aerosol Optical Thickness|None|None|0.20000000298
-ParameterString|-atmo.aeronet|Aeronet File|
+ParameterFile|-atmo.aeronet|Aeronet File|
diff --git a/src/sextante/otb/description/OrthoRectification.txt b/src/sextante/otb/description/OrthoRectification.txt
@@ -20,8 +20,8 @@ ParameterNumber|-outputs.spacingy|Pixel Size Y|None|None|0.0
 ParameterBoolean|-outputs.isotropic|Force isotropic spacing by default|True
 ParameterNumber|-outputs.default|Default pixel value|None|None|0.0
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterSelection|-interpolator|Interpolation|nn;linear;bco
 ParameterNumber|-interpolator.bco.radius|Radius for bicubic interpolation|None|None|2

diff --git a/src/sextante/otb/description/SplitImage.txt b/src/sextante/otb/description/SplitImage.txt
@@ -2,5 +2,5 @@ otbcli_SplitImage
 Split Image
 Image Manipulation
 ParameterRaster|-in|Input Image|False
-ParameterString|-out|Output Image|
+OutputFile|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
diff --git a/src/sextante/otb/description/StereoRectificationGridGenerator.txt b/src/sextante/otb/description/StereoRectificationGridGenerator.txt
@@ -7,14 +7,14 @@ OutputRaster|-io.outleft|Left output deformation grid|
 OutputRaster|-io.outright|Right output deformation grid|
 ParameterSelection|-epi.elevation|Elevation management|avg;avgdem;dem
 ParameterNumber|-epi.elevation.avg.value|Average elevation value|None|None|0.0
-ParameterString|-epi.elevation.avgdem.path|DEM directory|
-ParameterString|-epi.elevation.avgdem.geoid|Geoid file|
+ParameterFile|-epi.elevation.avgdem.path|DEM directory|
+ParameterFile|-epi.elevation.avgdem.geoid|Geoid file|
 ParameterNumber|-epi.elevation.avgdem.step|Sub-sampling step|None|None|1
 ParameterNumber|-epi.elevation.avgdem.value|Average elevation value|None|None|0.0
 ParameterNumber|-epi.elevation.avgdem.mindisp|Minimum disparity from DEM|None|None|0.0
 ParameterNumber|-epi.elevation.avgdem.maxdisp|Maximum disparity from DEM|None|None|0.0
-ParameterString|-epi.elevation.dem.path|DEM directory|
-ParameterString|-epi.elevation.dem.geoid|Geoid file|
+ParameterFile|-epi.elevation.dem.path|DEM directory|
+ParameterFile|-epi.elevation.dem.geoid|Geoid file|
 ParameterNumber|-epi.scale|Scale of epipolar images|None|None|1.0
 ParameterNumber|-epi.step|Step of the deformation grid (in nb. of pixels)|None|None|1
 ParameterNumber|-epi.rectsizex|Rectified image size X|None|None|0

diff --git a/src/sextante/otb/description/StereoSensorModelToElevationMap.txt b/src/sextante/otb/description/StereoSensorModelToElevationMap.txt
@@ -13,8 +13,8 @@ ParameterNumber|-maxh|MaxHeightOffset|None|None|20.0
 ParameterNumber|-step|HeightStep|None|None|1.0
 ParameterNumber|-ae|AverageElevation|None|None|0.0
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterNumber|-rgs|ReferenceGaussianSmoothing|None|None|1.0
 ParameterNumber|-sgs|SecondaryGaussianSmoothing|None|None|1.0

diff --git a/src/sextante/otb/description/Superimpose.txt b/src/sextante/otb/description/Superimpose.txt
@@ -4,8 +4,8 @@ Geometry
 ParameterRaster|-inr|Reference input|False
 ParameterRaster|-inm|The image to reproject|False
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterNumber|-lms|Spacing of the deformation field|None|None|4.0
 OutputRaster|-out|Output image|

diff --git a/src/sextante/otb/description/TrainSVMImagesClassifier.txt b/src/sextante/otb/description/TrainSVMImagesClassifier.txt
@@ -3,11 +3,11 @@ Train SVM classifier from multiple images
 Learning
 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|
+ParameterFile|-io.imstat|XML image statistics file|
+OutputFile|-io.out|Output SVM model|
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
 ParameterNumber|-sample.mt|Maximum training sample size|None|None|-1
 ParameterNumber|-sample.mv|Maximum validation sample size|None|None|-1

diff --git a/src/sextante/otb/description/ValidateSVMImagesClassifier.txt b/src/sextante/otb/description/ValidateSVMImagesClassifier.txt
@@ -3,11 +3,11 @@ Validate SVM Images Classifier
 Learning
 ParameterMultipleInput|-il|Input Image List|3|False
 ParameterMultipleInput|-vd|Vector Data List|-1|False
-ParameterString|-imstat|XML image statistics file|
+ParameterFile|-imstat|XML image statistics file|
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
-ParameterString|-out|Output filename|
-ParameterString|-svm|SVM validation filename|
+OutputFile|-out|Output filename|
+ParameterFile|-svm|SVM validation filename|
 ParameterNumber|-rand|set user defined seed|None|None|0
diff --git a/src/sextante/otb/description/VectorDataDSValidation.txt b/src/sextante/otb/description/VectorDataDSValidation.txt
@@ -2,7 +2,7 @@ otbcli_VectorDataDSValidation
 Vector Data validation
 Feature Extraction
 ParameterVector|-in|Input Vector Data|-1|False
-ParameterString|-descmod|Descriptors model filename|
+ParameterFile|-descmod|Descriptors model filename|
 ParameterString|-cri|Criterion|((Belief + Plausibility)/2.)
 ParameterNumber|-thd|Criterion threshold|None|None|0.5
 OutputVector|-out|Output Vector Data|
diff --git a/src/sextante/otb/description/VectorDataExtractROIApplication.txt b/src/sextante/otb/description/VectorDataExtractROIApplication.txt
@@ -5,6 +5,6 @@ ParameterVector|-io.vd|Input Vector data|-1|False
 ParameterRaster|-io.in|Support image|False
 OutputVector|-io.out|Output Vector data|
 ParameterSelection|-elev|Elevation management|dem;average
-ParameterString|-elev.dem.path|DEM directory|
-ParameterString|-elev.dem.geoid|Geoid File|
+ParameterFile|-elev.dem.path|DEM directory|
+ParameterFile|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
diff --git a/src/sextante/otb/helper/generate_application_descriptors.py b/src/sextante/otb/helper/generate_application_descriptors.py
@@ -162,13 +162,55 @@ def generate_parameter_String( appInstance, paramKey ):
 
 
 def generate_parameter_InputFilename( appInstance, paramKey ):
-  return generate_parameter_String( appInstance, paramKey )
+  out = "ParameterFile"
+  out += "|"
+
+  out += "-" + paramKey
+  out += "|"
+
+  out += convertendl(appInstance.GetParameterName(paramKey))
+  out += "|"
+
+  defaultVal = ""
+  try:
+    defaultVal = str(appInstance.GetParameterString(paramKey))
+  except:
+    pass
+  out += defaultVal
+  return out
+
 
 def generate_parameter_OutputFilename( appInstance, paramKey ):
+  out = "OutputFile"
+  out += "|"
+
+  out += "-" + paramKey
+  out += "|"
+
+  out += convertendl(appInstance.GetParameterName(paramKey))
+  out += "|"
+
+  return out
+
   return generate_parameter_String( appInstance, paramKey )
 
 def generate_parameter_Directory( appInstance, paramKey ):
-  return generate_parameter_String( appInstance, paramKey )
+  out = "ParameterFile"
+  out += "|"
+
+  out += "-" + paramKey
+  out += "|"
+
+  out += convertendl(appInstance.GetParameterName(paramKey))
+  out += "|"
+
+  defaultVal = ""
+  try:
+    defaultVal = str(appInstance.GetParameterString(paramKey))
+  except:
+    pass
+  out += defaultVal
+  return out
 
 def generate_parameter_Choice( appInstance, paramKey ):
   out = "ParameterSelection"