From ea19c1d3c89fccbbfded28f43e466147a4bddffa Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 29 Aug 2014 17:44:45 +0200
Subject: [PATCH] ENH: rename application VectorDataExtractROIApplication
---
Applications/Utils/CMakeLists.txt | 4 ++--
...OIApplication.cxx => otbVectorDataExtractROI.cxx} | 12 ++++++------
Testing/Applications/Utils/CMakeLists.txt | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
rename Applications/Utils/{otbVectorDataExtractROIApplication.cxx => otbVectorDataExtractROI.cxx} (94%)
diff --git a/Applications/Utils/CMakeLists.txt b/Applications/Utils/CMakeLists.txt
index d2bbbe69fe..929493b6fe 100644
--- a/Applications/Utils/CMakeLists.txt
+++ b/Applications/Utils/CMakeLists.txt
@@ -59,8 +59,8 @@ OTB_CREATE_APPLICATION(NAME VectorDataTransform
SOURCES otbVectorDataTransform.cxx
LINK_LIBRARIES OTBBasicFilters)
-OTB_CREATE_APPLICATION(NAME VectorDataExtractROIApplication
- SOURCES otbVectorDataExtractROIApplication.cxx
+OTB_CREATE_APPLICATION(NAME VectorDataExtractROI
+ SOURCES otbVectorDataExtractROI.cxx
LINK_LIBRARIES OTBBasicFilters)
#OTB_CREATE_APPLICATION(NAME DEMConvert
diff --git a/Applications/Utils/otbVectorDataExtractROIApplication.cxx b/Applications/Utils/otbVectorDataExtractROI.cxx
similarity index 94%
rename from Applications/Utils/otbVectorDataExtractROIApplication.cxx
rename to Applications/Utils/otbVectorDataExtractROI.cxx
index 8fa189834f..73a4d0f1b4 100644
--- a/Applications/Utils/otbVectorDataExtractROIApplication.cxx
+++ b/Applications/Utils/otbVectorDataExtractROI.cxx
@@ -35,11 +35,11 @@ namespace otb
namespace Wrapper
{
-class VectorDataExtractROIApplication : public Application
+class VectorDataExtractROI : public Application
{
public:
/** Standard class typedefs. */
- typedef VectorDataExtractROIApplication Self;
+ typedef VectorDataExtractROI Self;
typedef Application Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -47,7 +47,7 @@ public:
/** Standard macro */
itkNewMacro(Self);
- itkTypeMacro(VectorDataExtractROIApplication, otb::Application);
+ itkTypeMacro(VectorDataExtractROI, otb::Application);
/** Filters typedef */
// Images
@@ -59,7 +59,7 @@ public:
typedef VectorDataProjectionFilter<
VectorDataType, VectorDataType> VectorDataProjectionFilterType;
- typedef VectorDataExtractROI<VectorDataType> VectorDataExtractROIType;
+ typedef otb::VectorDataExtractROI<VectorDataType> VectorDataExtractROIType;
// Misc
typedef otb::RemoteSensingRegion<double> RemoteSensingRegionType;
@@ -67,7 +67,7 @@ public:
private:
void DoInit()
{
- SetName("VectorDataExtractROIApplication");
+ SetName("VectorDataExtractROI");
SetDescription("Perform an extract ROI on the input vector data according to the input image extent");
SetDocName("VectorData Extract ROI");
@@ -173,4 +173,4 @@ private:
}
}
-OTB_APPLICATION_EXPORT(otb::Wrapper::VectorDataExtractROIApplication)
+OTB_APPLICATION_EXPORT(otb::Wrapper::VectorDataExtractROI)
diff --git a/Testing/Applications/Utils/CMakeLists.txt b/Testing/Applications/Utils/CMakeLists.txt
index 2301c68cd7..c2afb59fbb 100644
--- a/Testing/Applications/Utils/CMakeLists.txt
+++ b/Testing/Applications/Utils/CMakeLists.txt
@@ -237,9 +237,9 @@ OTB_TEST_APPLICATION(NAME apTvUtVectorDataTransform_Translation_Rotation
${OTBAPP_BASELINE_FILES}/utTvVectorDataTransformFilter_Translation_rotation.shp
${TEMP}/apTvUtVectorDataTransform_Translation_rotation.shp)
-#--- VectorDataExtractROIApplication ---
-OTB_TEST_APPLICATION(NAME apTvUtVectorDataExtractROIApplication
- APP VectorDataExtractROIApplication
+#--- VectorDataExtractROI ---
+OTB_TEST_APPLICATION(NAME apTvUtVectorDataExtractROI
+ APP VectorDataExtractROI
OPTIONS -io.in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif
-io.vd ${OTB_DATA_LARGEINPUT_ROOT}/VECTOR/MidiPyrenees/roads.shp
-io.out ${TEMP}/apTvUtVectorDataExtractROIApplicationTest.shp
--
GitLab