Mercurial > hg > orthanc
diff OrthancServer/ServerContext.h @ 1434:f9cd40166269
refactoring of OrthancPlugins, improvement in ServeFolders
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 30 Jun 2015 16:04:05 +0200 |
parents | 461e7554bff7 |
children | 0a3e3be59094 |
line wrap: on
line diff
--- a/OrthancServer/ServerContext.h Tue Jun 30 15:09:34 2015 +0200 +++ b/OrthancServer/ServerContext.h Tue Jun 30 16:04:05 2015 +0200 @@ -39,7 +39,6 @@ #include "../Core/Lua/LuaContext.h" #include "../Core/RestApi/RestApiOutput.h" #include "../Plugins/Engine/OrthancPlugins.h" -#include "../Plugins/Engine/PluginsManager.h" #include "DicomInstanceToStore.h" #include "DicomProtocol/ReusableDicomUserConnection.h" #include "IServerListener.h" @@ -114,7 +113,6 @@ LuaScripting lua_; OrthancPlugins* plugins_; ServerListeners listeners_; - const PluginsManager* pluginsManager_; SharedArchive queryRetrieveArchive_; std::string defaultLocalAet_; @@ -199,36 +197,12 @@ return scheduler_; } - void SetOrthancPlugins(const PluginsManager& manager, - OrthancPlugins& plugins) - { - pluginsManager_ = &manager; - plugins_ = &plugins; - listeners_.clear(); - listeners_.push_back(ServerListener(lua_, "Lua")); // TODO REFACTOR THIS - listeners_.push_back(ServerListener(plugins, "plugin")); // TODO REFACTOR THIS - } - - void ResetOrthancPlugins() - { - pluginsManager_ = NULL; - plugins_ = NULL; - listeners_.clear(); - listeners_.push_back(ServerListener(lua_, "Lua")); // TODO REFACTOR THIS - } - bool DeleteResource(Json::Value& target, const std::string& uuid, ResourceType expectedType); void SignalChange(const ServerIndexChange& change); - bool HasPlugins() const; - - const PluginsManager& GetPluginsManager() const; - - const OrthancPlugins& GetOrthancPlugins() const; - SharedArchive& GetQueryRetrieveArchive() { return queryRetrieveArchive_; @@ -243,5 +217,19 @@ { return lua_; } + + + /** + * Management of the plugins + **/ + + void SetPlugins(OrthancPlugins& plugins); + + void ResetPlugins(); + + bool HasPlugins() const; + + const OrthancPlugins& GetPlugins() const; + }; }