[otb] remove last empty choice

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

Hide file tree

Showing 23 changed files with 37 additions and 34 deletions.
diff --git a/src/sextante/otb/description/BundleToPerfectSensor.txt b/src/sextante/otb/description/BundleToPerfectSensor.txt
@@ -3,7 +3,7 @@ BundleToPerfectSensor
 OTB
 ParameterRaster|-inp|Input PAN Image|False
 ParameterRaster|-inxs|Input XS Image|False
-ParameterSelection|-elev|Elevation management|dem;average;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/ColorMapping.txt b/src/sextante/otb/description/ColorMapping.txt
@@ -4,11 +4,11 @@ OTB
 ParameterRaster|-in|Input Image|False
 OutputRaster|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
-ParameterSelection|-op|Operation|labeltocolor;colortolabel;
+ParameterSelection|-op|Operation|labeltocolor;colortolabel
 ParameterNumber|-op.colortolabel.notfound|Not Found Label|None|None|404
-ParameterSelection|-method|Color mapping method|custom;continuous;optimal;image;
+ParameterSelection|-method|Color mapping method|custom;continuous;optimal;image
 ParameterString|-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;
+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
 ParameterNumber|-method.optimal.background|Background label|None|None|0

diff --git a/src/sextante/otb/description/ComputePolylineFeatureFromImage.txt b/src/sextante/otb/description/ComputePolylineFeatureFromImage.txt
@@ -3,7 +3,7 @@ ComputePolylineFeatureFromImage
 OTB
 ParameterRaster|-in|Input Image|False
 ParameterVector|-vd|Vector Data|-1|False
-ParameterSelection|-elev|Elevation management|dem;average;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/ConnectedComponentSegmentation.txt b/src/sextante/otb/description/ConnectedComponentSegmentation.txt
@@ -7,7 +7,7 @@ ParameterString|-mask|Mask expression|
 ParameterString|-expr|Connected Component Expression|
 ParameterNumber|-minsize|Minimum Object Size|None|None|2
 ParameterString|-obia|OBIA Expression|
-ParameterSelection|-elev|Elevation management|dem;average;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
diff --git a/src/sextante/otb/description/Convert.txt b/src/sextante/otb/description/Convert.txt
@@ -2,6 +2,6 @@ otbcli_Convert
 Convert
 OTB
 ParameterRaster|-in|Input image|False
-ParameterSelection|-type|Rescale type|none;linear;log2;
+ParameterSelection|-type|Rescale type|none;linear;log2
 OutputRaster|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
diff --git a/src/sextante/otb/description/ConvertCartoToGeoPoint.txt b/src/sextante/otb/description/ConvertCartoToGeoPoint.txt
@@ -3,7 +3,7 @@ ConvertCartoToGeoPoint
 OTB
 ParameterNumber|-carto.x|X cartographic coordinates|None|None|0.0
 ParameterNumber|-carto.y|Y cartographic coordinates|None|None|0.0
-ParameterSelection|-mapproj|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg;
+ParameterSelection|-mapproj|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg
 ParameterNumber|-mapproj.utm.zone|Zone number|None|None|0
 ParameterBoolean|-mapproj.utm.northhem|Northern Hemisphere|
 ParameterNumber|-mapproj.transmercator.falseeasting|False easting|None|None|0.0

diff --git a/src/sextante/otb/description/GridBasedImageResampling.txt b/src/sextante/otb/description/GridBasedImageResampling.txt
@@ -4,14 +4,14 @@ OTB
 ParameterRaster|-io.in|Input image|False
 OutputRaster|-io.out|Output Image|
 ParameterRaster|-grid.in|Input resampling grid|False
-ParameterSelection|-grid.type|Grid Type|def;loc;
+ParameterSelection|-grid.type|Grid Type|def;loc
 ParameterNumber|-out.ulx|Upper Left X|None|None|0.0
 ParameterNumber|-out.uly|Upper Left Y|None|None|0.0
 ParameterNumber|-out.sizex|Size X|None|None|0
 ParameterNumber|-out.sizey|Size Y|None|None|0
 ParameterNumber|-out.spacingx|Pixel Size X|None|None|1.0
 ParameterNumber|-out.spacingy|Pixel Size Y|None|None|1.0
 ParameterNumber|-out.default|Default value|None|None|0.0
-ParameterSelection|-interpolator|Interpolation|nn;linear;bco;
+ParameterSelection|-interpolator|Interpolation|nn;linear;bco
 ParameterNumber|-interpolator.bco.radius|Radius for bicubic interpolation|None|None|2
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
diff --git a/src/sextante/otb/description/HyperspectralUnmixing.txt b/src/sextante/otb/description/HyperspectralUnmixing.txt
@@ -4,4 +4,4 @@ OTB
 ParameterRaster|-in|Input Image Filename|False
 OutputRaster|-out|Output Image|
 ParameterRaster|-ie|Input endmembers|False
-ParameterSelection|-ua|Unmixing algorithm|ucls;ncls;isra;mdmdnmf;
+ParameterSelection|-ua|Unmixing algorithm|ucls;ncls;isra;mdmdnmf
diff --git a/src/sextante/otb/description/ImageEnvelope.txt b/src/sextante/otb/description/ImageEnvelope.txt
@@ -3,7 +3,7 @@ ImageEnvelope
 OTB
 ParameterRaster|-in|Input Image|False
 OutputVector|-out|Output Vector Data|
-ParameterSelection|-elev|Elevation management|dem;average;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/KmzExport.txt b/src/sextante/otb/description/KmzExport.txt
@@ -6,7 +6,7 @@ ParameterString|-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;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-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
@@ -3,7 +3,7 @@ LineSegmentDetection
 OTB
 ParameterRaster|-in|Input Image|False
 OutputVector|-out|Output Detected lines|
-ParameterSelection|-elev|Elevation management|dem;average;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/OSMDownloader.txt b/src/sextante/otb/description/OSMDownloader.txt
@@ -5,7 +5,7 @@ OutputVector|-out|Output vector data|
 ParameterRaster|-support|Support image|False
 ParameterString|-key|OSM tag key|
 ParameterString|-value|OSM tag value|
-ParameterSelection|-elev|Elevation management|dem;average;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/OpticalCalibration.txt b/src/sextante/otb/description/OpticalCalibration.txt
@@ -4,10 +4,10 @@ OTB
 ParameterRaster|-in|Input|False
 OutputRaster|-out|Output|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
-ParameterSelection|-level|Calibration Level|toa;toc;
+ParameterSelection|-level|Calibration Level|toa;toc
 ParameterBoolean|-milli|Convert to milli reflectance|
 ParameterString|-rsr|Relative Spectral Response File|
-ParameterSelection|-atmo.aerosol|Aerosol Model|noaersol;continental;maritime;urban;desertic;
+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

diff --git a/src/sextante/otb/description/OrthoRectification.txt b/src/sextante/otb/description/OrthoRectification.txt
@@ -3,14 +3,14 @@ OrthoRectification
 OTB
 ParameterRaster|-io.in|Input Image|False
 OutputRaster|-io.out|Output Image|
-ParameterSelection|-map|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg;
+ParameterSelection|-map|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg
 ParameterNumber|-map.utm.zone|Zone number|None|None|0
 ParameterBoolean|-map.utm.northhem|Northern Hemisphere|
 ParameterNumber|-map.transmercator.falseeasting|False easting|None|None|0.0
 ParameterNumber|-map.transmercator.falsenorthing|False northing|None|None|0.0
 ParameterNumber|-map.transmercator.scale|Scale factor|None|None|1.0
 ParameterNumber|-map.epsg.code|EPSG Code|None|None|32631
-ParameterSelection|-outputs.mode|Parameters estimation modes|auto;autosize;autospacing;
+ParameterSelection|-outputs.mode|Parameters estimation modes|auto;autosize;autospacing
 ParameterNumber|-outputs.ulx|Upper Left X|None|None|0.0
 ParameterNumber|-outputs.uly|Upper Left Y|None|None|0.0
 ParameterNumber|-outputs.sizex|Size X|None|None|0
@@ -19,11 +19,11 @@ ParameterNumber|-outputs.spacingx|Pixel Size X|None|None|0.0
 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;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
-ParameterSelection|-interpolator|Interpolation|nn;linear;bco;
+ParameterSelection|-interpolator|Interpolation|nn;linear;bco
 ParameterNumber|-interpolator.bco.radius|Radius for bicubic interpolation|None|None|2
 ParameterNumber|-opt.rpc|RPC modeling (points per axis)|None|None|10
 ParameterNumber|-opt.ram|Available RAM (Mb)|None|None|128

diff --git a/src/sextante/otb/description/PixelWiseBlockMatching.txt b/src/sextante/otb/description/PixelWiseBlockMatching.txt
@@ -11,17 +11,17 @@ ParameterRaster|-mask.inleft|Discard left pixels from mask image|True
 ParameterRaster|-mask.inright|Discard right pixels from mask image|True
 ParameterNumber|-mask.nodata|Discard pixels with no-data value|None|None|0.0
 ParameterNumber|-mask.variancet|Discard pixels with low local variance|None|None|100.0
-ParameterSelection|-bm.metric|Block-matching metric|ssd;ncc;lp;
+ParameterSelection|-bm.metric|Block-matching metric|ssd;ncc;lp
 ParameterNumber|-bm.metric.lp.p|p value|None|None|1.0
 ParameterNumber|-bm.radius|Radius of blocks|None|None|3
 ParameterNumber|-bm.minhd|Minimum horizontal disparity|None|None|0
 ParameterNumber|-bm.maxhd|Maximum horizontal disparity|None|None|0
 ParameterNumber|-bm.minvd|Minimum vertical disparity|None|None|0
 ParameterNumber|-bm.maxvd|Maximum vertical disparity|None|None|0
-ParameterSelection|-bm.subpixel|Sub-pixel interpolation|none;parabolic;triangular;dichotomy;
+ParameterSelection|-bm.subpixel|Sub-pixel interpolation|none;parabolic;triangular;dichotomy
 ParameterNumber|-bm.medianfilter.radius|Radius|None|None|0
 ParameterNumber|-bm.medianfilter.incoherence|Incoherence threshold|None|None|0.0
-ParameterSelection|-bm.initdisp|Initial disparities|none;uniform;maps;
+ParameterSelection|-bm.initdisp|Initial disparities|none;uniform;maps
 ParameterNumber|-bm.initdisp.uniform.hdisp|Horizontal initial disparity|None|None|0
 ParameterNumber|-bm.initdisp.uniform.vdisp|Vertical initial disparity|None|None|0
 ParameterNumber|-bm.initdisp.uniform.hrad|Horizontal exploration radius|None|None|0

diff --git a/src/sextante/otb/description/Smoothing.txt b/src/sextante/otb/description/Smoothing.txt
@@ -4,7 +4,7 @@ OTB
 ParameterRaster|-in|Input Image|False
 OutputRaster|-out|Output Image|
 ParameterNumber|-ram|Available RAM (Mb)|None|None|128
-ParameterSelection|-type|Smoothing Type|mean;gaussian;anidif;
+ParameterSelection|-type|Smoothing Type|mean;gaussian;anidif
 ParameterNumber|-type.mean.radius|Radius|None|None|2
 ParameterNumber|-type.gaussian.radius|Radius|None|None|2
 ParameterNumber|-type.anidif.timestep|Time Step|None|None|0.125

diff --git a/src/sextante/otb/description/StereoRectificationGridGenerator.txt b/src/sextante/otb/description/StereoRectificationGridGenerator.txt
@@ -5,7 +5,7 @@ ParameterRaster|-io.inleft|Left input image|False
 ParameterRaster|-io.inright|Right input image|False
 OutputRaster|-io.outleft|Left output deformation grid|
 OutputRaster|-io.outright|Right output deformation grid|
-ParameterSelection|-epi.elevation|Elevation management|avg;avgdem;dem;
+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|

diff --git a/src/sextante/otb/description/StereoSensorModelToElevationMap.txt b/src/sextante/otb/description/StereoSensorModelToElevationMap.txt
@@ -12,7 +12,7 @@ ParameterNumber|-minh|MinHeightOffset|None|None|-20.0
 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;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/Superimpose.txt b/src/sextante/otb/description/Superimpose.txt
@@ -3,7 +3,7 @@ Superimpose
 OTB
 ParameterRaster|-inr|Reference input|False
 ParameterRaster|-inm|The image to reproject|False
-ParameterSelection|-elev|Elevation management|dem;average;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/TrainSVMImagesClassifier.txt b/src/sextante/otb/description/TrainSVMImagesClassifier.txt
@@ -5,7 +5,7 @@ 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;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
@@ -14,6 +14,6 @@ ParameterNumber|-sample.mv|Maximum validation sample size|None|None|-1
 ParameterBoolean|-sample.edg|On edge pixel inclusion|
 ParameterNumber|-sample.vtr|training and validation sample ratio|None|None|0.5
 ParameterString|-sample.vfn|Name of the discrimination field|Class
-ParameterSelection|-svm.k|SVM Kernel Type|linear;rbf;poly;sigmoid;
+ParameterSelection|-svm.k|SVM Kernel Type|linear;rbf;poly;sigmoid
 ParameterNumber|-svm.c|Cost parameter C.|None|None|1.0
 ParameterBoolean|-svm.opt|parameters optimization|
diff --git a/src/sextante/otb/description/ValidateSVMImagesClassifier.txt b/src/sextante/otb/description/ValidateSVMImagesClassifier.txt
@@ -4,7 +4,7 @@ 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;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-elev.dem.geoid|Geoid File|
 ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

diff --git a/src/sextante/otb/description/VectorDataExtractROIApplication.txt b/src/sextante/otb/description/VectorDataExtractROIApplication.txt
@@ -4,7 +4,7 @@ OTB
 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;
+ParameterSelection|-elev|Elevation management|dem;average
 ParameterString|-elev.dem.path|DEM directory|
 ParameterString|-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
@@ -173,9 +173,12 @@ def generate_parameter_Choice( appInstance, paramKey ):
   out += convertendl(appInstance.GetParameterName(paramKey))
   out += "|"
 
+  choices = ""
   for choice in appInstance.GetChoiceKeys(paramKey):
-    out += choice
-    out += ";"
+    choices += choice
+    choices += ";"
+  out += choices[:-1]
+
   return out
 
 def generate_parameter_InputImage( appInstance, paramKey ):