From 686b98fae8471e140bbb8b892227c4d33a1bdce2 Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Tue, 27 Sep 2011 15:49:57 +0200
Subject: [PATCH] ENH: remove methods not used anymore
---
Applications/Util/otbConcatenateImages.cxx | 1 -
.../otbWrapperApplication.cxx | 31 ----------------
.../ApplicationEngine/otbWrapperApplication.h | 36 -------------------
3 files changed, 68 deletions(-)
diff --git a/Applications/Util/otbConcatenateImages.cxx b/Applications/Util/otbConcatenateImages.cxx
index 7f12f375db..b5f6c09c7c 100644
--- a/Applications/Util/otbConcatenateImages.cxx
+++ b/Applications/Util/otbConcatenateImages.cxx
@@ -81,7 +81,6 @@ private:
m_Concatener = ListConcatenerFilterType::New();
m_ImageList = FloatImageListType::New();
m_ExtractorList = ExtractROIFilterListType::New();
- this->ClearInternalProcessList();
}
void DoExecute()
diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Code/ApplicationEngine/otbWrapperApplication.cxx
index ea504ff5bd..bc4dd6c544 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplication.cxx
@@ -45,9 +45,6 @@ namespace Wrapper
Application::Application()
: m_Name(""),
m_Description(""),
- m_CurrentProcess(),
- m_InternalProcessList(),
- m_InternalProcessListName(),
m_WroteOutput(0),
m_Logger(itk::Logger::New())
{
@@ -99,7 +96,6 @@ const Parameter* Application::GetParameterByKey(std::string name) const
void Application::Init()
{
m_ParameterList = ParameterGroup::New();
- m_CurrentProcess = NULL;
this->DoCreateParameters();
}
@@ -128,7 +124,6 @@ void Application::ExecuteAndWriteOutput()
Parameter* param = GetParameterByKey(*it);
OutputImageParameter* outputParam = dynamic_cast<OutputImageParameter*>(param);
outputParam->InitializeWriters();
- m_CurrentProcess = outputParam->GetWriter();
AddProcess(outputParam->GetWriter(),"Writer ");
outputParam->Write();
m_WroteOutput++;
@@ -722,32 +717,6 @@ Application::AddParameter(ParameterType type, std::string paramKey, std::string
GetParameterList()->AddParameter(type, paramKey, paramName);
}
-
-double
-Application::GetExecuteProgress()
-{
- double res = -1;
- if ( m_CurrentProcess.IsNotNull() )
- {
- res = m_CurrentProcess->GetProgress();
- }
-
- return res;
-}
-
-
-std::vector<double>
-Application::GetDoExecuteProgress()
-{
- std::vector<double> res;
- for(unsigned int i=0; i<m_InternalProcessList.size(); i++)
- {
- res.push_back(m_InternalProcessList[i]->GetProgress());
- }
-
- return res;
-}
-
bool
Application::IsApplicationReady()
{
diff --git a/Code/ApplicationEngine/otbWrapperApplication.h b/Code/ApplicationEngine/otbWrapperApplication.h
index 05035adbbc..b9de197113 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.h
+++ b/Code/ApplicationEngine/otbWrapperApplication.h
@@ -318,39 +318,6 @@ public:
*/
std::vector<std::string> GetParametersKeys(bool recursive = true);
- virtual double GetExecuteProgress();
- virtual std::vector<double> GetDoExecuteProgress();
-
- std::vector<itk::ProcessObject *> GetInternalProcessList(){
- return m_InternalProcessList;
- }
-
- void SetInternalProcessList( std::vector<itk::ProcessObject *> lList ){
- m_InternalProcessList = lList;
- this->Modified();
- }
-
- std::vector<std::string> GetInternalProcessListName(){
- return m_InternalProcessListName;
- }
-
- void SetInternalProcessListName( std::vector<std::string> lList ){
- m_InternalProcessListName = lList;
- this->Modified();
- }
-
- void AddInternalProcess( itk::ProcessObject * lProcess, const std::string & name ){
- m_InternalProcessList.push_back( lProcess );
- m_InternalProcessListName.push_back( name );
- this->Modified();
- }
-
- void ClearInternalProcessList( ){
- m_InternalProcessList.clear();
- m_InternalProcessListName.clear();
- this->Modified();
- }
-
itk::Logger* GetLogger();
void AddProcess(itk::ProcessObject* object, std::string description);
@@ -401,9 +368,6 @@ private:
std::string m_Name;
std::string m_Description;
ParameterGroup::Pointer m_ParameterList;
- itk::ProcessObject::Pointer m_CurrentProcess;
- std::vector<itk::ProcessObject *> m_InternalProcessList;
- std::vector<std::string> m_InternalProcessListName;
unsigned int m_WroteOutput;
itk::Logger::Pointer m_Logger;
--
GitLab