From c6d4b43e46af4b749cebd097a30a0e4e6ede2626 Mon Sep 17 00:00:00 2001
From: Manuel Grizonnet <manuel.grizonnet@orfeo-toolbox.org>
Date: Fri, 25 Nov 2011 16:03:24 +0100
Subject: [PATCH] ENH:move ConnectedComponentSegmentation application in
Segmentation directory
---
Applications/CMakeLists.txt | 1 -
.../CMakeLists.txt | 4 ---
Applications/Segmentation/CMakeLists.txt | 4 +++
.../otbConnectedComponentSegmentation.cxx | 0
Testing/Applications/CMakeLists.txt | 1 -
.../CMakeLists.txt | 24 -----------------
.../Applications/Segmentation/CMakeLists.txt | 26 ++++++++++++++++++-
7 files changed, 29 insertions(+), 31 deletions(-)
delete mode 100644 Applications/ConnectedComponentSegmentation/CMakeLists.txt
rename Applications/{ConnectedComponentSegmentation => Segmentation}/otbConnectedComponentSegmentation.cxx (100%)
delete mode 100644 Testing/Applications/ConnectedComponentSegmentation/CMakeLists.txt
diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index 0811420f0e..8680c4545e 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -7,7 +7,6 @@ set(OTB_APPLICATIONS_NAME_LIST "" CACHE STRING "List of all applications name" F
add_subdirectory(CartographicDBValidation)
add_subdirectory(ChangeDetection)
add_subdirectory(Classification)
-add_subdirectory(ConnectedComponentSegmentation)
add_subdirectory(DimensionnalityReduction)
add_subdirectory(DisparityMap)
add_subdirectory(FeatureExtraction)
diff --git a/Applications/ConnectedComponentSegmentation/CMakeLists.txt b/Applications/ConnectedComponentSegmentation/CMakeLists.txt
deleted file mode 100644
index a3c802e2c5..0000000000
--- a/Applications/ConnectedComponentSegmentation/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-OTB_CREATE_APPLICATION(NAME ConnectedComponentSegmentation
- SOURCES otbConnectedComponentSegmentation.cxx
- LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Applications/Segmentation/CMakeLists.txt b/Applications/Segmentation/CMakeLists.txt
index 7e8c199de2..4bd811dc2a 100644
--- a/Applications/Segmentation/CMakeLists.txt
+++ b/Applications/Segmentation/CMakeLists.txt
@@ -2,3 +2,7 @@
OTB_CREATE_APPLICATION(NAME MeanShiftSegmentation
SOURCES otbMeanShiftSegmentation.cxx
LINK_LIBRARIES OTBBasicFilters)
+
+OTB_CREATE_APPLICATION(NAME ConnectedComponentSegmentation
+ SOURCES otbConnectedComponentSegmentation.cxx
+ LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Applications/ConnectedComponentSegmentation/otbConnectedComponentSegmentation.cxx b/Applications/Segmentation/otbConnectedComponentSegmentation.cxx
similarity index 100%
rename from Applications/ConnectedComponentSegmentation/otbConnectedComponentSegmentation.cxx
rename to Applications/Segmentation/otbConnectedComponentSegmentation.cxx
diff --git a/Testing/Applications/CMakeLists.txt b/Testing/Applications/CMakeLists.txt
index a1d631f9ef..ed3f3bdebc 100644
--- a/Testing/Applications/CMakeLists.txt
+++ b/Testing/Applications/CMakeLists.txt
@@ -50,7 +50,6 @@ endforeach(app)
add_subdirectory(CartographicDBValidation)
add_subdirectory(ChangeDetection)
add_subdirectory(Classification)
-add_subdirectory(ConnectedComponentSegmentation)
add_subdirectory(DimensionnalityReduction)
add_subdirectory(DisparityMap)
add_subdirectory(FeatureExtraction)
diff --git a/Testing/Applications/ConnectedComponentSegmentation/CMakeLists.txt b/Testing/Applications/ConnectedComponentSegmentation/CMakeLists.txt
deleted file mode 100644
index 430b637b56..0000000000
--- a/Testing/Applications/ConnectedComponentSegmentation/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-#--- ConnectedComponentSegmentation ---#
-
-OTB_TEST_APPLICATION(NAME apTvCcConnectedComponentSegmentationMaskMuParserShp
- APP ConnectedComponentSegmentation
- OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
- --out ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
- --mask "((b1>80)*intensity>95)"
- --expr "distance<10"
- --minsize 15
- --obia "SHAPE_Elongation>8"
- VALID --compare-ogr ${NOTOL}
- ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
- ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp)
-
-OTB_TEST_APPLICATION(NAME apTvCcConnectedComponentSegmentatioNoMask
- APP ConnectedComponentSegmentation
- OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
- --out ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp
- --expr "distance<10"
- --minsize 15
- --obia "SHAPE_Elongation>8"
- VALID --compare-ogr ${NOTOL}
- ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationNoMask.shp
- ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp)
diff --git a/Testing/Applications/Segmentation/CMakeLists.txt b/Testing/Applications/Segmentation/CMakeLists.txt
index e8a0c3f9ae..b60332da0b 100644
--- a/Testing/Applications/Segmentation/CMakeLists.txt
+++ b/Testing/Applications/Segmentation/CMakeLists.txt
@@ -20,4 +20,28 @@ OTB_TEST_APPLICATION(NAME apTvSeMeanShift
${TEMP}/apTvSeMeanShift_LabeledClusteredOutput.tif
${BASELINE}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
${TEMP}/apTvSeMeanShift_ClusterBoundariesOutput.tif)
-
\ No newline at end of file
+
+#--- ConnectedComponentSegmentation ---#
+
+OTB_TEST_APPLICATION(NAME apTvCcConnectedComponentSegmentationMaskMuParserShp
+ APP ConnectedComponentSegmentation
+ OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
+ --out ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
+ --mask "((b1>80)*intensity>95)"
+ --expr "distance<10"
+ --minsize 15
+ --obia "SHAPE_Elongation>8"
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
+ ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp)
+
+OTB_TEST_APPLICATION(NAME apTvCcConnectedComponentSegmentatioNoMask
+ APP ConnectedComponentSegmentation
+ OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
+ --out ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp
+ --expr "distance<10"
+ --minsize 15
+ --obia "SHAPE_Elongation>8"
+ VALID --compare-ogr ${NOTOL}
+ ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationNoMask.shp
+ ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp)
--
GitLab