Skip to content

Commit 3bfd998

Browse files
alexbruyalexbruy
committed
Merge branch 'otb_apps_export_improvment'
2 parents 3251ece + df248db commit 3bfd998

File tree

288 files changed

+13119
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+13119
-16
lines changed

‎python/plugins/processing/algs/otb/CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ FILE(GLOB HELPER_FILES helper/*.py)
33
FILE(GLOB DESCR_FILES description/5.0.0/*.xml)
44
FiLE(GLOB HELP_FILES description/5.0.0/doc/*.html)
55

6+
FILE(GLOB DESCR_FILES description/5.6.0/*.xml)
7+
FiLE(GLOB HELP_FILES description/5.6.0/doc/*.html)
8+
69
PLUGIN_INSTALL(processing ./algs/otb ${PY_FILES})
710
PLUGIN_INSTALL(processing ./algs/otb/helper ${HELPER_FILES})
11+
812
PLUGIN_INSTALL(processing ./algs/otb/description/5.0.0 ${DESCR_FILES})
913
PLUGIN_INSTALL(processing ./algs/otb/description/5.0.0/doc ${HELP_FILES})
14+
15+
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0 ${DESCR_FILES})
16+
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0/doc ${HELP_FILES})

‎python/plugins/processing/algs/otb/OTBUtils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def getInstalledVersion(runOtb=False):
142142

143143

144144
def compatibleDescriptionPath(version):
145-
supportedVersions = {"5.0.0": "5.0.0"}
145+
supportedVersions = {"5.0.0": "5.0.0", "5.6.0": "5.6.0"}
146146
if version is None:
147147
return None
148148
if version not in supportedVersions:

‎python/plugins/processing/algs/otb/description/5.6.0/BandMath.xml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<root>
2+
<key>BandMath</key>
3+
<exec>otbcli_BandMath</exec>
4+
<longname>Band Math</longname>
5+
<group>Miscellaneous</group>
6+
<description>Perform a mathematical operation on monoband images</description>
7+
<parameter>
8+
<parameter_type source_parameter_type="ParameterType_InputImageList">ParameterMultipleInput</parameter_type>
9+
<key>il</key>
10+
<name>Input image list</name>
11+
<description>Image list to perform computation on.</description>
12+
<datatype />
13+
<optional>False</optional>
14+
</parameter>
15+
<parameter>
16+
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
17+
<key>out</key>
18+
<name>Output Image</name>
19+
<description>Output image.</description>
20+
<hidden />
21+
</parameter>
22+
<parameter>
23+
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
24+
<key>ram</key>
25+
<name>Available RAM (Mb)</name>
26+
<description>Available memory for processing (in MB)</description>
27+
<minValue />
28+
<maxValue />
29+
<default>128</default>
30+
<optional>True</optional>
31+
</parameter>
32+
<parameter>
33+
<parameter_type source_parameter_type="ParameterType_String">ParameterString</parameter_type>
34+
<key>exp</key>
35+
<name>Expression</name>
36+
<description>The mathematical expression to apply.
37+
Use im1b1 for the first band, im1b2 for the second one...</description>
38+
<default />
39+
<multiline />
40+
<optional>False</optional>
41+
</parameter>
42+
</root>

‎python/plugins/processing/algs/otb/description/5.6.0/BinaryMorphologicalOperation-closing.xml

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<root>
2+
<key>BinaryMorphologicalOperation-closing</key>
3+
<exec>otbcli_BinaryMorphologicalOperation</exec>
4+
<longname>BinaryMorphologicalOperation (closing)</longname>
5+
<group>Feature Extraction</group>
6+
<description>Performs morphological operations on an input image channel</description>
7+
<parameter>
8+
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
9+
<key>in</key>
10+
<name>Input Image</name>
11+
<description>The input image to be filtered.</description>
12+
<optional>False</optional>
13+
</parameter>
14+
<parameter>
15+
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
16+
<key>out</key>
17+
<name>Feature Output Image</name>
18+
<description>Output image containing the filtered output image.</description>
19+
<hidden />
20+
</parameter>
21+
<parameter>
22+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
23+
<key>channel</key>
24+
<name>Selected Channel</name>
25+
<description>The selected channel index</description>
26+
<minValue />
27+
<maxValue />
28+
<default>1</default>
29+
<optional>False</optional>
30+
</parameter>
31+
<parameter>
32+
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
33+
<key>ram</key>
34+
<name>Available RAM (Mb)</name>
35+
<description>Available memory for processing (in MB)</description>
36+
<minValue />
37+
<maxValue />
38+
<default>128</default>
39+
<optional>True</optional>
40+
</parameter>
41+
<parameter>
42+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
43+
<key>structype</key>
44+
<name>Structuring Element Type</name>
45+
<description>Choice of the structuring element type</description>
46+
<options>
47+
<choices>
48+
<choice>ball</choice>
49+
</choices>
50+
</options>
51+
<default>0</default>
52+
<optional>False</optional>
53+
</parameter>
54+
<parameter>
55+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
56+
<key>structype.ball.xradius</key>
57+
<name>The Structuring Element Radius</name>
58+
<description>The Structuring Element Radius</description>
59+
<minValue />
60+
<maxValue />
61+
<default>5</default>
62+
<optional>False</optional>
63+
</parameter>
64+
<parameter>
65+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
66+
<key>filter</key>
67+
<name>Morphological Operation</name>
68+
<description>Choice of the morphological operation</description>
69+
<options>
70+
<choices>
71+
<choice>closing</choice>
72+
</choices>
73+
</options>
74+
<default>0</default>
75+
<optional>False</optional>
76+
</parameter>
77+
</root>

‎python/plugins/processing/algs/otb/description/5.6.0/BinaryMorphologicalOperation-dilate.xml

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<root>
2+
<key>BinaryMorphologicalOperation-dilate</key>
3+
<exec>otbcli_BinaryMorphologicalOperation</exec>
4+
<longname>BinaryMorphologicalOperation (dilate)</longname>
5+
<group>Feature Extraction</group>
6+
<description>Performs morphological operations on an input image channel</description>
7+
<parameter>
8+
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
9+
<key>in</key>
10+
<name>Input Image</name>
11+
<description>The input image to be filtered.</description>
12+
<optional>False</optional>
13+
</parameter>
14+
<parameter>
15+
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
16+
<key>out</key>
17+
<name>Feature Output Image</name>
18+
<description>Output image containing the filtered output image.</description>
19+
<hidden />
20+
</parameter>
21+
<parameter>
22+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
23+
<key>channel</key>
24+
<name>Selected Channel</name>
25+
<description>The selected channel index</description>
26+
<minValue />
27+
<maxValue />
28+
<default>1</default>
29+
<optional>False</optional>
30+
</parameter>
31+
<parameter>
32+
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
33+
<key>ram</key>
34+
<name>Available RAM (Mb)</name>
35+
<description>Available memory for processing (in MB)</description>
36+
<minValue />
37+
<maxValue />
38+
<default>128</default>
39+
<optional>True</optional>
40+
</parameter>
41+
<parameter>
42+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
43+
<key>structype</key>
44+
<name>Structuring Element Type</name>
45+
<description>Choice of the structuring element type</description>
46+
<options>
47+
<choices>
48+
<choice>ball</choice>
49+
</choices>
50+
</options>
51+
<default>0</default>
52+
<optional>False</optional>
53+
</parameter>
54+
<parameter>
55+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
56+
<key>structype.ball.xradius</key>
57+
<name>The Structuring Element Radius</name>
58+
<description>The Structuring Element Radius</description>
59+
<minValue />
60+
<maxValue />
61+
<default>5</default>
62+
<optional>False</optional>
63+
</parameter>
64+
<parameter>
65+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
66+
<key>filter</key>
67+
<name>Morphological Operation</name>
68+
<description>Choice of the morphological operation</description>
69+
<options>
70+
<choices>
71+
<choice>dilate</choice>
72+
</choices>
73+
</options>
74+
<default>0</default>
75+
<optional>False</optional>
76+
</parameter>
77+
<parameter>
78+
<parameter_type source_parameter_type="ParameterType_Float">ParameterNumber</parameter_type>
79+
<key>filter.dilate.foreval</key>
80+
<name>Foreground Value</name>
81+
<description>The Foreground Value</description>
82+
<minValue />
83+
<maxValue />
84+
<default>1</default>
85+
<optional>False</optional>
86+
</parameter>
87+
<parameter>
88+
<parameter_type source_parameter_type="ParameterType_Float">ParameterNumber</parameter_type>
89+
<key>filter.dilate.backval</key>
90+
<name>Background Value</name>
91+
<description>The Background Value</description>
92+
<minValue />
93+
<maxValue />
94+
<default>0</default>
95+
<optional>False</optional>
96+
</parameter>
97+
</root>

‎python/plugins/processing/algs/otb/description/5.6.0/BinaryMorphologicalOperation-erode.xml

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<root>
2+
<key>BinaryMorphologicalOperation-erode</key>
3+
<exec>otbcli_BinaryMorphologicalOperation</exec>
4+
<longname>BinaryMorphologicalOperation (erode)</longname>
5+
<group>Feature Extraction</group>
6+
<description>Performs morphological operations on an input image channel</description>
7+
<parameter>
8+
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
9+
<key>in</key>
10+
<name>Input Image</name>
11+
<description>The input image to be filtered.</description>
12+
<optional>False</optional>
13+
</parameter>
14+
<parameter>
15+
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
16+
<key>out</key>
17+
<name>Feature Output Image</name>
18+
<description>Output image containing the filtered output image.</description>
19+
<hidden />
20+
</parameter>
21+
<parameter>
22+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
23+
<key>channel</key>
24+
<name>Selected Channel</name>
25+
<description>The selected channel index</description>
26+
<minValue />
27+
<maxValue />
28+
<default>1</default>
29+
<optional>False</optional>
30+
</parameter>
31+
<parameter>
32+
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
33+
<key>ram</key>
34+
<name>Available RAM (Mb)</name>
35+
<description>Available memory for processing (in MB)</description>
36+
<minValue />
37+
<maxValue />
38+
<default>128</default>
39+
<optional>True</optional>
40+
</parameter>
41+
<parameter>
42+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
43+
<key>structype</key>
44+
<name>Structuring Element Type</name>
45+
<description>Choice of the structuring element type</description>
46+
<options>
47+
<choices>
48+
<choice>ball</choice>
49+
</choices>
50+
</options>
51+
<default>0</default>
52+
<optional>False</optional>
53+
</parameter>
54+
<parameter>
55+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
56+
<key>structype.ball.xradius</key>
57+
<name>The Structuring Element Radius</name>
58+
<description>The Structuring Element Radius</description>
59+
<minValue />
60+
<maxValue />
61+
<default>5</default>
62+
<optional>False</optional>
63+
</parameter>
64+
<parameter>
65+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
66+
<key>filter</key>
67+
<name>Morphological Operation</name>
68+
<description>Choice of the morphological operation</description>
69+
<options>
70+
<choices>
71+
<choice>erode</choice>
72+
</choices>
73+
</options>
74+
<default>0</default>
75+
<optional>False</optional>
76+
</parameter>
77+
</root>

‎python/plugins/processing/algs/otb/description/5.6.0/BinaryMorphologicalOperation-opening.xml

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<root>
2+
<key>BinaryMorphologicalOperation-opening</key>
3+
<exec>otbcli_BinaryMorphologicalOperation</exec>
4+
<longname>BinaryMorphologicalOperation (opening)</longname>
5+
<group>Feature Extraction</group>
6+
<description>Performs morphological operations on an input image channel</description>
7+
<parameter>
8+
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
9+
<key>in</key>
10+
<name>Input Image</name>
11+
<description>The input image to be filtered.</description>
12+
<optional>False</optional>
13+
</parameter>
14+
<parameter>
15+
<parameter_type source_parameter_type="ParameterType_OutputImage">OutputRaster</parameter_type>
16+
<key>out</key>
17+
<name>Feature Output Image</name>
18+
<description>Output image containing the filtered output image.</description>
19+
<hidden />
20+
</parameter>
21+
<parameter>
22+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
23+
<key>channel</key>
24+
<name>Selected Channel</name>
25+
<description>The selected channel index</description>
26+
<minValue />
27+
<maxValue />
28+
<default>1</default>
29+
<optional>False</optional>
30+
</parameter>
31+
<parameter>
32+
<parameter_type source_parameter_type="ParameterType_RAM">ParameterNumber</parameter_type>
33+
<key>ram</key>
34+
<name>Available RAM (Mb)</name>
35+
<description>Available memory for processing (in MB)</description>
36+
<minValue />
37+
<maxValue />
38+
<default>128</default>
39+
<optional>True</optional>
40+
</parameter>
41+
<parameter>
42+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
43+
<key>structype</key>
44+
<name>Structuring Element Type</name>
45+
<description>Choice of the structuring element type</description>
46+
<options>
47+
<choices>
48+
<choice>ball</choice>
49+
</choices>
50+
</options>
51+
<default>0</default>
52+
<optional>False</optional>
53+
</parameter>
54+
<parameter>
55+
<parameter_type source_parameter_type="ParameterType_Int">ParameterNumber</parameter_type>
56+
<key>structype.ball.xradius</key>
57+
<name>The Structuring Element Radius</name>
58+
<description>The Structuring Element Radius</description>
59+
<minValue />
60+
<maxValue />
61+
<default>5</default>
62+
<optional>False</optional>
63+
</parameter>
64+
<parameter>
65+
<parameter_type source_parameter_type="ParameterType_Choice">ParameterSelection</parameter_type>
66+
<key>filter</key>
67+
<name>Morphological Operation</name>
68+
<description>Choice of the morphological operation</description>
69+
<options>
70+
<choices>
71+
<choice>opening</choice>
72+
</choices>
73+
</options>
74+
<default>0</default>
75+
<optional>False</optional>
76+
</parameter>
77+
</root>

0 commit comments

Comments
 (0)