Commit 23c858c1 authored by Victor Poughon's avatar Victor Poughon

Merge branch 'apps_parameter_order' into 'develop'

Review applications parameter order

See merge request orfeotoolbox/otb!275
parents e0271529 5b66e785
......@@ -140,6 +140,9 @@ private:
AddParameter(ParameterType_StringList, "plasup", "Plausibility Support");
SetParameterDescription("plasup", "Dempster Shafer study hypothesis to compute plausibility");
AddParameter(ParameterType_OutputFilename, "out", "Output filename");
SetParameterDescription("out", "Output model file name (xml file) contains the optimal model to perform information fusion.");
AddParameter(ParameterType_String, "cri", "Criterion");
SetParameterDescription("cri", "Dempster Shafer criterion (by default (belief+plausibility)/2)");
MandatoryOff("cri");
......@@ -167,9 +170,6 @@ private:
AddParameter(ParameterType_Bool,"optobs","Optimizer Observer");
SetParameterDescription("optobs","Activate the optimizer observer");
AddParameter(ParameterType_OutputFilename,"out","Output filename");
SetParameterDescription("out","Output model file name (xml file) contains the optimal model to perform information fusion.");
// Doc example parameter settings
SetDocExampleParameterValue("psin", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp");
SetDocExampleParameterValue("nsin", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp");
......
......@@ -119,6 +119,9 @@ private:
AddParameter(ParameterType_InputImageList, "il", "Input classifications");
SetParameterDescription( "il", "List of input classification maps to fuse. Labels in each classification image must represent the same class." );
AddParameter(ParameterType_OutputImage, "out", "The output classification image");
SetParameterDescription("out", "The output classification image resulting from the fusion of the input classification images.");
SetDefaultOutputPixelType("out", ImagePixelType_uint8);
/** GROUP FUSION METHOD */
AddParameter(ParameterType_Choice, "method", "Fusion method");
......@@ -157,10 +160,6 @@ private:
"labels in the input classifications. By default, 'undecidedlabel = 0'.");
SetDefaultParameterInt("undecidedlabel",0);
AddParameter(ParameterType_OutputImage,"out","The output classification image");
SetParameterDescription("out","The output classification image resulting from the fusion of the input classification images.");
SetDefaultOutputPixelType("out",ImagePixelType_uint8);
// Doc example parameter settings
SetDocExampleParameterValue("il", "classification1.tif classification2.tif classification3.tif");
SetDocExampleParameterValue("method", "dempstershafer");
......
......@@ -84,6 +84,9 @@ private:
AddParameter(ParameterType_StringList, "plasup", "Plausibility Support");
SetParameterDescription("plasup", "Dempster Shafer study hypothesis to compute plausibility");
AddParameter(ParameterType_OutputVectorData, "out", "Output Vector Data");
SetParameterDescription("out", "Output VectorData containing only the validated samples");
AddParameter(ParameterType_String, "cri", "Criterion");
SetParameterDescription("cri", "Dempster Shafer criterion (by default (belief+plausibility)/2)");
MandatoryOff("cri");
......@@ -94,9 +97,6 @@ private:
MandatoryOff("thd");
SetParameterFloat("thd",0.5);
AddParameter(ParameterType_OutputVectorData, "out", "Output Vector Data");
SetParameterDescription("out", "Output VectorData containing only the validated samples");
// Doc example parameter settings
SetDocExampleParameterValue("in", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp");
SetDocExampleParameterValue("belsup", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp");
......
......@@ -124,6 +124,14 @@ private:
SetMinimumParameterIntValue("band2",1);
SetDefaultParameterInt("band2",1);
AddParameter(ParameterType_OutputFilename, "out", "Output file with tie points");
SetParameterDescription("out", "File containing the list of tie points");
AddParameter(ParameterType_OutputFilename, "outvector", "Output vector file with tie points");
SetParameterDescription("outvector", "File containing segments representing matches ");
MandatoryOff("outvector");
DisableParameter("outvector");
AddParameter(ParameterType_Choice,"algorithm","Keypoints detection algorithm");
SetParameterDescription("algorithm","Choice of the detection algorithm to use");
......@@ -183,14 +191,6 @@ private:
// Elevation
ElevationParametersHandler::AddElevationParameters(this, "elev");
AddParameter(ParameterType_OutputFilename,"out","Output file with tie points");
SetParameterDescription("out","File containing the list of tie points");
AddParameter(ParameterType_OutputFilename,"outvector","Output vector file with tie points");
SetParameterDescription("outvector","File containing segments representing matches ");
MandatoryOff("outvector");
DisableParameter("outvector");
// Doc example parameter settings
SetDocExampleParameterValue("in1", "sensor_stereo_left.tif");
SetDocExampleParameterValue("in2","sensor_stereo_right.tif");
......
......@@ -79,6 +79,9 @@ private:
AddParameter(ParameterType_InputImage, "in", "Input Image");
SetParameterDescription("in", "The input image on which the features are computed.");
AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
SetParameterDescription("out", "Output image containing the edge features.");
AddParameter(ParameterType_Int, "channel", "Selected Channel");
SetParameterDescription("channel", "The selected channel index");
SetDefaultParameterInt("channel", 1);
......@@ -123,9 +126,6 @@ private:
SetDefaultParameterFloat("filter.canny.lowerthreshold", 3.0);
*/
AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
SetParameterDescription("out", "Output image containing the edge features.");
// Doc example parameter settings
SetDocExampleParameterValue("in", "qb_RoadExtract.tif");
SetDocExampleParameterValue("channel", "1");
......
......@@ -77,11 +77,6 @@ private:
AddParameter(ParameterType_InputImage, "in", "Input Image");
SetParameterDescription("in","Input hyperspectral data cube");
AddParameter(ParameterType_Int, "ne", "Number of endmembers");
SetParameterDescription("ne","The number of endmembers to extract from the hyperspectral image.");
SetParameterInt("ne",1);
MandatoryOn("ne");
AddParameter(ParameterType_OutputImage, "outendm", "Output Endmembers");
SetParameterDescription("outendm","Endmembers, stored in a"
"one-line multi-spectral image.Each pixel corresponds to one"
......@@ -89,6 +84,11 @@ private:
"signature of the corresponding endmember.");
MandatoryOn("outendm");
AddParameter(ParameterType_Int, "ne", "Number of endmembers");
SetParameterDescription("ne", "The number of endmembers to extract from the hyperspectral image.");
SetParameterInt("ne", 1);
MandatoryOn("ne");
AddRANDParameter();
// Doc example parameter settings
SetDocExampleParameterValue("in", "cupriteSubHsi.tif");
......
......@@ -71,6 +71,9 @@ AddDocTag("Statistics");
AddParameter(ParameterType_InputImage, "in", "Input Image");
SetParameterDescription("in", "The input image to compute the features on.");
AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
SetParameterDescription("out", "Output image containing the local statistical moments.");
AddParameter(ParameterType_Int, "channel", "Selected Channel");
SetParameterDescription("channel", "The selected channel index");
SetDefaultParameterInt("channel", 1);
......@@ -83,9 +86,6 @@ SetParameterDescription("radius", "The computational window radius.");
SetMinimumParameterIntValue("radius",1);
SetDefaultParameterInt("radius",3);
AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
SetParameterDescription("out", "Output image containing the local statistical moments.");
// Doc example parameter settings
SetDocExampleParameterValue("in", "qb_RoadExtract.tif");
SetDocExampleParameterValue("channel", "1");
......
......@@ -101,6 +101,9 @@ private:
AddParameter(ParameterType_InputImage, "inm", "The image to reproject");
SetParameterDescription("inm","The image to reproject into the geometry of the reference input.");
AddParameter(ParameterType_OutputImage, "out", "Output image");
SetParameterDescription("out", "Output reprojected image.");
// Elevation
ElevationParametersHandler::AddElevationParameters(this, "elev");
......@@ -115,9 +118,6 @@ private:
SetDefaultParameterFloat("fv", 0.);
MandatoryOff("fv");
AddParameter(ParameterType_OutputImage, "out", "Output image");
SetParameterDescription("out","Output reprojected image.");
// Superposition mode
AddParameter(ParameterType_Choice,"mode", "Mode");
SetParameterDescription("mode", "Superimposition mode");
......
......@@ -232,28 +232,28 @@ private:
AddDocTag(Tags::SAR);
AddParameter(ParameterType_InputImage, "inc", "Input : multi-band complex image");
AddParameter(ParameterType_InputImage, "inc", "Input: multi-band complex image");
SetParameterDescription("inc", "Input : multi-band complex image");
MandatoryOff("inc");
AddParameter(ParameterType_InputImage, "inf", "Input : multi-band real image");
AddParameter(ParameterType_InputImage, "inf", "Input: multi-band real image");
SetParameterDescription("inf", "Input : multi-band real image");
MandatoryOff("inf");
AddParameter(ParameterType_InputImage, "inhh", "Input : one-band complex image (HH)");
AddParameter(ParameterType_InputImage, "inhh", "Input: one-band complex image (HH)");
SetParameterDescription("inhh", "Input : one-band complex image (HH)");
MandatoryOff("inhh");
AddParameter(ParameterType_InputImage, "inhv", "Input : one-band complex image (HV)");
AddParameter(ParameterType_InputImage, "inhv", "Input: one-band complex image (HV)");
SetParameterDescription("inhv", "Input : one-band complex image (HV)");
MandatoryOff("inhv");
AddParameter(ParameterType_InputImage, "invh", "Input : one-band complex image (VH)");
AddParameter(ParameterType_InputImage, "invh", "Input: one-band complex image (VH)");
SetParameterDescription("invh", "Input : one-band complex image (VH)");
MandatoryOff("invh");
AddParameter(ParameterType_InputImage, "invv", "Input : one-band complex image (VV)");
AddParameter(ParameterType_InputImage, "invv", "Input: one-band complex image (VV)");
SetParameterDescription("invv", "Input : one-band complex image (VV)");
MandatoryOff("invv");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment