From 9404203f26304d8894da1de953cf6fb6ad03eb6d Mon Sep 17 00:00:00 2001
From: Pierre Lassalle <lassallep@cesbio.cnes.fr>
Date: Fri, 31 Jul 2015 12:19:20 +0200
Subject: [PATCH] Remove LabelImageWriter
---
CMakeLists.txt | 4 ----
app/GenericRegionMerging.cxx | 23 ++++-------------------
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca66fd6..0edcba3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,6 @@ else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
endif()
-#set(GRM_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
-
-#include_directories(${GRM_INCLUDE_DIR})
-
project(OTBGRM)
set(OTBGRM_LIBRARIES OTBGRM)
diff --git a/app/GenericRegionMerging.cxx b/app/GenericRegionMerging.cxx
index 804968b..f73cf08 100644
--- a/app/GenericRegionMerging.cxx
+++ b/app/GenericRegionMerging.cxx
@@ -34,6 +34,7 @@ namespace otb
{
public:
typedef GenericRegionMerging Self;
+ typedef Application SuperClass;
typedef itk::SmartPointer<Self> Pointer;
typedef FloatVectorImageType ImageType;
@@ -83,15 +84,11 @@ namespace otb
void DoExecute()
{
-
// Mandatory parameters
// Input Image
ImageType::Pointer image = GetParameterImage("in");
image->Update();
- // Output label file name.
- const std::string labelImageFileName = GetParameterString("out");
-
// Criterion selected
const std::string selectedCriterion = GetParameterString("criterion");
@@ -101,8 +98,6 @@ namespace otb
const unsigned int niter = GetParameterInt("niter");
const int speed = GetParameterInt("speed");
- typedef otb::ImageFileWriter<LabelImageType> LabelImageWriter;
-
if(selectedCriterion == "bs")
{
const float cw = GetParameterFloat("cw");
@@ -125,11 +120,7 @@ namespace otb
segmenter.Update();
-
- LabelImageWriter::Pointer labelWriter = LabelImageWriter::New();
- labelWriter->SetFileName(labelImageFileName);
- labelWriter->SetInput(segmenter.GetLabeledClusteredOutput());
- labelWriter->Update();
+ SetParameterOutputImage<LabelImageType>("out", segmenter.GetLabeledClusteredOutput());
}
else if(selectedCriterion == "ed")
{
@@ -144,10 +135,7 @@ namespace otb
segmenter.Update();
- LabelImageWriter::Pointer labelWriter = LabelImageWriter::New();
- labelWriter->SetFileName(labelImageFileName);
- labelWriter->SetInput(segmenter.GetLabeledClusteredOutput());
- labelWriter->Update();
+ SetParameterOutputImage<LabelImageType>("out", segmenter.GetLabeledClusteredOutput());
}
else if(selectedCriterion == "fls")
{
@@ -162,10 +150,7 @@ namespace otb
segmenter.Update();
- LabelImageWriter::Pointer labelWriter = LabelImageWriter::New();
- labelWriter->SetFileName(labelImageFileName);
- labelWriter->SetInput(segmenter.GetLabeledClusteredOutput());
- labelWriter->Update();
+ SetParameterOutputImage<LabelImageType>("out", segmenter.GetLabeledClusteredOutput());
}
}
};
--
GitLab