Commit 21576409 authored by Julien Michel's avatar Julien Michel

ENH: Revert application logging to its previous state (it has been un-undone by eronous rebase)

parent 28f957d0
......@@ -46,6 +46,7 @@ public:
static Pointer Instance();
itkNewMacro(Self);
// Overwrite this to provide custom formatting of log entries
virtual std::string BuildFormattedEntry(itk::Logger::PriorityLevelType, std::string const&) ITK_OVERRIDE;
......@@ -53,7 +54,6 @@ public:
void LogSetupInformation();
protected:
itkNewMacro(Self);
Logger();
virtual ~Logger() ITK_OVERRIDE;
......
......@@ -101,6 +101,7 @@ public:
m_Name = name;
GetDocExample()->SetApplicationName(name);
this->Modified();
m_Logger->SetName(name);
}
itkGetStringMacro(Name);
......@@ -708,6 +709,9 @@ public:
otb::Logger* GetLogger() const;
/** Sets the logger instance of the application (use with caution) */
void SetLogger(otb::Logger *logger);
itk::ProcessObject* GetProgressSource() const;
std::string GetProgressDescription() const;
......@@ -980,6 +984,7 @@ private:
std::string m_Name;
std::string m_Description;
ParameterGroup::Pointer m_ParameterList;
otb::Logger::Pointer m_Logger;
itk::ProcessObject::Pointer m_ProgressSource;
std::string m_ProgressSourceDescription;
......
......@@ -46,7 +46,6 @@
#include <exception>
#include "itkMacro.h"
namespace otb
{
namespace Wrapper
......@@ -55,6 +54,7 @@ namespace Wrapper
Application::Application()
: m_Name(""),
m_Description(""),
m_Logger(otb::Logger::New()),
m_ProgressSourceDescription(""),
m_DocName(""),
m_DocLongDescription(""),
......@@ -66,7 +66,10 @@ Application::Application()
m_HaveInXML(true),
m_HaveOutXML(true),
m_IsInXMLParsed(false)
{}
{
// Don't call Init from the constructor, since it calls a virtual method !
m_Logger->SetName("Application.logger");
}
Application::~Application()
{
......@@ -74,7 +77,15 @@ Application::~Application()
otb::Logger* Application::GetLogger() const
{
return otb::Logger::Instance();
return m_Logger;
}
void Application::SetLogger(otb::Logger *logger)
{
if (m_Logger != logger)
{
m_Logger = logger;
}
}
std::vector<std::string>
......@@ -1656,6 +1667,11 @@ Application::IsParameterMissing(const std::string &key) const
}
level++;
}
if (ret)
{
// the missing parameter is on an active branch : we need it
otbDebugMacro("MISSING : "<< key << " (Level "<< split.size()<<")");
}
}
return ret;
}
......
......@@ -62,6 +62,8 @@ CompositeApplication
InternalApplication container;
container.App = ApplicationRegistry::CreateApplication(appType);
container.Desc = desc;
// Setup logger
container.App->SetLogger(this->GetLogger());
container.App->AddObserver(AddProcessToWatchEvent(), m_AddProcessCommand.GetPointer());
m_AppContainer[key] = container;
return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment