Mercurial > hg > orthanc
comparison OrthancServer/ServerContext.h @ 1444:b2b09a3dbd8e
refactoring: OrthancHttpHandler inside OrthancServer
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 01 Jul 2015 12:09:58 +0200 |
parents | 0a3e3be59094 |
children | 5ba7471780ae |
comparison
equal
deleted
inserted
replaced
1443:895ab369d63c | 1444:b2b09a3dbd8e |
---|---|
45 #include "IServerListener.h" | 45 #include "IServerListener.h" |
46 #include "LuaScripting.h" | 46 #include "LuaScripting.h" |
47 #include "ParsedDicomFile.h" | 47 #include "ParsedDicomFile.h" |
48 #include "Scheduler/ServerScheduler.h" | 48 #include "Scheduler/ServerScheduler.h" |
49 #include "ServerIndex.h" | 49 #include "ServerIndex.h" |
50 #include "OrthancHttpHandler.h" | |
50 | 51 |
51 #include <boost/filesystem.hpp> | 52 #include <boost/filesystem.hpp> |
52 #include <boost/thread.hpp> | 53 #include <boost/thread.hpp> |
53 | 54 |
54 | 55 |
124 SharedMessageQueue pendingChanges_; | 125 SharedMessageQueue pendingChanges_; |
125 boost::thread changeThread_; | 126 boost::thread changeThread_; |
126 | 127 |
127 SharedArchive queryRetrieveArchive_; | 128 SharedArchive queryRetrieveArchive_; |
128 std::string defaultLocalAet_; | 129 std::string defaultLocalAet_; |
130 OrthancHttpHandler httpHandler_; | |
129 | 131 |
130 public: | 132 public: |
131 class DicomCacheLocker : public boost::noncopyable | 133 class DicomCacheLocker : public boost::noncopyable |
132 { | 134 { |
133 private: | 135 private: |
228 LuaScripting& GetLua() | 230 LuaScripting& GetLua() |
229 { | 231 { |
230 return lua_; | 232 return lua_; |
231 } | 233 } |
232 | 234 |
235 OrthancHttpHandler& GetHttpHandler() | |
236 { | |
237 return httpHandler_; | |
238 } | |
239 | |
233 | 240 |
234 /** | 241 /** |
235 * Management of the plugins | 242 * Management of the plugins |
236 **/ | 243 **/ |
237 | 244 |