From 1cd8defa72b2fd6d4fb83353e1700211735f0e52 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Fri, 16 Sep 2011 10:51:03 +0200
Subject: [PATCH] COMP: remove output image list completely
---
.../otbWrapperCommandLineLauncher.cxx | 7 +--
.../otbWrapperCommandLineParser.cxx | 21 +------
Testing/Code/ApplicationEngine/CMakeLists.txt | 1 -
.../ApplicationEngine/otbWrapperCoreTests.cxx | 2 -
...otbWrapperOutputImageListParameterTest.cxx | 61 -------------------
5 files changed, 3 insertions(+), 89 deletions(-)
delete mode 100644 Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index c2ab458966..852ba28ec0 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -31,7 +31,6 @@
#include "otbWrapperRadiusParameter.h"
#include "otbWrapperStringParameter.h"
// List value parameter
-#include "otbWrapperOutputImageListParameter.h"
#include "otbWrapperInputImageListParameter.h"
#include "otbWrapperStringListParameter.h"
@@ -49,7 +48,7 @@ namespace otb
namespace Wrapper
{
- CommandLineLauncher::CommandLineLauncher() : m_Expression(""), m_FilterWatcherList(), m_WriterWatcherList()
+CommandLineLauncher::CommandLineLauncher() : m_Expression(""), m_FilterWatcherList(), m_WriterWatcherList()
{
m_Application = NULL;
m_Parser = CommandLineParser::New();
@@ -295,10 +294,6 @@ CommandLineLauncher::LoadParameters()
{
dynamic_cast<InputImageListParameter *>(param.GetPointer())->SetListFromFileName( values );
}
- else if( type == ParameterType_OutputImageList )
- {
- dynamic_cast<OutputImageListParameter *>(param.GetPointer())->SetFileNameList( values );
- }
else if( type == ParameterType_StringList )
{
dynamic_cast<StringListParameter *>(param.GetPointer())->SetValue( values );
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
index 8aef8c7460..a09c6dc959 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
@@ -17,28 +17,11 @@
=========================================================================*/
#include "otbWrapperCommandLineParser.h"
-// Single value parameter
-#include "otbWrapperChoiceParameter.h"
-#include "otbWrapperDirectoryParameter.h"
-#include "otbWrapperEmptyParameter.h"
-#include "otbWrapperFilenameParameter.h"
-#include "otbWrapperInputComplexImageParameter.h"
-#include "otbWrapperInputImageParameter.h"
-#include "otbWrapperInputVectorDataParameter.h"
-#include "otbWrapperNumericalParameter.h"
-#include "otbWrapperOutputImageParameter.h"
-#include "otbWrapperOutputVectorDataParameter.h"
-#include "otbWrapperRadiusParameter.h"
-#include "otbWrapperStringParameter.h"
-// List value parameter
-#include "otbWrapperOutputImageListParameter.h"
-#include "otbWrapperInputImageListParameter.h"
-#include "otbWrapperStringListParameter.h"
-//#include "otbWrapperParameterGroup.h"
-
#include "otbWrapperApplicationRegistry.h"
#include "otbWrapperApplication.h"
+
+#include <itksys/SystemTools.hxx>
#include <itksys/RegularExpression.hxx>
#include <string>
#include <iostream>
diff --git a/Testing/Code/ApplicationEngine/CMakeLists.txt b/Testing/Code/ApplicationEngine/CMakeLists.txt
index 675779c6b9..3c514c85a1 100644
--- a/Testing/Code/ApplicationEngine/CMakeLists.txt
+++ b/Testing/Code/ApplicationEngine/CMakeLists.txt
@@ -152,7 +152,6 @@ otbWrapperInputImageParameterTest.cxx
otbWrapperInputVectorDataParameterTest.cxx
otbWrapperInputImageListParameterTest.cxx
otbWrapperOutputImageParameterTest.cxx
-otbWrapperOutputImageListParameterTest.cxx
otbWrapperNumericalParameterTest.cxx
otbWrapperParameterListTest.cxx
otbWrapperParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx b/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
index 1e236dd25d..a21fa78eb6 100644
--- a/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
+++ b/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
@@ -41,8 +41,6 @@ void RegisterTests()
REGISTER_TEST(otbWrapperInputVectorDataParameterNew);
REGISTER_TEST(otbWrapperOutputImageParameterNew);
REGISTER_TEST(otbWrapperOutputImageParameterTest1);
- REGISTER_TEST(otbWrapperOutputImageListParameterNew);
- REGISTER_TEST(otbWrapperOutputImageListParameterTest1);
REGISTER_TEST(otbWrapperStringParameterNew);
REGISTER_TEST(otbWrapperStringParameterTest1);
REGISTER_TEST(otbWrapperStringListParameterNew);
diff --git a/Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx
deleted file mode 100644
index 12b00bc3cd..0000000000
--- a/Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*=========================================================================
-
- Program: ORFEO Toolbox
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "otbWrapperOutputImageListParameter.h"
-#include "otbImageFileReader.h"
-#include "otbWrapperTypes.h"
-
-int otbWrapperOutputImageListParameterNew(int argc, char* argv[])
-{
- typedef otb::Wrapper::OutputImageListParameter ParameterType;
- ParameterType::Pointer parameter = ParameterType::New();
-
- return EXIT_SUCCESS;
-}
-
-
-int otbWrapperOutputImageListParameterTest1(int argc, char* argv[])
-{
- typedef otb::Wrapper::OutputImageListParameter ParameterType;
- ParameterType::Pointer param = ParameterType::New();
-
- typedef otb::ImageFileReader< otb::Wrapper::FloatVectorImageType > ReaderType;
-
- ReaderType::Pointer reader1 = ReaderType::New();
- ReaderType::Pointer reader2 = ReaderType::New();
-
- reader1->SetFileName( argv[1] );
- reader2->SetFileName( argv[2] );
- reader1->UpdateOutputInformation();
- reader2->UpdateOutputInformation();
-
- param->AddImage(reader1->GetOutput());
- param->AddImage(reader2->GetOutput());
- param->AddFileName( argv[3] );
- param->AddFileName( argv[4] );
-
- param->SetKey(argv[5]);
- param->SetDescription(argv[6]);
-
- param->Write();
-
- return EXIT_SUCCESS;
-}
--
GitLab