From fa10eab4c6e324604b1db78497cffeafdc8a34cd Mon Sep 17 00:00:00 2001 From: Mandarancio Date: Mon, 16 Dec 2019 17:15:33 +0100 Subject: [PATCH 1/4] unifing menus --- .../java/org/esa/s2tbx/coregistration/CoregistrationOp.java | 2 +- .../main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java | 2 +- .../main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java | 2 +- .../src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java | 2 +- .../main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java | 2 +- .../esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java | 2 +- .../esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java b/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java index 1fc187bbe3..0fe7714a19 100644 --- a/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java +++ b/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java @@ -33,7 +33,7 @@ @OperatorMetadata( alias = "CoregistrationOp", version = "1.0", - category = "Raster/Geometric", + category = "Raster/Geometric Operations", description = "Coregisters two rasters, not considering their location", authors = "Ramona M", copyright = "Copyright (C) 2017 by CS ROMANIA") diff --git a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java index 5ba278997a..569426119a 100644 --- a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java +++ b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java @@ -22,7 +22,7 @@ @OperatorMetadata( alias = "BandsDifferenceOp", version="1.0", - category = "", + category = "", // TODO: find correct category or hide it in the graph builder menu description = "", authors = "Jean Coravu", copyright = "Copyright (C) 2017 by CS ROMANIA") diff --git a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java index 29ff792090..19f6ea2ceb 100644 --- a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java +++ b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java @@ -36,7 +36,7 @@ @OperatorMetadata( alias = "BandsExtractorOp", version="1.0", - category = "", + category = "Optical", description = "Creates a new product out of the source product containing only the indexes bands given", authors = "Razvan Dumitrascu", copyright = "Copyright (C) 2017 by CS ROMANIA") diff --git a/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java b/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java index 45d690c714..e3da17ce46 100644 --- a/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java +++ b/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java @@ -44,7 +44,7 @@ @OperatorMetadata( alias = "GenericRegionMergingOp", version="1.0", - category = "Optical/Thematic Land Processing", + category = "Raster/Segmentation", // "Optical/Thematic Land Processing", description = "The 'Generic Region Merging' operator computes the distinct regions from a product", authors = "Jean Coravu", copyright = "Copyright (C) 2017 by CS ROMANIA") diff --git a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java index f71c30908a..e830ff215b 100644 --- a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java +++ b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java @@ -65,7 +65,7 @@ * @since 5.0.6 */ @OperatorMetadata(alias = "Multi-size Mosaic", - category = "Raster/Geometric", + category = "Raster/Geometric Operations", version = "1.0", authors = "Razvan Dumitrascu", copyright = "(c) 2017 by CS Romania", diff --git a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java index 65eb5c9f5d..117508f5c6 100644 --- a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java +++ b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java @@ -124,7 +124,7 @@ * @since 5.0.6 */ @OperatorMetadata(alias = "S2tbx-Reproject", - category = "Raster/Geometric", + category = "Raster/Geometric Operations", // TODO: Check where it is in the main menu version = "1.0", authors = "Marco Zühlke, Marco Peters, Ralf Quast, Norman Fomferra, Razvan Dumitrascu", copyright = "(c) 2009 by Brockmann Consult, 2017 by CS Romania", diff --git a/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java b/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java index ab9563f6f8..8cc58648f7 100644 --- a/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java +++ b/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java @@ -31,7 +31,7 @@ @OperatorMetadata( alias = "ReflectanceToRadianceOp", version="1.0", - category = "Optical/Thematic Land Processing", + category = "Optical/Preprocessing", description = "The 'Reflectance To Radiance Processor' operator retrieves the radiance from reflectance using Sentinel-2 products", authors = "Dragos Mihailescu", copyright = "Copyright (C) 2016 by CS ROMANIA") From 6cdf4443a772394e36a5493b397db7ef85a9b04b Mon Sep 17 00:00:00 2001 From: Martino Ferrari Date: Tue, 17 Dec 2019 20:51:58 +0100 Subject: [PATCH 2/4] fixing category discrepances --- .../main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java b/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java index 288e698bda..d69fbc7f0f 100644 --- a/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java +++ b/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java @@ -41,7 +41,7 @@ @OperatorMetadata( alias = "SpectralAngleMapperOp", version="1.0", - category = "Optical/Thematic Land Processing", + category = "Geometric/Classification/Supervised Classification", description = "Classifies a product using the spectral angle mapper algorithm", authors = "Dumitrascu Razvan", copyright = "Copyright (C) 2017 by CS ROMANIA") From f4cf27ecf200a134c5cff85b5a1243a06caf2d85 Mon Sep 17 00:00:00 2001 From: Mandarancio Date: Wed, 18 Dec 2019 17:11:06 +0100 Subject: [PATCH 3/4] added label to operators --- .../src/main/java/org/esa/s2tbx/biophysical/BiophysicalOp.java | 1 + .../java/org/esa/s2tbx/coregistration/CoregistrationOp.java | 1 + .../src/main/java/org/esa/s2tbx/fcc/ForestCoverChangeOp.java | 1 + .../main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java | 3 ++- .../main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java | 1 + .../main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java | 1 + .../main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java | 1 + .../esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/ArviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/Bi2Op.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/BiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/CiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/DviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/GemiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/GndviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/IpviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/IreciOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/McariOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/MndwiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/Msavi2Op.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/MsaviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/MtciOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/Ndi45Op.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/NdpiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/NdtiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/Ndwi2Op.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/NdwiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/PssraOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/PviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/ReipOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/RiOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/RviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/S2repOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/SaviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/TndviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/TsaviOp.java | 1 + .../src/main/java/org/esa/s2tbx/radiometry/WdviOp.java | 1 + .../s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java | 1 + .../src/main/java/org/esa/s2tbx/processor/mci/S2MciOp.java | 2 +- .../java/org/esa/s2tbx/s2msi/resampler/S2ResamplingOp.java | 1 + .../main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java | 1 + 41 files changed, 42 insertions(+), 2 deletions(-) diff --git a/s2tbx-biophysical/src/main/java/org/esa/s2tbx/biophysical/BiophysicalOp.java b/s2tbx-biophysical/src/main/java/org/esa/s2tbx/biophysical/BiophysicalOp.java index 9726eae509..a792b3c8bb 100644 --- a/s2tbx-biophysical/src/main/java/org/esa/s2tbx/biophysical/BiophysicalOp.java +++ b/s2tbx-biophysical/src/main/java/org/esa/s2tbx/biophysical/BiophysicalOp.java @@ -48,6 +48,7 @@ */ @OperatorMetadata( alias = "BiophysicalOp", + label = "Biophysical Processor (LAI, fAPAR...)", category = "Optical/Thematic Land Processing", description = "The 'Biophysical Processor' operator retrieves LAI from atmospherically corrected Sentinel-2 products", authors = "Julien Malik", diff --git a/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java b/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java index 0fe7714a19..971307daa5 100644 --- a/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java +++ b/s2tbx-coregistration/src/main/java/org/esa/s2tbx/coregistration/CoregistrationOp.java @@ -32,6 +32,7 @@ */ @OperatorMetadata( alias = "CoregistrationOp", + label = "GeFolki Co-registration", version = "1.0", category = "Raster/Geometric Operations", description = "Coregisters two rasters, not considering their location", diff --git a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/ForestCoverChangeOp.java b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/ForestCoverChangeOp.java index 1c84bce6e5..554a18d456 100644 --- a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/ForestCoverChangeOp.java +++ b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/ForestCoverChangeOp.java @@ -75,6 +75,7 @@ */ @OperatorMetadata( alias = "ForestCoverChangeOp", + label = "Forset Cover Change Operator", version="1.0", category = "Optical/Thematic Land Processing", description = "Creates forrest change masks out of two source products", diff --git a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java index 569426119a..1d0c3ee5eb 100644 --- a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java +++ b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsDifferenceOp.java @@ -21,9 +21,10 @@ */ @OperatorMetadata( alias = "BandsDifferenceOp", + label = "Bands Difference", version="1.0", category = "", // TODO: find correct category or hide it in the graph builder menu - description = "", + description = "", // I think it should be internal= true authors = "Jean Coravu", copyright = "Copyright (C) 2017 by CS ROMANIA") public class BandsDifferenceOp extends Operator { diff --git a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java index 19f6ea2ceb..0445f8965c 100644 --- a/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java +++ b/s2tbx-forest-cover-change/src/main/java/org/esa/s2tbx/fcc/common/BandsExtractorOp.java @@ -35,6 +35,7 @@ */ @OperatorMetadata( alias = "BandsExtractorOp", + label = "Bands Extractor", version="1.0", category = "Optical", description = "Creates a new product out of the source product containing only the indexes bands given", diff --git a/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java b/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java index e3da17ce46..c3d95974ae 100644 --- a/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java +++ b/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java @@ -43,6 +43,7 @@ */ @OperatorMetadata( alias = "GenericRegionMergingOp", + label = "Generic region merging processor" version="1.0", category = "Raster/Segmentation", // "Optical/Thematic Land Processing", description = "The 'Generic Region Merging' operator computes the distinct regions from a product", diff --git a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java index e830ff215b..f218754650 100644 --- a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java +++ b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/S2tbxMosaicOp.java @@ -65,6 +65,7 @@ * @since 5.0.6 */ @OperatorMetadata(alias = "Multi-size Mosaic", + label = "Multi-size Mosaic", category = "Raster/Geometric Operations", version = "1.0", authors = "Razvan Dumitrascu", diff --git a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java index 117508f5c6..807c0400f6 100644 --- a/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java +++ b/s2tbx-mosaic/src/main/java/org/esa/s2tbx/dataio/mosaic/reproject/S2tbxReprojectionOp.java @@ -124,6 +124,7 @@ * @since 5.0.6 */ @OperatorMetadata(alias = "S2tbx-Reproject", + label = "Reprojection", category = "Raster/Geometric Operations", // TODO: Check where it is in the main menu version = "1.0", authors = "Marco Zühlke, Marco Peters, Ralf Quast, Norman Fomferra, Razvan Dumitrascu", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ArviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ArviOp.java index 620cd54145..53cabde1ad 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ArviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ArviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "ArviOp", + label = "ARVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Atmospherically Resistant Vegetation Index belongs to a family of indices with built-in atmospheric corrections.", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Bi2Op.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Bi2Op.java index e69ac2035b..f430f5bf47 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Bi2Op.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Bi2Op.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "Bi2Op", + label = "BI2 Processor", version="1.0", category = "Optical/Thematic Land Processing/Soil Radiometric Indices", description = "The Brightness index represents the average of the brightness of a satellite image.\n" + diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/BiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/BiOp.java index 924e4ac2b6..bad141f98e 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/BiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/BiOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "BiOp", + label = "BI Processor", version="1.0", category = "Optical/Thematic Land Processing/Soil Radiometric Indices", description = "The Brightness index represents the average of the brightness of a satellite image.", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/CiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/CiOp.java index 38ee04c8b8..985282e594 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/CiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/CiOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "CiOp", + label = "CI Processor", version="1.0", category = "Optical/Thematic Land Processing/Soil Radiometric Indices", description = "Colour Index was developed to differentiate soils in the field.\n" + diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/DviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/DviOp.java index 2026bdbe2f..4661a2804c 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/DviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/DviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "DviOp", + label = "DVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Difference Vegetation Index retrieves the Isovegetation lines parallel to soil line", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GemiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GemiOp.java index 99c90f6ebd..fb7df64900 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GemiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GemiOp.java @@ -33,6 +33,7 @@ @OperatorMetadata( alias = "GemiOp", + label = "GEMI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "This retrieves the Global Environmental Monitoring Index (GEMI).", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GndviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GndviOp.java index c54056f547..56cdd41904 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GndviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/GndviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "GndviOp", + label = "GNDVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Green Normalized Difference Vegetation Index", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IpviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IpviOp.java index e776e58336..fda58bb5c2 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IpviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IpviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "IpviOp", + label = "IPVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Infrared Percentage Vegetation Index retrieves the Isovegetation lines converge at origin", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IreciOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IreciOp.java index 94de9dae97..042e9547f3 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IreciOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/IreciOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "IreciOp", + label = "IRECI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Inverted red-edge chlorophyll index", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/McariOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/McariOp.java index 53b9881b6f..f363cdd64a 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/McariOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/McariOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "McariOp", + label = "MCARI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Modified Chlorophyll Absorption Ratio Index, developed to be responsive to chlorophyll variation", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MndwiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MndwiOp.java index 89f2ee8d29..9d31c394d4 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MndwiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MndwiOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "MndwiOp", + label = "MNDWI Processor", version="1.0", category = "Optical/Thematic Land Processing/Water Radiometric Indices", description = "Modified Normalized Difference Water Index, allowing for the measurement of surface water extent", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Msavi2Op.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Msavi2Op.java index eaadaa697a..a67b51f97c 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Msavi2Op.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Msavi2Op.java @@ -35,6 +35,7 @@ */ @OperatorMetadata( alias = "Msavi2Op", + label = "MSAVI2 Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "This retrieves the second Modified Soil Adjusted Vegetation Index (MSAVI2).", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MsaviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MsaviOp.java index 2ad2b8f9e5..afd2cebddb 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MsaviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MsaviOp.java @@ -35,6 +35,7 @@ */ @OperatorMetadata( alias = "MsaviOp", + label = "MSAVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "This retrieves the Modified Soil Adjusted Vegetation Index (MSAVI).", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MtciOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MtciOp.java index 4e5019558d..07c7f0612f 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MtciOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/MtciOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "MtciOp", + label = "MTCI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "The Meris Terrestrial Chlorophyll Index, aims at estimating the Red Edge Position (REP).\n" + diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndi45Op.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndi45Op.java index ad6be6b837..cc73cf478a 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndi45Op.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndi45Op.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "Ndi45Op", + label = "NDI45 Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Normalized Difference Index using bands 4 and 5", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdpiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdpiOp.java index 6fa7b46e0e..38bee28236 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdpiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdpiOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "NdpiOp", + label = "NDPI Processor", version="1.0", category = "Optical/Thematic Land Processing/Water Radiometric Indices", description = "The normalized differential pond index, combines the short-wave infrared band-I and the green band", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdtiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdtiOp.java index 94352f4c59..b995360e41 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdtiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdtiOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "NdtiOp", + label = "NDTI Processor", version="1.0", category = "Optical/Thematic Land Processing/Water Radiometric Indices", description = "Normalized difference turbidity index, allowing for the measurement of water turbidity", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndwi2Op.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndwi2Op.java index 8ad8ca615c..80fea86b27 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndwi2Op.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/Ndwi2Op.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "Ndwi2Op", + label = "NDWI2 Processor", version="1.0", category = "Optical/Thematic Land Processing/Water Radiometric Indices", description = "The Normalized Difference Water Index, allowing for the measurement of surface water extent", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdwiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdwiOp.java index 7d500204d4..abe46db2dc 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdwiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/NdwiOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "NdwiOp", + label = "NDWI Processor", version="1.0", category = "Optical/Thematic Land Processing/Water Radiometric Indices", description = "The Normalized Difference Water Index was developed for the extraction of water features", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PssraOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PssraOp.java index 24f347afdb..49df5b67fa 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PssraOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PssraOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "PssraOp", + label = "PSSRA Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Pigment Specific Simple Ratio, chlorophyll index", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PviOp.java index 9042384455..adbe895f65 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/PviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "PviOp", + label = "PVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Perpendicular Vegetation Index retrieves the Isovegetation lines parallel to soil line. Soil line has an arbitrary slope and passes through origin", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ReipOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ReipOp.java index ed11c778a4..c4fa5758af 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ReipOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/ReipOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "ReipOp", + label = "REIP Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "The red edge inflection point index", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RiOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RiOp.java index 5204fc7502..21243b5736 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RiOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RiOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "RiOp", + label = "RI Processor", version="1.0", category = "Optical/Thematic Land Processing/Soil Radiometric Indices", description = "The Redness Index was developed to identify soil colour variations.", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RviOp.java index fddb89e3bf..e7b09f7170 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/RviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "RviOp", + label = "RVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Ratio Vegetation Index retrieves the Isovegetation lines converge at origin", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/S2repOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/S2repOp.java index 80f537fca5..73e7c1bf81 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/S2repOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/S2repOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "S2repOp", + label = "S2REP processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Sentinel-2 red-edge position index", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/SaviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/SaviOp.java index bec9d11ce7..034b75d84e 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/SaviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/SaviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "SaviOp", + label = "SAVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "This retrieves the Soil-Adjusted Vegetation Index (SAVI).", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TndviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TndviOp.java index 7c08d7a8c4..ecd73ab0ca 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TndviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TndviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "TndviOp", + label = "TNDVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Transformed Normalized Difference Vegetation Index retrieves the Isovegetation lines parallel to soil line", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TsaviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TsaviOp.java index 36326e5ef0..18e3d6985d 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TsaviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/TsaviOp.java @@ -35,6 +35,7 @@ */ @OperatorMetadata( alias = "TsaviOp", + label = "TSAVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "This retrieves the Transformed Soil Adjusted Vegetation Index (TSAVI).", diff --git a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/WdviOp.java b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/WdviOp.java index 8f14a7373f..5bd9d4babe 100644 --- a/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/WdviOp.java +++ b/s2tbx-radiometric-indices/src/main/java/org/esa/s2tbx/radiometry/WdviOp.java @@ -32,6 +32,7 @@ @OperatorMetadata( alias = "WdviOp", + label = "WDVI Processor", version="1.0", category = "Optical/Thematic Land Processing/Vegetation Radiometric Indices", description = "Weighted Difference Vegetation Index retrieves the Isovegetation lines parallel to soil line. Soil line has an arbitrary slope and passes through origin", diff --git a/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java b/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java index 8cc58648f7..dea26f1a42 100644 --- a/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java +++ b/s2tbx-reflectance-to-radiance/src/main/java/org/esa/s2tbx/reflectance2radiance/ReflectanceToRadianceOp.java @@ -30,6 +30,7 @@ */ @OperatorMetadata( alias = "ReflectanceToRadianceOp", + label = "Reflectance-To-Radiance Processor", version="1.0", category = "Optical/Preprocessing", description = "The 'Reflectance To Radiance Processor' operator retrieves the radiance from reflectance using Sentinel-2 products", diff --git a/s2tbx-s2msi-mci/src/main/java/org/esa/s2tbx/processor/mci/S2MciOp.java b/s2tbx-s2msi-mci/src/main/java/org/esa/s2tbx/processor/mci/S2MciOp.java index 838cdfab54..5a6ee770be 100644 --- a/s2tbx-s2msi-mci/src/main/java/org/esa/s2tbx/processor/mci/S2MciOp.java +++ b/s2tbx-s2msi-mci/src/main/java/org/esa/s2tbx/processor/mci/S2MciOp.java @@ -40,7 +40,7 @@ /** * An operator for computing maximum chlorophyll index (MCI) for Sentinel-2 MSI data. */ -@OperatorMetadata(alias = "Mci.s2", authors = "Marco Peters", copyright = "Brockmann Consult GmbH", +@OperatorMetadata(alias = "Mci.s2", label="S2 MCI Processor", authors = "Marco Peters", copyright = "Brockmann Consult GmbH", category = "Optical/Thematic Water Processing", version = "1.0", description = "Computes maximum chlorophyll index (MCI) for Sentinel-2 MSI.") diff --git a/s2tbx-s2msi-resampler/src/main/java/org/esa/s2tbx/s2msi/resampler/S2ResamplingOp.java b/s2tbx-s2msi-resampler/src/main/java/org/esa/s2tbx/s2msi/resampler/S2ResamplingOp.java index 6a2df5943e..eddf2c1c4c 100644 --- a/s2tbx-s2msi-resampler/src/main/java/org/esa/s2tbx/s2msi/resampler/S2ResamplingOp.java +++ b/s2tbx-s2msi-resampler/src/main/java/org/esa/s2tbx/s2msi/resampler/S2ResamplingOp.java @@ -13,6 +13,7 @@ * Created by obarrile on 05/07/2017. */ @OperatorMetadata(alias = "S2Resampling", + label = "S2 Resampling Processor", category = "Optical/Geometric", authors = "Omar Barrilero", version = "1.0", diff --git a/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java b/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java index d69fbc7f0f..cbafe3beeb 100644 --- a/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java +++ b/s2tbx-spectral-angle-mapper/src/main/java/org/esa/s2tbx/mapper/SpectralAngleMapperOp.java @@ -40,6 +40,7 @@ */ @OperatorMetadata( alias = "SpectralAngleMapperOp", + label = "Spectral Angle Mapper Processor", version="1.0", category = "Geometric/Classification/Supervised Classification", description = "Classifies a product using the spectral angle mapper algorithm", From c7f7d0067e9b0d5ab3839ef1672e4d418828989e Mon Sep 17 00:00:00 2001 From: Mandarancio Date: Wed, 18 Dec 2019 17:16:40 +0100 Subject: [PATCH 4/4] missing comma --- .../src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java b/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java index c3d95974ae..06dabe3949 100644 --- a/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java +++ b/s2tbx-grm/src/main/java/org/esa/s2tbx/grm/GenericRegionMergingOp.java @@ -43,7 +43,7 @@ */ @OperatorMetadata( alias = "GenericRegionMergingOp", - label = "Generic region merging processor" + label = "Generic region merging processor", version="1.0", category = "Raster/Segmentation", // "Optical/Thematic Land Processing", description = "The 'Generic Region Merging' operator computes the distinct regions from a product",