diff --git a/Applications/Classification/otbKMeansClassification.cxx b/Applications/Classification/otbKMeansClassification.cxx index 3523d5a1ecda7d59b3997c38c78ce30404e2171d..6606b533257833542bc79f8f0cd3acc531d7871f 100644 --- a/Applications/Classification/otbKMeansClassification.cxx +++ b/Applications/Classification/otbKMeansClassification.cxx @@ -100,19 +100,19 @@ private: SetParameterDescription("vm","Validity mask. Only non-zero pixels will be used to estimate KMeans modes."); AddParameter(ParameterType_Int, "ts", "Training set size"); SetParameterDescription("ts", "Size of the training set."); - SetParameterInt("ts", 100); + SetDefaultParameterInt("ts", 100); AddParameter(ParameterType_Float, "tp", "Training set sample selection probability"); SetParameterDescription("tp", "Probability for a sample to be selected in the training set."); - SetParameterFloat("tp", 0.5); + SetDefaultParameterFloat("tp", 0.5); AddParameter(ParameterType_Int, "nc", "Number of classes"); SetParameterDescription("nc","number of modes, which will be used to generate class membership."); - SetParameterInt("nc", 3); + SetDefaultParameterInt("nc", 3); AddParameter(ParameterType_Float, "cp", "Initial class centroid probability"); SetParameterDescription("cp", "Probability for a pixel to be selected as an initial class centroid"); - SetParameterFloat("cp", 0.8); + SetDefaultParameterFloat("cp", 0.8); AddParameter(ParameterType_Int, "sl", "Number of lines for each streaming block"); SetParameterDescription("sl","input image will be divided into sl lines."); - SetParameterInt("sl", 1000); + SetDefaultParameterInt("sl", 1000); } void DoUpdateParameters() diff --git a/Applications/Classification/otbTrainSVMImagesClassifier.cxx b/Applications/Classification/otbTrainSVMImagesClassifier.cxx index 95018a25e84079559df727c124759fe47b12f31f..dc50df37f768301f96c009ccb38613a86160b783 100644 --- a/Applications/Classification/otbTrainSVMImagesClassifier.cxx +++ b/Applications/Classification/otbTrainSVMImagesClassifier.cxx @@ -183,11 +183,11 @@ private: SetParameterDescription("k", "SVM Kernel Type."); AddParameter(ParameterType_Int, "mt", "Maximum training sample size"); MandatoryOff("mt"); - SetParameterInt("mt", -1); + SetDefaultParameterInt("mt", -1); SetParameterDescription("mt", "Maximum size of the training sample (default = -1)."); AddParameter(ParameterType_Int, "mv", "Maximum validation sample size"); MandatoryOff("mv"); - SetParameterInt("mv", -1); + SetDefaultParameterInt("mv", -1); SetParameterDescription("mv", "Maximum size of the validation sample (default = -1)"); AddParameter(ParameterType_Float, "vtr", "training and validation sample ratio"); SetParameterDescription("vtr", diff --git a/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx b/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx index 989f07939575a4f10c9b46a2fca3df88796cdfe9..8a8c9c501fcfdaf8234d581f2ed3545d49f1e616 100644 --- a/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx +++ b/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx @@ -131,7 +131,7 @@ private: MandatoryOff("dr"); AddParameter(ParameterType_Int, "ne", "Number of endmembers"); - SetParameterInt("ne", 1); + SetDefaultParameterInt("ne", 1); MandatoryOff("ne"); AddParameter(ParameterType_Choice, "de", "Dimensionnality estimation"); diff --git a/Applications/RadiometricIndices/otbRadiometricVegetationIndices.cxx b/Applications/RadiometricIndices/otbRadiometricVegetationIndices.cxx index ec770201736f1ee988371b515561d7709b33d89e..11bdb19f215caad441760ce61faf47c5e0324975 100644 --- a/Applications/RadiometricIndices/otbRadiometricVegetationIndices.cxx +++ b/Applications/RadiometricIndices/otbRadiometricVegetationIndices.cxx @@ -112,10 +112,10 @@ private: SetParameterDescription("channels", "Channels selection"); AddParameter(ParameterType_Int, "channels.red", "Red Channel"); SetParameterDescription("channels.red", "Red channel index"); - SetParameterInt("channels.red", 3); + SetDefaultParameterInt("channels.red", 3); AddParameter(ParameterType_Int, "channels.nir", "NIR Channel"); SetParameterDescription("channels.nir", "NIR channel index"); - SetParameterInt("channels.nir", 4); + SetDefaultParameterInt("channels.nir", 4); AddParameter(ParameterType_Group, "index", "Indices selection"); SetParameterDescription("index", "List of available radiometric indices"); diff --git a/Applications/Radiometry/otbOpticalCalibration.cxx b/Applications/Radiometry/otbOpticalCalibration.cxx index beb1d48fe7ed7f8b97144dfc7297f2a06f64c08f..ea8ca0ba0b95293a0c097fdef606a03cebdc834b 100644 --- a/Applications/Radiometry/otbOpticalCalibration.cxx +++ b/Applications/Radiometry/otbOpticalCalibration.cxx @@ -131,11 +131,11 @@ private: AddParameter(ParameterType_Float, "atmo", "Atmospheric Pressure"); AddParameter(ParameterType_Float, "opt", "Aerosol Optical"); - SetParameterFloat("oz", 0.); - SetParameterFloat("wa", 2.5); - SetParameterFloat("atmo", 1030.); + SetDefaultParameterFloat("oz", 0.); + SetDefaultParameterFloat("wa", 2.5); + SetDefaultParameterFloat("atmo", 1030.); - SetParameterFloat("opt", 0.2); + SetDefaultParameterFloat("opt", 0.2); MandatoryOff("oz"); MandatoryOff("wa"); MandatoryOff("atmo"); diff --git a/Applications/Segmentation/otbMeanShiftSegmentation.cxx b/Applications/Segmentation/otbMeanShiftSegmentation.cxx index f0d269954b4a15c5af6b563f54e9204e5a5d6466..ea1a248a6965a5dd1e4d9e45f71b43be39a21191 100644 --- a/Applications/Segmentation/otbMeanShiftSegmentation.cxx +++ b/Applications/Segmentation/otbMeanShiftSegmentation.cxx @@ -80,10 +80,10 @@ private: AddParameter(ParameterType_Float, "ranger", "Range radius"); AddParameter(ParameterType_Int, "minsize", "Min region size"); AddParameter(ParameterType_Float, "scale", "Scale"); - SetParameterInt("spatialr", 5); - SetParameterFloat("ranger", 15.0); - SetParameterInt("minsize", 100); - SetParameterFloat("scale", 100000.); + SetDefaultParameterInt("spatialr", 5); + SetDefaultParameterFloat("ranger", 15.0); + SetDefaultParameterInt("minsize", 100); + SetDefaultParameterFloat("scale", 100000.); } void DoUpdateParameters() diff --git a/Applications/Test/otbTestApplication.cxx b/Applications/Test/otbTestApplication.cxx index 85b65b7413838e8c23ba1773bd59d0997881a4d4..3637bd2fede06da76ff89b16286f5762736a97d5 100644 --- a/Applications/Test/otbTestApplication.cxx +++ b/Applications/Test/otbTestApplication.cxx @@ -77,12 +77,12 @@ private: AddChoice("choice.choice2", "Choice 2"); AddChoice("choice.choice3", "Choice 3"); AddParameter(ParameterType_Float, "choice.choice1.floatchoice1", "Float of choice1"); - SetParameterFloat("choice.choice1.floatchoice1", 0.125); + SetDefaultParameterFloat("choice.choice1.floatchoice1", 0.125); // Test a choice without associated parameter // AddParameter(ParameterType_Float, "choice.choice2.floatchoice2", "Float of choice2"); // SetParameterFloat("choice.choice2.floatchoice2", 1.0); AddParameter(ParameterType_Float, "choice.choice3.floatchoice3", "Float of choice3"); - SetParameterFloat("choice.choice3.floatchoice3", 5.0); + SetDefaultParameterFloat("choice.choice3.floatchoice3", 5.0); AddParameter(ParameterType_Group, "ingroup", "Input Group"); diff --git a/Applications/Util/otbExtractROI.cxx b/Applications/Util/otbExtractROI.cxx index c23e94ad5b8b23c28cc92c9f95aa2fd373664db3..829e7e34d7ad00856d78b546c855cec49a769723 100644 --- a/Applications/Util/otbExtractROI.cxx +++ b/Applications/Util/otbExtractROI.cxx @@ -81,11 +81,11 @@ private: SetParameterDescription("sizex","size along x in pixels."); AddParameter(ParameterType_Int, "sizey", "Size Y"); SetParameterDescription("sizey","size along y in pixels."); - // Default values - SetParameterInt("startx", 0); - SetParameterInt("starty", 0); - SetParameterInt("sizex", 0); - SetParameterInt("sizey", 0); +// // Default values +// SetDefaultParameterInt("startx", 0); +// SetDefaultParameterInt("starty", 0); +// SetDefaultParameterInt("sizex", 0); +// SetDefaultParameterInt("sizey", 0); // Channelist Parameters AddParameter(ParameterType_ListView, "cl", "Output Image channels"); diff --git a/Applications/Util/otbMultiResolutionPyramid.cxx b/Applications/Util/otbMultiResolutionPyramid.cxx index 4217603f3c2623ebb9fcb5ac4d622370d8ec8a0d..35249ffda97037ef16e29dbb00bea6fe11b30ae5 100644 --- a/Applications/Util/otbMultiResolutionPyramid.cxx +++ b/Applications/Util/otbMultiResolutionPyramid.cxx @@ -85,14 +85,14 @@ private: SetParameterRole("out",Role_Output); AddParameter(ParameterType_Int, "level", "Number Of Levels"); - SetParameterInt("level", 1); + SetDefaultParameterInt("level", 1); SetParameterDescription( "level", "Number of levels in the pyramid (default is 1)."); AddParameter(ParameterType_Int, "sfactor", "Subsampling factor"); - SetParameterInt("sfactor", 2); + SetDefaultParameterInt("sfactor", 2); AddParameter(ParameterType_Float, "vfactor", "Subsampling factor"); - SetParameterFloat("vfactor", 0.6); + SetDefaultParameterFloat("vfactor", 0.6); // Boolean Fast scheme AddParameter(ParameterType_Empty, "fast", "Use Fast Scheme"); diff --git a/Applications/Util/otbRescale.cxx b/Applications/Util/otbRescale.cxx index 1abe74e42924d6433b4a824aa6a6609aa033e7ca..7ef0865e87ee990ce824547c6551dd2d9db0b663 100644 --- a/Applications/Util/otbRescale.cxx +++ b/Applications/Util/otbRescale.cxx @@ -74,9 +74,9 @@ private: SetParameterDescription( "out" , "The rescaled image filename." ); AddParameter(ParameterType_Float, "outmin", "Output min value"); AddParameter(ParameterType_Float, "outmax", "Output max value"); - SetParameterFloat("outmin", 0.0); + SetDefaultParameterFloat("outmin", 0.0); SetParameterDescription( "outmin", "Minimum value of the output image." ); - SetParameterFloat("outmax", 255.0); + SetDefaultParameterFloat("outmax", 255.0); SetParameterDescription( "outmax", "Maximum value of the output image." ); MandatoryOff("outmin"); diff --git a/Applications/Util/otbSmoothing.cxx b/Applications/Util/otbSmoothing.cxx index 2172a38e6cc629b6772a8d59e9bcfa16329afa95..201a61ce64d4b1bc5c352bbad61e6c5370be3823 100644 --- a/Applications/Util/otbSmoothing.cxx +++ b/Applications/Util/otbSmoothing.cxx @@ -83,18 +83,18 @@ private: SetParameterDescription("type", "smoothing kernel to apply : mean, gaussian, anisotropric diffusion."); AddChoice("type.mean", "Mean"); AddParameter(ParameterType_Radius, "type.mean.radius", "Radius"); - SetParameterInt("type.mean.radius", 2); + SetDefaultParameterInt("type.mean.radius", 2); AddChoice("type.gaussian", "Gaussian"); AddParameter(ParameterType_Radius, "type.gaussian.radius", "Radius"); - SetParameterInt("type.gaussian.radius", 2); + SetDefaultParameterInt("type.gaussian.radius", 2); AddChoice("type.anidif", "Anisotropic Diffusion"); AddParameter(ParameterType_Float, "type.anidif.timestep", "Time Step"); AddParameter(ParameterType_Int, "type.anidif.nbiter", "Nb Iterations"); - SetParameterFloat("type.anidif.timestep", 0.125); - SetParameterInt("type.anidif.nbiter", 10); + SetDefaultParameterFloat("type.anidif.timestep", 0.125); + SetDefaultParameterInt("type.anidif.nbiter", 10); SetParameterString("type", "anidif"); }