From 980c9e92c0fe08e4c416872272721b5ef727a274 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Fri, 25 Nov 2011 17:39:44 +0100
Subject: [PATCH] ENH: Moving and renaming
Classification/otbLabeledImageColorMapping to Utils/otbColorMapping since it
now gathers the three color mapping algorithms from OTB
---
Applications/Classification/CMakeLists.txt | 7 +------
Applications/Utils/CMakeLists.txt | 4 ++++
.../otbColorMapping.cxx} | 14 +++++++-------
Testing/Applications/Classification/CMakeLists.txt | 7 ++++---
4 files changed, 16 insertions(+), 16 deletions(-)
rename Applications/{Classification/otbLabeledImageColorMapping.cxx => Utils/otbColorMapping.cxx} (95%)
diff --git a/Applications/Classification/CMakeLists.txt b/Applications/Classification/CMakeLists.txt
index 06dd84ead9..c28f731878 100644
--- a/Applications/Classification/CMakeLists.txt
+++ b/Applications/Classification/CMakeLists.txt
@@ -16,9 +16,4 @@ OTB_CREATE_APPLICATION(NAME TrainSVMImagesClassifier
OTB_CREATE_APPLICATION(NAME ValidateSVMImagesClassifier
SOURCES otbValidateSVMImagesClassifier.cxx
- LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters;OTBFeatureExtraction;OTBLearning)
-
-OTB_CREATE_APPLICATION(NAME LabeledImageColorMapping
- SOURCES otbLabeledImageColorMapping.cxx
- LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters;OTBFeatureExtraction)
-
\ No newline at end of file
+ LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters;OTBFeatureExtraction;OTBLearning)
diff --git a/Applications/Utils/CMakeLists.txt b/Applications/Utils/CMakeLists.txt
index bbbcc3edc4..dba960e948 100644
--- a/Applications/Utils/CMakeLists.txt
+++ b/Applications/Utils/CMakeLists.txt
@@ -70,3 +70,7 @@ OTB_CREATE_APPLICATION(NAME DEMConvert
OTB_CREATE_APPLICATION(NAME Quicklook
SOURCES otbQuicklook.cxx
LINK_LIBRARIES OTBBasicFilters)
+
+OTB_CREATE_APPLICATION(NAME ColorMapping
+ SOURCES otbColorMapping.cxx
+ LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters;OTBFeatureExtraction)
diff --git a/Applications/Classification/otbLabeledImageColorMapping.cxx b/Applications/Utils/otbColorMapping.cxx
similarity index 95%
rename from Applications/Classification/otbLabeledImageColorMapping.cxx
rename to Applications/Utils/otbColorMapping.cxx
index 5bda8f1c8a..0ee838c259 100644
--- a/Applications/Classification/otbLabeledImageColorMapping.cxx
+++ b/Applications/Utils/otbColorMapping.cxx
@@ -32,11 +32,11 @@ namespace otb
namespace Wrapper
{
-class LabeledImageColorMapping: public Application
+class ColorMapping: public Application
{
public:
/** Standard class typedefs. */
- typedef LabeledImageColorMapping Self;
+ typedef ColorMapping Self;
typedef Application Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -44,7 +44,7 @@ public:
/** Standard macro */
itkNewMacro(Self);
- itkTypeMacro(LabeledImageColorMapping, otb::Application);
+ itkTypeMacro(ColorMapping, otb::Application);
typedef FloatImageType::PixelType PixelType;
typedef UInt16ImageType LabelImageType;
@@ -69,7 +69,7 @@ public:
<PixelType, RGBPixelType> ReliefColorMapFunctorType;
private:
- LabeledImageColorMapping()
+ ColorMapping()
{
SetName("ColorMapping");
SetDescription("Maps an input grayscale image into 8-bits RGB using look-up tables.");
@@ -79,7 +79,7 @@ private:
SetDocLimitations("None");
SetDocAuthors("OTB-Team");
SetDocSeeAlso(" ");
- SetDocCLExample("otbApplicationLauncherCommandLine LabeledImageColorMapping --in ${OTBAPP_BASELINE}/clLabeledImageQB123_1.tif --ct ${OTB-Data}/Input/Classification/ColorTable.txt --out clLabeledFancyImageQB123_1.tif");
+ SetDocCLExample("otbApplicationLauncherCommandLine ColorMapping --in ${OTBAPP_BASELINE}/clLabeledImageQB123_1.tif --ct ${OTB-Data}/Input/Classification/ColorTable.txt --out clLabeledFancyImageQB123_1.tif");
AddDocTag(Tags::Learning);
// Build lut map
@@ -100,7 +100,7 @@ private:
m_LutMap["OverUnder"]=ColorMapFilterType::OverUnder;
}
- virtual ~LabeledImageColorMapping()
+ virtual ~ColorMapping()
{
}
@@ -274,6 +274,6 @@ private:
}
}
-OTB_APPLICATION_EXPORT(otb::Wrapper::LabeledImageColorMapping)
+OTB_APPLICATION_EXPORT(otb::Wrapper::ColorMapping)
diff --git a/Testing/Applications/Classification/CMakeLists.txt b/Testing/Applications/Classification/CMakeLists.txt
index 43f6b43b0a..c5f11eaac8 100644
--- a/Testing/Applications/Classification/CMakeLists.txt
+++ b/Testing/Applications/Classification/CMakeLists.txt
@@ -155,9 +155,10 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB123_1 PROPERTIES DEPENDS apTvClTr
OTB_TEST_APPLICATION(NAME apTvClLabeledImageColorMappingQB123_1
- APP LabeledImageColorMapping
- OPTIONS --in ${TEMP}/clLabeledImageQB123_1.tif
- --ct ${INPUTDATA}/Classification/ColorTable.txt
+ APP ColorMapping
+ OPTIONS --in ${TEMP}/clLabeledImageQB123_1.tif
+ --method custom
+ --method.custom.lut ${INPUTDATA}/Classification/ColorTable.txt
--out ${TEMP}/clLabeledFancyImageQB123_1.tif
VALID --compare-image ${NOTOL}
${OTBAPP_BASELINE}/clLabeledFancyImageQB123_1.tif
--
GitLab