Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'otb_apps_export_improvment' of https://github.com/grizo…
…nnetm/QGIS into otb_apps_export_improvment
  • Loading branch information
alexbruy committed Aug 23, 2016
2 parents 3251ece + ce0a2ae commit 10f72cd
Show file tree
Hide file tree
Showing 288 changed files with 13,117 additions and 16 deletions.
7 changes: 7 additions & 0 deletions python/plugins/processing/algs/otb/CMakeLists.txt
Expand Up @@ -3,7 +3,14 @@ FILE(GLOB HELPER_FILES helper/*.py)
FILE(GLOB DESCR_FILES description/5.0.0/*.xml)
FiLE(GLOB HELP_FILES description/5.0.0/doc/*.html)

FILE(GLOB DESCR_FILES description/5.6.0/*.xml)
FiLE(GLOB HELP_FILES description/5.6.0/doc/*.html)

PLUGIN_INSTALL(processing ./algs/otb ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/otb/helper ${HELPER_FILES})

PLUGIN_INSTALL(processing ./algs/otb/description/5.0.0 ${DESCR_FILES})
PLUGIN_INSTALL(processing ./algs/otb/description/5.0.0/doc ${HELP_FILES})

PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0 ${DESCR_FILES})
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0/doc ${HELP_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/otb/OTBUtils.py
Expand Up @@ -142,7 +142,7 @@ def getInstalledVersion(runOtb=False):


def compatibleDescriptionPath(version):
supportedVersions = {"5.0.0": "5.0.0"}
supportedVersions = {"5.0.0": "5.0.0", "5.6.0": "5.6.0"}
if version is None:
return None
if version not in supportedVersions:
Expand Down
42 changes: 42 additions & 0 deletions python/plugins/processing/algs/otb/description/5.6.0/BandMath.xml
@@ -0,0 +1,42 @@
<root>
<key>BandMath</key>
<exec>otbcli_BandMath</exec>
<longname>Band Math</longname>
<group>Miscellaneous</group>
<description>Perform a mathematical operation on monoband images</description>
<parameter>
<parameter_type source_parameter_type="ParameterType_InputImageList">ParameterMultipleInput</parameter_type>
<key>il</key>
<name>Input image list</name>
<description>Image list to perform computation on.</description>
<datatype />
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
<key>out</key>
<name>Output Image</name>
<description>Output image.</description>
<hidden />
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
<key>ram</key>
<name>Available RAM (Mb)</name>
<description>Available memory for processing (in MB)</description>
<minValue />
<maxValue />
<default>128</default>
<optional>True</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_String">ParameterString</parameter_type>
<key>exp</key>
<name>Expression</name>
<description>The mathematical expression to apply.
Use im1b1 for the first band, im1b2 for the second one...</description>
<default />
<multiline />
<optional>False</optional>
</parameter>
</root>
@@ -0,0 +1,77 @@
<root>
<key>BinaryMorphologicalOperation-closing</key>
<exec>otbcli_BinaryMorphologicalOperation</exec>
<longname>BinaryMorphologicalOperation (closing)</longname>
<group>Feature Extraction</group>
<description>Performs morphological operations on an input image channel</description>
<parameter>
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
<key>in</key>
<name>Input Image</name>
<description>The input image to be filtered.</description>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
<key>out</key>
<name>Feature Output Image</name>
<description>Output image containing the filtered output image.</description>
<hidden />
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>channel</key>
<name>Selected Channel</name>
<description>The selected channel index</description>
<minValue />
<maxValue />
<default>1</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
<key>ram</key>
<name>Available RAM (Mb)</name>
<description>Available memory for processing (in MB)</description>
<minValue />
<maxValue />
<default>128</default>
<optional>True</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>structype</key>
<name>Structuring Element Type</name>
<description>Choice of the structuring element type</description>
<options>
<choices>
<choice>ball</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>structype.ball.xradius</key>
<name>The Structuring Element Radius</name>
<description>The Structuring Element Radius</description>
<minValue />
<maxValue />
<default>5</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>filter</key>
<name>Morphological Operation</name>
<description>Choice of the morphological operation</description>
<options>
<choices>
<choice>closing</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
</root>
@@ -0,0 +1,97 @@
<root>
<key>BinaryMorphologicalOperation-dilate</key>
<exec>otbcli_BinaryMorphologicalOperation</exec>
<longname>BinaryMorphologicalOperation (dilate)</longname>
<group>Feature Extraction</group>
<description>Performs morphological operations on an input image channel</description>
<parameter>
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
<key>in</key>
<name>Input Image</name>
<description>The input image to be filtered.</description>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
<key>out</key>
<name>Feature Output Image</name>
<description>Output image containing the filtered output image.</description>
<hidden />
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>channel</key>
<name>Selected Channel</name>
<description>The selected channel index</description>
<minValue />
<maxValue />
<default>1</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
<key>ram</key>
<name>Available RAM (Mb)</name>
<description>Available memory for processing (in MB)</description>
<minValue />
<maxValue />
<default>128</default>
<optional>True</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>structype</key>
<name>Structuring Element Type</name>
<description>Choice of the structuring element type</description>
<options>
<choices>
<choice>ball</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>structype.ball.xradius</key>
<name>The Structuring Element Radius</name>
<description>The Structuring Element Radius</description>
<minValue />
<maxValue />
<default>5</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>filter</key>
<name>Morphological Operation</name>
<description>Choice of the morphological operation</description>
<options>
<choices>
<choice>dilate</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Float">ParameterNumber</parameter_type>
<key>filter.dilate.foreval</key>
<name>Foreground Value</name>
<description>The Foreground Value</description>
<minValue />
<maxValue />
<default>1</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Float">ParameterNumber</parameter_type>
<key>filter.dilate.backval</key>
<name>Background Value</name>
<description>The Background Value</description>
<minValue />
<maxValue />
<default>0</default>
<optional>False</optional>
</parameter>
</root>
@@ -0,0 +1,77 @@
<root>
<key>BinaryMorphologicalOperation-erode</key>
<exec>otbcli_BinaryMorphologicalOperation</exec>
<longname>BinaryMorphologicalOperation (erode)</longname>
<group>Feature Extraction</group>
<description>Performs morphological operations on an input image channel</description>
<parameter>
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
<key>in</key>
<name>Input Image</name>
<description>The input image to be filtered.</description>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
<key>out</key>
<name>Feature Output Image</name>
<description>Output image containing the filtered output image.</description>
<hidden />
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>channel</key>
<name>Selected Channel</name>
<description>The selected channel index</description>
<minValue />
<maxValue />
<default>1</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
<key>ram</key>
<name>Available RAM (Mb)</name>
<description>Available memory for processing (in MB)</description>
<minValue />
<maxValue />
<default>128</default>
<optional>True</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>structype</key>
<name>Structuring Element Type</name>
<description>Choice of the structuring element type</description>
<options>
<choices>
<choice>ball</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>structype.ball.xradius</key>
<name>The Structuring Element Radius</name>
<description>The Structuring Element Radius</description>
<minValue />
<maxValue />
<default>5</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>filter</key>
<name>Morphological Operation</name>
<description>Choice of the morphological operation</description>
<options>
<choices>
<choice>erode</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
</root>
@@ -0,0 +1,77 @@
<root>
<key>BinaryMorphologicalOperation-opening</key>
<exec>otbcli_BinaryMorphologicalOperation</exec>
<longname>BinaryMorphologicalOperation (opening)</longname>
<group>Feature Extraction</group>
<description>Performs morphological operations on an input image channel</description>
<parameter>
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
<key>in</key>
<name>Input Image</name>
<description>The input image to be filtered.</description>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
<key>out</key>
<name>Feature Output Image</name>
<description>Output image containing the filtered output image.</description>
<hidden />
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>channel</key>
<name>Selected Channel</name>
<description>The selected channel index</description>
<minValue />
<maxValue />
<default>1</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
<key>ram</key>
<name>Available RAM (Mb)</name>
<description>Available memory for processing (in MB)</description>
<minValue />
<maxValue />
<default>128</default>
<optional>True</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>structype</key>
<name>Structuring Element Type</name>
<description>Choice of the structuring element type</description>
<options>
<choices>
<choice>ball</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
<key>structype.ball.xradius</key>
<name>The Structuring Element Radius</name>
<description>The Structuring Element Radius</description>
<minValue />
<maxValue />
<default>5</default>
<optional>False</optional>
</parameter>
<parameter>
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
<key>filter</key>
<name>Morphological Operation</name>
<description>Choice of the morphological operation</description>
<options>
<choices>
<choice>opening</choice>
</choices>
</options>
<default>0</default>
<optional>False</optional>
</parameter>
</root>

0 comments on commit 10f72cd

Please sign in to comment.