diff --git a/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py b/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py index 6af59db0d2192a28c61aa51559d76003c87af94b..1fdf53d44841712fcb7f221dfc5618bd4c6cc47c 100755 --- a/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py +++ b/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py @@ -25,7 +25,7 @@ import argparse import re import otbApplication -from otbApplication import ParameterType_Bool, ParameterType_Int, ParameterType_Radius, ParameterType_RAM, ParameterType_Float, ParameterType_String, ParameterType_StringList, ParameterType_InputFilename, ParameterType_OutputFilename, ParameterType_InputImage, ParameterType_ComplexInputImage, ParameterType_OutputImage, ParameterType_ComplexOutputImage, ParameterType_InputVectorData, ParameterType_OutputVectorData, ParameterType_Directory, ParameterType_Choice, ParameterType_InputImageList, ParameterType_InputVectorDataList, ParameterType_InputFilenameList, ParameterType_InputProcessXML, ParameterType_OutputProcessXML, ParameterType_ListView, ParameterType_Group +from otbApplication import ParameterType_Bool, ParameterType_Int, ParameterType_Radius, ParameterType_RAM, ParameterType_Float, ParameterType_String, ParameterType_StringList, ParameterType_InputFilename, ParameterType_OutputFilename, ParameterType_InputImage, ParameterType_OutputImage, ParameterType_InputVectorData, ParameterType_OutputVectorData, ParameterType_Directory, ParameterType_Choice, ParameterType_InputImageList, ParameterType_InputVectorDataList, ParameterType_InputFilenameList, ParameterType_InputProcessXML, ParameterType_OutputProcessXML, ParameterType_ListView, ParameterType_Group from otb_warnings import application_documentation_warnings @@ -118,9 +118,6 @@ def GetApplicationExamplePythonSnippet(app,idx,expand = False, inputpath="",outp if paramtype == ParameterType_InputImage : # app.SetParameterString(param,EncloseString(ExpandPath(value,inputpath,expand))) output += "\t" + appname + ".SetParameterString("+EncloseString(param)+", "+EncloseString(ExpandPath(value,inputpath,expand))+")" - if paramtype == ParameterType_ComplexInputImage: - # app.SetParameterString(param,EncloseString(ExpandPath(value,inputpath,expand))) - output += "\t" + appname + ".SetParameterString("+EncloseString(param)+", "+EncloseString(ExpandPath(value,inputpath,expand))+")" if paramtype == ParameterType_InputVectorData: # app.SetParameterString(param,EncloseString(ExpandPath(value,inputpath,expand))) output += "\t" + appname + ".SetParameterString("+EncloseString(param)+", "+EncloseString(ExpandPath(value,inputpath,expand))+")" @@ -132,10 +129,6 @@ def GetApplicationExamplePythonSnippet(app,idx,expand = False, inputpath="",outp output += "\t" + appname + ".SetParameterOutputImagePixelType("+EncloseString(param)+", "+str(foundcode)+")" else: output += "\t" + appname +".SetParameterString("+EncloseString(param)+", "+ EncloseString(ExpandPath(value,outputpath,expand)) + ")" - if paramtype == ParameterType_ComplexOutputImage : - # TODO: handle complex type properly - # app.SetParameterString(param,EncloseString(ExpandPath(value,outputpath,expand))) - output += "\t" + appname +".SetParameterString("+EncloseString(param)+", "+ EncloseString(ExpandPath(value,outputpath,expand)) + ")" if paramtype == ParameterType_OutputVectorData: # app.SetParameterString(param,EncloseString(ExpandPath(value,outputpath,expand))) output += "\t" + appname +".SetParameterString("+EncloseString(param)+", "+ EncloseString(ExpandPath(value,outputpath,expand)) + ")" @@ -201,8 +194,8 @@ def rst_parameter_value(app, key): values.update({ParameterType_String: "string"}) values.update({ParameterType_StringList: "string1 string2..."}) values.update(dict.fromkeys([ParameterType_InputFilename, ParameterType_OutputFilename], "filename [dtype]")) - values.update(dict.fromkeys([ParameterType_InputImage, ParameterType_ComplexInputImage], "image")) - values.update(dict.fromkeys([ParameterType_OutputImage, ParameterType_ComplexOutputImage], "image [dtype]")) + values.update({ParameterType_InputImage: "image"}) + values.update({ParameterType_OutputImage: "image [dtype]"}) values.update(dict.fromkeys([ParameterType_InputVectorData, ParameterType_OutputVectorData], "vectorfile")) values.update({ParameterType_Directory: "directory"}) values.update({ParameterType_Choice: "choice"}) diff --git a/Documentation/Cookbook/rst/C++/WriteAnApplication.rst b/Documentation/Cookbook/rst/C++/WriteAnApplication.rst index 7bf160f4e8a3eb751e0a0131b7337f7f64b9d7df..d9cca542b519cde0318c36b306991e408d4434be 100644 --- a/Documentation/Cookbook/rst/C++/WriteAnApplication.rst +++ b/Documentation/Cookbook/rst/C++/WriteAnApplication.rst @@ -101,9 +101,6 @@ Similar methods exist for binding a data object to an output parameter: - ``SetParameterOutputImage(key,data)`` : link the image object to the given output parameter -- ``SetParameterComplexOutputImage(key,data)`` : link the complex image - object to the given output parameter - - ``SetParameterOutputVectorData(key,data)`` : link the vector data object to the given output parameter @@ -155,9 +152,6 @@ parameters: - ``ParameterType_InputImageList`` : parameter storing a list of input image. -- ``ParameterType_ComplexInputImage`` : parameter storing a complex - input image. - - ``ParameterType_InputVectorData`` : parameter storing input vector data. @@ -172,9 +166,6 @@ parameters: - ``ParameterType_OutputImage`` : parameter storing an output image. -- ``ParameterType_ComplexOutputImage`` : parameter storing a complex - output image. - - ``ParameterType_OutputVectorData`` : parameter storing an output vector data. @@ -205,11 +196,11 @@ you can use a numeric parameter and change its role by calling ``SetParameterRole(key,Role_Output)``. The input types ``InputImage``, ``InputImageList``, -``ComplexInputImage``, ``InputVectorData`` and ``InputVectorDataList`` + ``InputVectorData`` and ``InputVectorDataList`` store the name of the files to load, but they also encapsulate the readers needed to produce the input data. -The output types ``OutputImage``, ``ComplexOutputImage`` and +The output types ``OutputImage`` and ``OutputVectorData`` store the name of the files to write, but they also encapsulate the corresponding writers.