Skip to content

Commit 91b8d24

Browse files
author
julien.malik@gmail.com
committedApr 19, 2012
[otb] set default value for ParameterSelection
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@127 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
·
ltr-3_40Before-merge-new_vector_api
1 parent 32d684f commit 91b8d24

23 files changed

+35
-32
lines changed
 

‎src/sextante/otb/description/BundleToPerfectSensor.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle to perfect sensor
33
Geometry
44
ParameterRaster|-inp|Input PAN Image|False
55
ParameterRaster|-inxs|Input XS Image|False
6-
ParameterSelection|-elev|Elevation management|dem;average
6+
ParameterSelection|-elev|Elevation management|dem;average|1
77
ParameterFile|-elev.dem.path|DEM directory|
88
ParameterFile|-elev.dem.geoid|Geoid File|
99
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/ColorMapping.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Learning
44
ParameterRaster|-in|Input Image|False
55
OutputRaster|-out|Output Image|
66
ParameterNumber|-ram|Available RAM (Mb)|None|None|128
7-
ParameterSelection|-op|Operation|labeltocolor;colortolabel
7+
ParameterSelection|-op|Operation|labeltocolor;colortolabel|0
88
ParameterNumber|-op.colortolabel.notfound|Not Found Label|None|None|404
9-
ParameterSelection|-method|Color mapping method|custom;continuous;optimal;image
9+
ParameterSelection|-method|Color mapping method|custom;continuous;optimal;image|0
1010
ParameterFile|-method.custom.lut|Look-up table file|
11-
ParameterSelection|-method.continuous.lut|Look-up tables|red;green;blue;grey;hot;cool;spring;summer;autumn;winter;copper;jet;hsv;overunder;relief
11+
ParameterSelection|-method.continuous.lut|Look-up tables|red;green;blue;grey;hot;cool;spring;summer;autumn;winter;copper;jet;hsv;overunder;relief|0
1212
ParameterNumber|-method.continuous.min|Mapping range lower value|None|None|0.0
1313
ParameterNumber|-method.continuous.max|Mapping range higher value|None|None|255.0
1414
ParameterNumber|-method.optimal.background|Background label|None|None|0

‎src/sextante/otb/description/ComputePolylineFeatureFromImage.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Compute Polyline Feature From Image
33
Feature Extraction
44
ParameterRaster|-in|Input Image|False
55
ParameterVector|-vd|Vector Data|-1|False
6-
ParameterSelection|-elev|Elevation management|dem;average
6+
ParameterSelection|-elev|Elevation management|dem;average|1
77
ParameterFile|-elev.dem.path|DEM directory|
88
ParameterFile|-elev.dem.geoid|Geoid File|
99
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/ConnectedComponentSegmentation.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ParameterString|-mask|Mask expression|
77
ParameterString|-expr|Connected Component Expression|
88
ParameterNumber|-minsize|Minimum Object Size|None|None|2
99
ParameterString|-obia|OBIA Expression|
10-
ParameterSelection|-elev|Elevation management|dem;average
10+
ParameterSelection|-elev|Elevation management|dem;average|1
1111
ParameterFile|-elev.dem.path|DEM directory|
1212
ParameterFile|-elev.dem.geoid|Geoid File|
1313
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/Convert.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ otbcli_Convert
22
Image Conversion
33
Image Manipulation
44
ParameterRaster|-in|Input image|False
5-
ParameterSelection|-type|Rescale type|none;linear;log2
5+
ParameterSelection|-type|Rescale type|none;linear;log2|0
66
OutputRaster|-out|Output Image|
77
ParameterNumber|-ram|Available RAM (Mb)|None|None|128

‎src/sextante/otb/description/ConvertCartoToGeoPoint.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Cartographic to geographic coordinates conversion
33
Geometry
44
ParameterNumber|-carto.x|X cartographic coordinates|None|None|0.0
55
ParameterNumber|-carto.y|Y cartographic coordinates|None|None|0.0
6-
ParameterSelection|-mapproj|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg
6+
ParameterSelection|-mapproj|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg|5
77
ParameterNumber|-mapproj.utm.zone|Zone number|None|None|0
88
ParameterBoolean|-mapproj.utm.northhem|Northern Hemisphere|
99
ParameterNumber|-mapproj.transmercator.falseeasting|False easting|None|None|0.0

‎src/sextante/otb/description/GridBasedImageResampling.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ Geometry
44
ParameterRaster|-io.in|Input image|False
55
OutputRaster|-io.out|Output Image|
66
ParameterRaster|-grid.in|Input resampling grid|False
7-
ParameterSelection|-grid.type|Grid Type|def;loc
7+
ParameterSelection|-grid.type|Grid Type|def;loc|0
88
ParameterNumber|-out.ulx|Upper Left X|None|None|0.0
99
ParameterNumber|-out.uly|Upper Left Y|None|None|0.0
1010
ParameterNumber|-out.sizex|Size X|None|None|0
1111
ParameterNumber|-out.sizey|Size Y|None|None|0
1212
ParameterNumber|-out.spacingx|Pixel Size X|None|None|1.0
1313
ParameterNumber|-out.spacingy|Pixel Size Y|None|None|1.0
1414
ParameterNumber|-out.default|Default value|None|None|0.0
15-
ParameterSelection|-interpolator|Interpolation|nn;linear;bco
15+
ParameterSelection|-interpolator|Interpolation|nn;linear;bco|2
1616
ParameterNumber|-interpolator.bco.radius|Radius for bicubic interpolation|None|None|2
1717
ParameterNumber|-ram|Available RAM (Mb)|None|None|128

‎src/sextante/otb/description/HyperspectralUnmixing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Miscellaneous
44
ParameterRaster|-in|Input Image Filename|False
55
OutputRaster|-out|Output Image|
66
ParameterRaster|-ie|Input endmembers|False
7-
ParameterSelection|-ua|Unmixing algorithm|ucls;ncls;isra;mdmdnmf
7+
ParameterSelection|-ua|Unmixing algorithm|ucls;ncls;isra;mdmdnmf|0

‎src/sextante/otb/description/ImageEnvelope.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Image Envelope
33
Geometry
44
ParameterRaster|-in|Input Image|False
55
OutputVector|-out|Output Vector Data|
6-
ParameterSelection|-elev|Elevation management|dem;average
6+
ParameterSelection|-elev|Elevation management|dem;average|1
77
ParameterFile|-elev.dem.path|DEM directory|
88
ParameterFile|-elev.dem.geoid|Geoid File|
99
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/KmzExport.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OutputFile|-out|Output .kmz product|
66
ParameterNumber|-tilesize|Tile Size|None|None|0
77
ParameterRaster|-logo|Image logo|True
88
ParameterRaster|-legend|Image legend|True
9-
ParameterSelection|-elev|Elevation management|dem;average
9+
ParameterSelection|-elev|Elevation management|dem;average|1
1010
ParameterFile|-elev.dem.path|DEM directory|
1111
ParameterFile|-elev.dem.geoid|Geoid File|
1212
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/LineSegmentDetection.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Line segment detection
33
Feature Extraction
44
ParameterRaster|-in|Input Image|False
55
OutputVector|-out|Output Detected lines|
6-
ParameterSelection|-elev|Elevation management|dem;average
6+
ParameterSelection|-elev|Elevation management|dem;average|1
77
ParameterFile|-elev.dem.path|DEM directory|
88
ParameterFile|-elev.dem.geoid|Geoid File|
99
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/OSMDownloader.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ OutputVector|-out|Output vector data|
55
ParameterRaster|-support|Support image|False
66
ParameterString|-key|OSM tag key|
77
ParameterString|-value|OSM tag value|
8-
ParameterSelection|-elev|Elevation management|dem;average
8+
ParameterSelection|-elev|Elevation management|dem;average|1
99
ParameterFile|-elev.dem.path|DEM directory|
1010
ParameterFile|-elev.dem.geoid|Geoid File|
1111
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/OpticalCalibration.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Calibration
44
ParameterRaster|-in|Input|False
55
OutputRaster|-out|Output|
66
ParameterNumber|-ram|Available RAM (Mb)|None|None|128
7-
ParameterSelection|-level|Calibration Level|toa;toc
7+
ParameterSelection|-level|Calibration Level|toa;toc|0
88
ParameterBoolean|-milli|Convert to milli reflectance|
99
ParameterFile|-rsr|Relative Spectral Response File|
10-
ParameterSelection|-atmo.aerosol|Aerosol Model|noaersol;continental;maritime;urban;desertic
10+
ParameterSelection|-atmo.aerosol|Aerosol Model|noaersol;continental;maritime;urban;desertic|0
1111
ParameterNumber|-atmo.oz|Ozone Amount|None|None|0.0
1212
ParameterNumber|-atmo.wa|Water Vapor Amount|None|None|2.5
1313
ParameterNumber|-atmo.pressure|Atmospheric Pressure|None|None|1030.0

‎src/sextante/otb/description/OrthoRectification.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ Ortho-rectification
33
Geometry
44
ParameterRaster|-io.in|Input Image|False
55
OutputRaster|-io.out|Output Image|
6-
ParameterSelection|-map|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg
6+
ParameterSelection|-map|Output Cartographic Map Projection|utm;lambert2;lambert93;transmercator;wgs;epsg|5
77
ParameterNumber|-map.utm.zone|Zone number|None|None|0
88
ParameterBoolean|-map.utm.northhem|Northern Hemisphere|
99
ParameterNumber|-map.transmercator.falseeasting|False easting|None|None|0.0
1010
ParameterNumber|-map.transmercator.falsenorthing|False northing|None|None|0.0
1111
ParameterNumber|-map.transmercator.scale|Scale factor|None|None|1.0
1212
ParameterNumber|-map.epsg.code|EPSG Code|None|None|32631
13-
ParameterSelection|-outputs.mode|Parameters estimation modes|auto;autosize;autospacing
13+
ParameterSelection|-outputs.mode|Parameters estimation modes|auto;autosize;autospacing|0
1414
ParameterNumber|-outputs.ulx|Upper Left X|None|None|0.0
1515
ParameterNumber|-outputs.uly|Upper Left Y|None|None|0.0
1616
ParameterNumber|-outputs.sizex|Size X|None|None|0
@@ -19,11 +19,11 @@ ParameterNumber|-outputs.spacingx|Pixel Size X|None|None|0.0
1919
ParameterNumber|-outputs.spacingy|Pixel Size Y|None|None|0.0
2020
ParameterBoolean|-outputs.isotropic|Force isotropic spacing by default|True
2121
ParameterNumber|-outputs.default|Default pixel value|None|None|0.0
22-
ParameterSelection|-elev|Elevation management|dem;average
22+
ParameterSelection|-elev|Elevation management|dem;average|1
2323
ParameterFile|-elev.dem.path|DEM directory|
2424
ParameterFile|-elev.dem.geoid|Geoid File|
2525
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
26-
ParameterSelection|-interpolator|Interpolation|nn;linear;bco
26+
ParameterSelection|-interpolator|Interpolation|nn;linear;bco|0
2727
ParameterNumber|-interpolator.bco.radius|Radius for bicubic interpolation|None|None|2
2828
ParameterNumber|-opt.rpc|RPC modeling (points per axis)|None|None|10
2929
ParameterNumber|-opt.ram|Available RAM (Mb)|None|None|128

‎src/sextante/otb/description/PixelWiseBlockMatching.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ ParameterRaster|-mask.inleft|Discard left pixels from mask image|True
1111
ParameterRaster|-mask.inright|Discard right pixels from mask image|True
1212
ParameterNumber|-mask.nodata|Discard pixels with no-data value|None|None|0.0
1313
ParameterNumber|-mask.variancet|Discard pixels with low local variance|None|None|100.0
14-
ParameterSelection|-bm.metric|Block-matching metric|ssd;ncc;lp
14+
ParameterSelection|-bm.metric|Block-matching metric|ssd;ncc;lp|0
1515
ParameterNumber|-bm.metric.lp.p|p value|None|None|1.0
1616
ParameterNumber|-bm.radius|Radius of blocks|None|None|3
1717
ParameterNumber|-bm.minhd|Minimum horizontal disparity|None|None|0
1818
ParameterNumber|-bm.maxhd|Maximum horizontal disparity|None|None|0
1919
ParameterNumber|-bm.minvd|Minimum vertical disparity|None|None|0
2020
ParameterNumber|-bm.maxvd|Maximum vertical disparity|None|None|0
21-
ParameterSelection|-bm.subpixel|Sub-pixel interpolation|none;parabolic;triangular;dichotomy
21+
ParameterSelection|-bm.subpixel|Sub-pixel interpolation|none;parabolic;triangular;dichotomy|0
2222
ParameterNumber|-bm.medianfilter.radius|Radius|None|None|0
2323
ParameterNumber|-bm.medianfilter.incoherence|Incoherence threshold|None|None|0.0
24-
ParameterSelection|-bm.initdisp|Initial disparities|none;uniform;maps
24+
ParameterSelection|-bm.initdisp|Initial disparities|none;uniform;maps|0
2525
ParameterNumber|-bm.initdisp.uniform.hdisp|Horizontal initial disparity|None|None|0
2626
ParameterNumber|-bm.initdisp.uniform.vdisp|Vertical initial disparity|None|None|0
2727
ParameterNumber|-bm.initdisp.uniform.hrad|Horizontal exploration radius|None|None|0

‎src/sextante/otb/description/Smoothing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Image Filtering
44
ParameterRaster|-in|Input Image|False
55
OutputRaster|-out|Output Image|
66
ParameterNumber|-ram|Available RAM (Mb)|None|None|128
7-
ParameterSelection|-type|Smoothing Type|mean;gaussian;anidif
7+
ParameterSelection|-type|Smoothing Type|mean;gaussian;anidif|2
88
ParameterNumber|-type.mean.radius|Radius|None|None|2
99
ParameterNumber|-type.gaussian.radius|Radius|None|None|2
1010
ParameterNumber|-type.anidif.timestep|Time Step|None|None|0.125

‎src/sextante/otb/description/StereoRectificationGridGenerator.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ParameterRaster|-io.inleft|Left input image|False
55
ParameterRaster|-io.inright|Right input image|False
66
OutputRaster|-io.outleft|Left output deformation grid|
77
OutputRaster|-io.outright|Right output deformation grid|
8-
ParameterSelection|-epi.elevation|Elevation management|avg;avgdem;dem
8+
ParameterSelection|-epi.elevation|Elevation management|avg;avgdem;dem|0
99
ParameterNumber|-epi.elevation.avg.value|Average elevation value|None|None|0.0
1010
ParameterFile|-epi.elevation.avgdem.path|DEM directory|
1111
ParameterFile|-epi.elevation.avgdem.geoid|Geoid file|

‎src/sextante/otb/description/StereoSensorModelToElevationMap.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ParameterNumber|-minh|MinHeightOffset|None|None|-20.0
1212
ParameterNumber|-maxh|MaxHeightOffset|None|None|20.0
1313
ParameterNumber|-step|HeightStep|None|None|1.0
1414
ParameterNumber|-ae|AverageElevation|None|None|0.0
15-
ParameterSelection|-elev|Elevation management|dem;average
15+
ParameterSelection|-elev|Elevation management|dem;average|1
1616
ParameterFile|-elev.dem.path|DEM directory|
1717
ParameterFile|-elev.dem.geoid|Geoid File|
1818
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/Superimpose.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Superimpose sensor
33
Geometry
44
ParameterRaster|-inr|Reference input|False
55
ParameterRaster|-inm|The image to reproject|False
6-
ParameterSelection|-elev|Elevation management|dem;average
6+
ParameterSelection|-elev|Elevation management|dem;average|1
77
ParameterFile|-elev.dem.path|DEM directory|
88
ParameterFile|-elev.dem.geoid|Geoid File|
99
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/TrainSVMImagesClassifier.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ParameterMultipleInput|-io.il|Input Image List|3|False
55
ParameterMultipleInput|-io.vd|Vector Data List|-1|False
66
ParameterFile|-io.imstat|XML image statistics file|
77
OutputFile|-io.out|Output SVM model|
8-
ParameterSelection|-elev|Elevation management|dem;average
8+
ParameterSelection|-elev|Elevation management|dem;average|1
99
ParameterFile|-elev.dem.path|DEM directory|
1010
ParameterFile|-elev.dem.geoid|Geoid File|
1111
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0
@@ -14,7 +14,7 @@ ParameterNumber|-sample.mv|Maximum validation sample size|None|None|-1
1414
ParameterBoolean|-sample.edg|On edge pixel inclusion|
1515
ParameterNumber|-sample.vtr|training and validation sample ratio|None|None|0.5
1616
ParameterString|-sample.vfn|Name of the discrimination field|Class
17-
ParameterSelection|-svm.k|SVM Kernel Type|linear;rbf;poly;sigmoid
17+
ParameterSelection|-svm.k|SVM Kernel Type|linear;rbf;poly;sigmoid|0
1818
ParameterNumber|-svm.c|Cost parameter C.|None|None|1.0
1919
ParameterBoolean|-svm.opt|parameters optimization|
2020
ParameterNumber|-rand|set user defined seed|None|None|0

‎src/sextante/otb/description/ValidateSVMImagesClassifier.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Learning
44
ParameterMultipleInput|-il|Input Image List|3|False
55
ParameterMultipleInput|-vd|Vector Data List|-1|False
66
ParameterFile|-imstat|XML image statistics file|
7-
ParameterSelection|-elev|Elevation management|dem;average
7+
ParameterSelection|-elev|Elevation management|dem;average|1
88
ParameterFile|-elev.dem.path|DEM directory|
99
ParameterFile|-elev.dem.geoid|Geoid File|
1010
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/description/VectorDataExtractROIApplication.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Vector Data Manipulation
44
ParameterVector|-io.vd|Input Vector data|-1|False
55
ParameterRaster|-io.in|Support image|False
66
OutputVector|-io.out|Output Vector data|
7-
ParameterSelection|-elev|Elevation management|dem;average
7+
ParameterSelection|-elev|Elevation management|dem;average|1
88
ParameterFile|-elev.dem.path|DEM directory|
99
ParameterFile|-elev.dem.geoid|Geoid File|
1010
ParameterNumber|-elev.average.value|Average Elevation|None|None|0.0

‎src/sextante/otb/helper/generate_application_descriptors.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@ def generate_parameter_Choice( appInstance, paramKey ):
228228
choices += ";"
229229
out += choices[:-1]
230230

231+
out += "|"
232+
out += str(appInstance.GetParameterInt(paramKey))
233+
231234
return out
232235

233236
def generate_parameter_InputImage( appInstance, paramKey ):

0 commit comments

Comments
 (0)
Please sign in to comment.