diff --git a/Applications/Util/otbConcatenateImages.cxx b/Applications/Util/otbConcatenateImages.cxx index 7f12f375dbeb4ab9ecd793e4e5501be8c61e924b..b5f6c09c7cb6ca0b9c6993a9321bc2cf6c9b3636 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 ea504ff5bd2721fe28bd3b40651b777a99f73168..bc4dd6c54450331053566416c3c889f54065c699 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 05035adbbc9d2b8e93de624fdf61f25f2274eddc..b9de197113eb2ad45835e7cb2830e8eb882b398e 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;