diff --git a/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx b/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx index 3d2fc8479ad1d3b7606be9efe7267f2252420d7a..793a70f13d0909b5361067aed5479f7a72e9fa5d 100644 --- a/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx +++ b/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx @@ -150,7 +150,7 @@ private: MandatoryOff("wgt"); SetParameterFloat("wgt", 0.5); - AddParameter(ParameterType_Filename,"initmod","initialization model"); + AddParameter(ParameterType_InputFilename,"initmod","initialization model"); SetParameterDescription("initmod","Initialization model (xml file) to be used. If the xml initialization model is set, the descriptor list is not used (specified using the option -desclist)"); MandatoryOff("initmod"); @@ -168,7 +168,7 @@ private: SetParameterDescription("optobs","Activate the optimizer observer"); MandatoryOff("optobs"); - AddParameter(ParameterType_Filename,"out","Output filename"); + AddParameter(ParameterType_OutputFilename,"out","Output filename"); SetParameterDescription("out","Output model file name (xml file) contains the optimal model to perform informations fusion."); // Doc example parameter settings diff --git a/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx b/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx index d9431387222c1b5f34de8352d67972670d7a3ef5..776bddf2d97bafc47837546583d0efec57c79ed7 100644 --- a/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx +++ b/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx @@ -75,7 +75,7 @@ private: AddParameter(ParameterType_InputVectorData, "in", "Input Vector Data"); SetParameterDescription("in", "Input vector data to validate"); - AddParameter(ParameterType_Filename, "descmod", "Descriptors model filename"); + AddParameter(ParameterType_InputFilename, "descmod", "Descriptors model filename"); SetParameterDescription("descmod", "Fuzzy descriptors model (xml file)"); AddParameter(ParameterType_StringList, "belsup", "Belief Support"); diff --git a/Applications/Classification/otbComputeImagesStatistics.cxx b/Applications/Classification/otbComputeImagesStatistics.cxx index 237ce7a09a5266a768974d70c6eef65c21da1c30..a4b798436533f6d5ba71f1b8a7ad4c764b526989 100644 --- a/Applications/Classification/otbComputeImagesStatistics.cxx +++ b/Applications/Classification/otbComputeImagesStatistics.cxx @@ -57,7 +57,7 @@ private: AddParameter(ParameterType_InputImageList, "il", "Input images"); SetParameterDescription( "il", "List of input images filenames." ); - AddParameter(ParameterType_Filename, "out", "Output XML file"); + AddParameter(ParameterType_OutputFilename, "out", "Output XML file"); SetParameterDescription( "out", "XML filename where the statistics are saved for future reuse." ); MandatoryOff("out"); diff --git a/Applications/Classification/otbImageSVMClassifier.cxx b/Applications/Classification/otbImageSVMClassifier.cxx index 9ddde8d8de6f25bb20c4d096615352b10b68368f..c3dd964e7e647ed76969be429c8efad09875aa54 100644 --- a/Applications/Classification/otbImageSVMClassifier.cxx +++ b/Applications/Classification/otbImageSVMClassifier.cxx @@ -78,10 +78,10 @@ private: SetParameterDescription( "mask", "The mask allows to restrict classification of the input image to the area where mask pixel values are greater than 0."); MandatoryOff("mask"); - AddParameter(ParameterType_Filename, "svm", "SVM Model file"); + AddParameter(ParameterType_InputFilename, "svm", "SVM Model file"); SetParameterDescription("svm", "A SVM model file (*.svm extension, produced by TrainSVMImagesClassifier application)."); - AddParameter(ParameterType_Filename, "imstat", "Statistics file"); + AddParameter(ParameterType_InputFilename, "imstat", "Statistics file"); SetParameterDescription("imstat", "A XML file containing mean and standard deviation to center and reduce samples before classification (produced by ComputeImagesStatistics application)."); MandatoryOff("imstat"); diff --git a/Applications/Classification/otbKMeansClassification.cxx b/Applications/Classification/otbKMeansClassification.cxx index 8d013ab9f01febfbb848e2d0dd2ee3a2d5deb565..cbf8e1aa74653bc137a2774b0be5d04923d5c006 100644 --- a/Applications/Classification/otbKMeansClassification.cxx +++ b/Applications/Classification/otbKMeansClassification.cxx @@ -207,7 +207,7 @@ private: SetParameterDescription("ct", "Convergence threshold for class centroid (L2 distance, by default 0.01)."); SetDefaultParameterFloat("ct", 0.0001); MandatoryOff("ct"); - AddParameter(ParameterType_Filename, "outmeans", "Centroid filename"); + AddParameter(ParameterType_OutputFilename, "outmeans", "Centroid filename"); SetParameterDescription("outmeans", "Output text file containing centroid positions"); MandatoryOff("outmeans"); diff --git a/Applications/Classification/otbTrainSVMImagesClassifier.cxx b/Applications/Classification/otbTrainSVMImagesClassifier.cxx index 8514f60e285b9a0926fb307dbd5ce58f7f7023a6..b8d46d45cf3bb5677548ac366e71aa7642d9d29f 100644 --- a/Applications/Classification/otbTrainSVMImagesClassifier.cxx +++ b/Applications/Classification/otbTrainSVMImagesClassifier.cxx @@ -148,10 +148,10 @@ private: SetParameterDescription("io.il", "A list of input images."); AddParameter(ParameterType_InputVectorDataList, "io.vd", "Vector Data List"); SetParameterDescription("io.vd", "A list of vector data to select the training samples."); - AddParameter(ParameterType_Filename, "io.imstat", "XML image statistics file"); + AddParameter(ParameterType_InputFilename, "io.imstat", "XML image statistics file"); MandatoryOff("io.imstat"); SetParameterDescription("io.imstat", "Filename of an XML file containing mean and standard deviation of input images."); - AddParameter(ParameterType_Filename, "io.out", "Output SVM model"); + AddParameter(ParameterType_OutputFilename, "io.out", "Output SVM model"); SetParameterDescription("io.out", "Output file containing the SVM model estimated"); // Elevation @@ -179,7 +179,7 @@ private: "Ratio between training and validation samples (0.0 = all training, 1.0 = all validation) default = 0.5."); SetParameterFloat("sample.vtr", 0.5); - AddParameter(ParameterType_Filename, "sample.vfn", "Name of the discrimination field"); + AddParameter(ParameterType_InputFilename, "sample.vfn", "Name of the discrimination field"); SetParameterDescription("sample.vfn", "Name of the field used to discriminate class in the vector data files."); SetParameterString("sample.vfn", "Class"); diff --git a/Applications/Classification/otbValidateSVMImagesClassifier.cxx b/Applications/Classification/otbValidateSVMImagesClassifier.cxx index ecb55db38d42609562123acfed45ed4ffa3938fc..a4b226bc52ce25596cf078d7a47f68cb2aabac98 100644 --- a/Applications/Classification/otbValidateSVMImagesClassifier.cxx +++ b/Applications/Classification/otbValidateSVMImagesClassifier.cxx @@ -135,17 +135,17 @@ private: SetParameterDescription("il", "Input image list filename."); AddParameter(ParameterType_InputVectorDataList, "vd", "Vector Data List"); SetParameterDescription("vd", "List of vector data to select validation samples."); - AddParameter(ParameterType_Filename, "imstat", "XML image statistics file"); + AddParameter(ParameterType_InputFilename, "imstat", "XML image statistics file"); MandatoryOff("imstat"); SetParameterDescription("imstat", "Filename of an XML file containing mean and standard deviation of input images."); // Elevation ElevationParametersHandler::AddElevationParameters(this, "elev"); - AddParameter(ParameterType_Filename, "out", "Output filename"); + AddParameter(ParameterType_OutputFilename, "out", "Output filename"); SetParameterDescription("out", "Output file, which contains the performances of the SVM model."); MandatoryOff("out"); - AddParameter(ParameterType_Filename, "svm", "SVM validation filename"); + AddParameter(ParameterType_InputFilename, "svm", "SVM validation filename"); SetParameterDescription("svm", "Input SVM model to validate (given by TrainSVMImagesClassification for instance)."); diff --git a/Applications/Radiometry/otbOpticalCalibration.cxx b/Applications/Radiometry/otbOpticalCalibration.cxx index 962414232d3a909d13a320744dad35d621acc056..39a4bd3be1b5761a197c70c57e8a5a2b5393ebf2 100644 --- a/Applications/Radiometry/otbOpticalCalibration.cxx +++ b/Applications/Radiometry/otbOpticalCalibration.cxx @@ -108,7 +108,7 @@ private: DisableParameter("milli"); MandatoryOff("milli"); - AddParameter(ParameterType_Filename, "rsr", "Relative Spectral Response File"); + AddParameter(ParameterType_InputFilename, "rsr", "Relative Spectral Response File"); std::ostringstream oss; oss << "Sensor relative spectral response file"<<std::endl; oss << "By default the application gets these informations in the metadata"; @@ -146,7 +146,7 @@ private: MandatoryOff("atmo.pressure"); MandatoryOff("atmo.opt"); - AddParameter(ParameterType_Filename, "atmo.aeronet", "Aeronet File"); + AddParameter(ParameterType_InputFilename, "atmo.aeronet", "Aeronet File"); SetParameterDescription("atmo.aeronet","Aeronet file containing atmospheric parameters"); MandatoryOff("atmo.aeronet"); diff --git a/Applications/Test/otbTestApplication.cxx b/Applications/Test/otbTestApplication.cxx index d136d541c0f934d973f9cf9995509ac97fc20c70..a699de23c569888f0fa521f2783a2560127068ce 100644 --- a/Applications/Test/otbTestApplication.cxx +++ b/Applications/Test/otbTestApplication.cxx @@ -59,7 +59,8 @@ private: AddParameter(ParameterType_Float, "float", "Float"); MandatoryOff("float"); AddParameter(ParameterType_String, "string", "String"); - AddParameter(ParameterType_Filename, "filename", "File name"); + AddParameter(ParameterType_InputFilename, "filename", "File name"); + AddParameter(ParameterType_OutputFilename, "outfilename", "Output Filename"); AddParameter(ParameterType_Directory, "directory", "Directory name"); diff --git a/Applications/Utils/otbColorMapping.cxx b/Applications/Utils/otbColorMapping.cxx index c26f64f08d55e89070e62bbffdcfb828a06feee3..edeec29c0b445c06f0f7780249ffd5a626a000d1 100644 --- a/Applications/Utils/otbColorMapping.cxx +++ b/Applications/Utils/otbColorMapping.cxx @@ -446,7 +446,7 @@ private: // Custom LUT AddChoice("method.custom","Color mapping with custom labeled look-up table"); SetParameterDescription("method.custom","Apply a user-defined look-up table to a labeled image. Look-up table is loaded from a text file."); - AddParameter(ParameterType_Filename, "method.custom.lut", "Look-up table file"); + AddParameter(ParameterType_InputFilename, "method.custom.lut", "Look-up table file"); SetParameterDescription("method.custom.lut", "An ASCII file containing the look-up table\n" "with one color per line\n" "(for instance the line '1 255 0 0' means that all pixels with label 1 will be replaced by RGB color 255 0 0)\n" diff --git a/Applications/Utils/otbDEMConvert.cxx b/Applications/Utils/otbDEMConvert.cxx index d76c215e32af0afe19c2b33ce2d37a634667cfa3..4d6ef94ff444f65df77c1f83fd6a3a091abcd90d 100644 --- a/Applications/Utils/otbDEMConvert.cxx +++ b/Applications/Utils/otbDEMConvert.cxx @@ -59,7 +59,7 @@ private: AddParameter(ParameterType_InputImage, "in", "Input geo-referenced DEM"); SetParameterDescription("in", "Input geo-referenced DEM to convert to general raster format."); - AddParameter(ParameterType_Filename, "out", "Prefix of the output files"); + AddParameter(ParameterType_OutputFilename, "out", "Prefix of the output files"); std::ostringstream oss; oss << "will be used to get the prefix (name withtout extensions) of the files to write. "; oss << "Three files - prefix.geom, prefix.omd and prefix.ras - will be generated."; diff --git a/Applications/Utils/otbKmzExport.cxx b/Applications/Utils/otbKmzExport.cxx index 68e73918e2d7606d9743033251dec01beaac5571..926d15529c6fbfded5c31c904ef21f814037336e 100644 --- a/Applications/Utils/otbKmzExport.cxx +++ b/Applications/Utils/otbKmzExport.cxx @@ -60,7 +60,7 @@ private: AddParameter(ParameterType_InputImage, "in", "Input image"); SetParameterDescription("in", "Input image"); - AddParameter(ParameterType_Filename, "out", "Output .kmz product"); + AddParameter(ParameterType_OutputFilename, "out", "Output .kmz product"); SetParameterDescription("out", "Output Kmz product directory (with .kmz extension)"); AddParameter(ParameterType_Int, "tilesize", "Tile Size"); diff --git a/Applications/Utils/otbMultiResolutionPyramid.cxx b/Applications/Utils/otbMultiResolutionPyramid.cxx index 553b7e418c143fabf4accb6dd34d384fe44a3244..c200f695e633fe10c92a09fe5755d7bf45ee4c3d 100644 --- a/Applications/Utils/otbMultiResolutionPyramid.cxx +++ b/Applications/Utils/otbMultiResolutionPyramid.cxx @@ -76,7 +76,7 @@ private: AddParameter(ParameterType_InputImage, "in", "Input Image"); - AddParameter(ParameterType_Filename, "out", "Output Image"); + AddParameter(ParameterType_OutputFilename, "out", "Output Image"); SetParameterDescription("out","will be used to get the prefix and the extension of the images to write"); AddRAMParameter(); diff --git a/Applications/Utils/otbSplitImage.cxx b/Applications/Utils/otbSplitImage.cxx index 1486239d6031310e14ccab23e70372cd976e0e19..fffac5597a7052da940fd742e1d24f63734cdcba 100644 --- a/Applications/Utils/otbSplitImage.cxx +++ b/Applications/Utils/otbSplitImage.cxx @@ -64,7 +64,7 @@ private: AddParameter(ParameterType_InputImage, "in", "Input Image"); SetParameterDescription("in","Input multiband image filename."); - AddParameter(ParameterType_Filename, "out", "Output Image"); + AddParameter(ParameterType_OutputFilename, "out", "Output Image"); SetParameterDescription("out", "Output filename that will be used to get the prefix and the extension of the output images to write");