Mercurial > hg > orthanc-webviewer
annotate Plugin/Plugin.cpp @ 321:705be6d59d9b default tip
fix build on tumbleweed
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 11 Jun 2024 12:57:30 +0200 |
| parents | 553fa466835a |
| children |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 122 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
| 0 | 4 * Department, University Hospital of Liege, Belgium |
|
320
553fa466835a
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
316
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
553fa466835a
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
316
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
|
314
0a1ad7492050
update year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
303
diff
changeset
|
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 0 | 8 * |
| 9 * This program is free software: you can redistribute it and/or | |
| 10 * modify it under the terms of the GNU Affero General Public License | |
| 11 * as published by the Free Software Foundation, either version 3 of | |
| 12 * the License, or (at your option) any later version. | |
| 13 * | |
| 14 * This program is distributed in the hope that it will be useful, but | |
| 15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 17 * Affero General Public License for more details. | |
| 18 * | |
| 19 * You should have received a copy of the GNU Affero General Public License | |
| 20 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 21 **/ | |
| 22 | |
| 23 | |
|
275
3a9749b1dfce
link against system-wide Orthanc Framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
271
diff
changeset
|
24 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" |
|
191
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
25 #include "ViewerToolbox.h" |
|
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
26 #include "ViewerPrefetchPolicy.h" |
|
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
27 #include "DecodedImageAdapter.h" |
|
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
28 #include "SeriesInformationAdapter.h" |
|
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
29 |
|
266
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
30 #include <DicomFormat/DicomMap.h> |
| 287 | 31 #include <Logging.h> |
|
266
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
32 #include <OrthancException.h> |
|
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
33 #include <SystemToolbox.h> |
|
4e9d30c19b4b
linking against orthanc framework library
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
265
diff
changeset
|
34 #include <Toolbox.h> |
|
191
993dd140bd30
Resort to Orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
174
diff
changeset
|
35 |
| 0 | 36 #include <boost/thread.hpp> |
| 37 #include <boost/lexical_cast.hpp> | |
| 38 #include <EmbeddedResources.h> | |
|
4
ecefd45026bf
configuration of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
39 #include <boost/filesystem.hpp> |
| 0 | 40 |
|
315
05bf4ccfdca9
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
41 #define ORTHANC_PLUGIN_NAME "web-viewer" |
|
05bf4ccfdca9
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
42 |
| 0 | 43 |
|
228
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
44 /** |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
45 * We force the redefinition of the "ORTHANC_PLUGINS_API" macro, that |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
46 * was left empty with gcc until Orthanc SDK 1.5.7 (no "default" |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
47 * visibility). This causes the version script, if run from "Holy |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
48 * Build Box", to make private the 4 global functions of the plugin. |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
49 **/ |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
50 |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
51 #undef ORTHANC_PLUGINS_API |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
52 |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
53 #ifdef WIN32 |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
54 # define ORTHANC_PLUGINS_API __declspec(dllexport) |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
55 #elif __GNUC__ >= 4 |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
56 # define ORTHANC_PLUGINS_API __attribute__ ((visibility ("default"))) |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
57 #else |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
58 # define ORTHANC_PLUGINS_API |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
59 #endif |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
60 |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
61 |
|
0f9d183f685d
fix compilation with Holy Build Box (for LSB)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
227
diff
changeset
|
62 |
| 0 | 63 class CacheContext |
| 64 { | |
| 65 private: | |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
66 class DynamicString : public Orthanc::IDynamicObject |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
67 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
68 private: |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
69 std::string value_; |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
70 |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
71 public: |
| 197 | 72 explicit DynamicString(const char* value) : value_(value) |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
73 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
74 } |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
75 |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
76 const std::string& GetValue() const |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
77 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
78 return value_; |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
79 } |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
80 }; |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
81 |
| 58 | 82 Orthanc::FilesystemStorage storage_; |
| 83 Orthanc::SQLite::Connection db_; | |
| 84 | |
|
227
e4def26f0fd3
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
85 std::unique_ptr<OrthancPlugins::CacheManager> cache_; |
|
e4def26f0fd3
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
86 std::unique_ptr<OrthancPlugins::CacheScheduler> scheduler_; |
| 0 | 87 |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
88 Orthanc::SharedMessageQueue newInstances_; |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
89 bool stop_; |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
90 boost::thread newInstancesThread_; |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
91 |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
92 static void NewInstancesThread(CacheContext* cache) |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
93 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
94 while (!cache->stop_) |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
95 { |
|
227
e4def26f0fd3
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
96 std::unique_ptr<Orthanc::IDynamicObject> obj(cache->newInstances_.Dequeue(100)); |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
97 if (obj.get() != NULL) |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
98 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
99 const std::string& instanceId = dynamic_cast<DynamicString&>(*obj).GetValue(); |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
100 |
|
100
f5b1a9267da0
remove unused classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
99
diff
changeset
|
101 // On the reception of a new instance, indalidate the parent series of the instance |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
102 std::string uri = "/instances/" + std::string(instanceId); |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
103 Json::Value instance; |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
104 if (OrthancPlugins::GetJsonFromOrthanc(instance, OrthancPlugins::GetGlobalContext(), uri)) |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
105 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
106 std::string seriesId = instance["ParentSeries"].asString(); |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
107 cache->GetScheduler().Invalidate(OrthancPlugins::CacheBundle_SeriesInformation, seriesId); |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
108 } |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
109 } |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
110 } |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
111 } |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
112 |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
113 |
| 0 | 114 public: |
| 197 | 115 explicit CacheContext(const std::string& path) : storage_(path), stop_(false) |
| 0 | 116 { |
| 117 boost::filesystem::path p(path); | |
| 58 | 118 db_.Open((p / "cache.db").string()); |
| 0 | 119 |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
120 cache_.reset(new OrthancPlugins::CacheManager(OrthancPlugins::GetGlobalContext(), db_, storage_)); |
| 0 | 121 //cache_->SetSanityCheckEnabled(true); // For debug |
| 122 | |
| 123 scheduler_.reset(new OrthancPlugins::CacheScheduler(*cache_, 100)); | |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
124 |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
125 newInstancesThread_ = boost::thread(NewInstancesThread, this); |
| 0 | 126 } |
| 127 | |
| 58 | 128 ~CacheContext() |
| 129 { | |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
130 stop_ = true; |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
131 if (newInstancesThread_.joinable()) |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
132 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
133 newInstancesThread_.join(); |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
134 } |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
135 |
| 58 | 136 scheduler_.reset(NULL); |
| 137 cache_.reset(NULL); | |
| 138 } | |
| 139 | |
| 0 | 140 OrthancPlugins::CacheScheduler& GetScheduler() |
| 141 { | |
| 142 return *scheduler_; | |
| 143 } | |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
144 |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
145 void SignalNewInstance(const char* instanceId) |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
146 { |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
147 newInstances_.Enqueue(new DynamicString(instanceId)); |
|
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
148 } |
| 0 | 149 }; |
| 150 | |
| 151 | |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
152 |
| 0 | 153 static CacheContext* cache_ = NULL; |
| 154 | |
| 155 | |
| 156 | |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
157 static OrthancPluginErrorCode OnChangeCallback(OrthancPluginChangeType changeType, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
158 OrthancPluginResourceType resourceType, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
159 const char* resourceId) |
| 0 | 160 { |
| 161 try | |
| 162 { | |
| 163 if (changeType == OrthancPluginChangeType_NewInstance && | |
| 164 resourceType == OrthancPluginResourceType_Instance) | |
| 165 { | |
|
75
e15a59a4b4d4
Fix possible deadlock with other plugins in OnChangeCallback()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
74
diff
changeset
|
166 cache_->SignalNewInstance(resourceId); |
| 0 | 167 } |
| 168 | |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
169 return OrthancPluginErrorCode_Success; |
| 0 | 170 } |
| 171 catch (std::runtime_error& e) | |
| 172 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
173 LOG(ERROR) << e.what(); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
174 return OrthancPluginErrorCode_Success; // Ignore error |
| 0 | 175 } |
| 176 } | |
| 177 | |
| 178 | |
| 179 | |
| 180 template <enum OrthancPlugins::CacheBundle bundle> | |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
181 static OrthancPluginErrorCode ServeCache(OrthancPluginRestOutput* output, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
182 const char* url, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
183 const OrthancPluginHttpRequest* request) |
| 0 | 184 { |
| 185 try | |
| 186 { | |
| 187 if (request->method != OrthancPluginHttpMethod_Get) | |
| 188 { | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
189 OrthancPluginSendMethodNotAllowed(OrthancPlugins::GetGlobalContext(), output, "GET"); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
190 return OrthancPluginErrorCode_Success; |
| 0 | 191 } |
| 192 | |
| 193 const std::string id = request->groups[0]; | |
| 194 std::string content; | |
| 195 | |
| 196 if (cache_->GetScheduler().Access(content, bundle, id)) | |
| 197 { | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
198 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, content.c_str(), content.size(), "application/json"); |
| 0 | 199 } |
| 200 else | |
| 201 { | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
202 OrthancPluginSendHttpStatusCode(OrthancPlugins::GetGlobalContext(), output, 404); |
| 0 | 203 } |
| 204 | |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
205 return OrthancPluginErrorCode_Success; |
| 0 | 206 } |
| 207 catch (Orthanc::OrthancException& e) | |
| 208 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
209 LOG(ERROR) << e.What(); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
210 return OrthancPluginErrorCode_Plugin; |
| 0 | 211 } |
| 212 catch (std::runtime_error& e) | |
| 213 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
214 LOG(ERROR) << e.what(); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
215 return OrthancPluginErrorCode_Plugin; |
| 0 | 216 } |
| 217 catch (boost::bad_lexical_cast&) | |
| 218 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
219 LOG(ERROR) << "Bad lexical cast"; |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
220 return OrthancPluginErrorCode_Plugin; |
| 0 | 221 } |
| 222 } | |
| 223 | |
| 224 | |
| 225 | |
| 226 | |
| 227 #if ORTHANC_STANDALONE == 0 | |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
96
diff
changeset
|
228 static OrthancPluginErrorCode ServeWebViewer(OrthancPluginRestOutput* output, |
|
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
96
diff
changeset
|
229 const char* url, |
|
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
96
diff
changeset
|
230 const OrthancPluginHttpRequest* request) |
| 0 | 231 { |
| 232 if (request->method != OrthancPluginHttpMethod_Get) | |
| 233 { | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
234 OrthancPluginSendMethodNotAllowed(OrthancPlugins::GetGlobalContext(), output, "GET"); |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
96
diff
changeset
|
235 return OrthancPluginErrorCode_Success; |
| 0 | 236 } |
| 237 | |
| 238 const std::string path = std::string(WEB_VIEWER_PATH) + std::string(request->groups[0]); | |
| 239 const char* mime = OrthancPlugins::GetMimeType(path); | |
| 240 | |
| 241 std::string s; | |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
96
diff
changeset
|
242 try |
| 0 | 243 { |
| 160 | 244 Orthanc::SystemToolbox::ReadFile(s, path); |
| 0 | 245 const char* resource = s.size() ? s.c_str() : NULL; |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
246 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, resource, s.size(), mime); |
| 0 | 247 } |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
96
diff
changeset
|
248 catch (Orthanc::OrthancException&) |
| 0 | 249 { |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
250 LOG(ERROR) << "Inexistent file in served folder: " << path; |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
251 OrthancPluginSendHttpStatusCode(OrthancPlugins::GetGlobalContext(), output, 404); |
| 0 | 252 } |
| 253 | |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
96
diff
changeset
|
254 return OrthancPluginErrorCode_Success; |
| 0 | 255 } |
| 256 #endif | |
| 257 | |
| 258 | |
| 259 | |
| 31 | 260 template <enum Orthanc::EmbeddedResources::DirectoryResourceId folder> |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
261 static OrthancPluginErrorCode ServeEmbeddedFolder(OrthancPluginRestOutput* output, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
262 const char* url, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
263 const OrthancPluginHttpRequest* request) |
| 0 | 264 { |
| 265 if (request->method != OrthancPluginHttpMethod_Get) | |
| 266 { | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
267 OrthancPluginSendMethodNotAllowed(OrthancPlugins::GetGlobalContext(), output, "GET"); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
268 return OrthancPluginErrorCode_Success; |
| 0 | 269 } |
| 270 | |
| 271 std::string path = "/" + std::string(request->groups[0]); | |
| 272 const char* mime = OrthancPlugins::GetMimeType(path); | |
| 273 | |
| 274 try | |
| 275 { | |
| 276 std::string s; | |
| 31 | 277 Orthanc::EmbeddedResources::GetDirectoryResource(s, folder, path.c_str()); |
| 0 | 278 |
| 279 const char* resource = s.size() ? s.c_str() : NULL; | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
280 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, resource, s.size(), mime); |
| 0 | 281 |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
282 return OrthancPluginErrorCode_Success; |
| 0 | 283 } |
| 284 catch (std::runtime_error&) | |
| 285 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
286 LOG(ERROR) << "Unknown static resource in plugin: " << request->groups[0]; |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
287 OrthancPluginSendHttpStatusCode(OrthancPlugins::GetGlobalContext(), output, 404); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
288 return OrthancPluginErrorCode_Success; |
| 0 | 289 } |
| 290 } | |
| 291 | |
| 292 | |
| 293 | |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
294 static OrthancPluginErrorCode IsStableSeries(OrthancPluginRestOutput* output, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
295 const char* url, |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
296 const OrthancPluginHttpRequest* request) |
| 19 | 297 { |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
298 try |
| 19 | 299 { |
| 300 if (request->method != OrthancPluginHttpMethod_Get) | |
| 301 { | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
302 OrthancPluginSendMethodNotAllowed(OrthancPlugins::GetGlobalContext(), output, "GET"); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
303 return OrthancPluginErrorCode_Success; |
| 19 | 304 } |
| 305 | |
| 306 const std::string id = request->groups[0]; | |
| 307 Json::Value series; | |
| 308 | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
309 if (OrthancPlugins::GetJsonFromOrthanc(series, OrthancPlugins::GetGlobalContext(), "/series/" + id) && |
| 19 | 310 series.type() == Json::objectValue) |
| 311 { | |
| 312 bool value = (series["IsStable"].asBool() || | |
| 313 series["Status"].asString() == "Complete"); | |
| 314 std::string answer = value ? "true" : "false"; | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
315 OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, answer.c_str(), answer.size(), "application/json"); |
| 19 | 316 } |
| 317 else | |
| 318 { | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
319 OrthancPluginSendHttpStatusCode(OrthancPlugins::GetGlobalContext(), output, 404); |
| 19 | 320 } |
| 321 | |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
322 return OrthancPluginErrorCode_Success; |
| 19 | 323 } |
| 324 catch (Orthanc::OrthancException& e) | |
| 325 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
326 LOG(ERROR) << e.What(); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
327 return OrthancPluginErrorCode_Plugin; |
| 19 | 328 } |
| 329 catch (std::runtime_error& e) | |
| 330 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
331 LOG(ERROR) << e.what(); |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
332 return OrthancPluginErrorCode_Plugin; |
| 19 | 333 } |
| 334 catch (boost::bad_lexical_cast&) | |
| 335 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
336 LOG(ERROR) << "Bad lexical cast"; |
|
95
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
337 return OrthancPluginErrorCode_Plugin; |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
338 } |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
339 } |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
340 |
|
dbe7c97b6b4a
replace built-in decoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
341 |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
342 |
|
231
7097d0eaac76
Move the GDCM decoder out of the Orthanc Web viewer plugin as a separate plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
230
diff
changeset
|
343 void ParseConfiguration(int& decodingThreads, |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
344 boost::filesystem::path& cachePath, |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
345 int& cacheSize) |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
346 { |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
347 /* Read the configuration of the Web viewer */ |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
348 Json::Value configuration; |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
349 if (!OrthancPlugins::ReadConfiguration(configuration, OrthancPlugins::GetGlobalContext())) |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
350 { |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
351 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
352 } |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
353 |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
354 // By default, the cache of the Web viewer is located inside the |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
355 // "StorageDirectory" of Orthanc |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
356 cachePath = OrthancPlugins::GetStringValue(configuration, "StorageDirectory", "."); |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
357 cachePath /= "WebViewerCache"; |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
358 |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
359 static const char* CONFIG_WEB_VIEWER = "WebViewer"; |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
360 if (configuration.isMember(CONFIG_WEB_VIEWER)) |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
361 { |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
362 |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
363 std::string key = "CachePath"; |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
364 if (!configuration[CONFIG_WEB_VIEWER].isMember(key)) |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
365 { |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
366 // For backward compatibility with the initial release of the Web viewer |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
367 key = "Cache"; |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
368 } |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
369 |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
370 cachePath = OrthancPlugins::GetStringValue(configuration[CONFIG_WEB_VIEWER], key, cachePath.string()); |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
371 cacheSize = OrthancPlugins::GetIntegerValue(configuration[CONFIG_WEB_VIEWER], "CacheSize", cacheSize); |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
372 decodingThreads = OrthancPlugins::GetIntegerValue(configuration[CONFIG_WEB_VIEWER], "Threads", decodingThreads); |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
373 } |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
374 |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
375 if (decodingThreads <= 0 || |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
376 cacheSize <= 0) |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
377 { |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
378 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
379 } |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
380 |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
381 } |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
382 |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
383 |
|
143
16f8471e3872
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
384 static bool DisplayPerformanceWarning() |
|
16f8471e3872
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
385 { |
|
16f8471e3872
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
386 (void) DisplayPerformanceWarning; // Disable warning about unused function |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
387 LOG(WARNING) << "Performance warning in Web viewer: " |
|
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
388 << "Non-release build, runtime debug assertions are turned on"; |
|
143
16f8471e3872
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
389 return true; |
|
16f8471e3872
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
390 } |
|
16f8471e3872
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
391 |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
392 |
| 0 | 393 extern "C" |
| 394 { | |
| 395 ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context) | |
| 396 { | |
| 397 using namespace OrthancPlugins; | |
| 398 | |
|
230
cce89307af28
replacing GdcmDecoder/OrthancImageWrapper.h by OrthancPluginCppWrapper.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
228
diff
changeset
|
399 OrthancPlugins::SetGlobalContext(context); |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
400 |
| 286 | 401 #if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 7, 2) |
| 265 | 402 Orthanc::Logging::InitializePluginContext(context); |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
403 #else |
|
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
404 Orthanc::Logging::Initialize(context); |
|
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
405 #endif |
|
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
406 |
|
143
16f8471e3872
Performance warning if runtime debug assertions are turned on
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
133
diff
changeset
|
407 assert(DisplayPerformanceWarning()); |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
408 LOG(WARNING) << "Initializing the Web viewer"; |
| 0 | 409 |
| 410 | |
| 411 /* Check the version of the Orthanc core */ | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
412 if (OrthancPluginCheckVersion(context) == 0) |
| 0 | 413 { |
| 414 char info[1024]; | |
| 415 sprintf(info, "Your version of Orthanc (%s) must be above %d.%d.%d to run this plugin", | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
416 context->orthancVersion, |
| 0 | 417 ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER, |
| 418 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER, | |
| 419 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER); | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
420 OrthancPluginLogError(context, info); |
| 0 | 421 return -1; |
| 422 } | |
| 423 | |
|
315
05bf4ccfdca9
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
424 OrthancPlugins::SetDescription(ORTHANC_PLUGIN_NAME, "Provides a Web viewer of DICOM series within Orthanc."); |
| 0 | 425 |
| 426 | |
| 427 /* By default, use half of the available processing cores for the decoding of DICOM images */ | |
| 428 int decodingThreads = boost::thread::hardware_concurrency() / 2; | |
| 429 if (decodingThreads == 0) | |
| 430 { | |
| 431 decodingThreads = 1; | |
| 432 } | |
| 433 | |
| 434 try | |
| 435 { | |
| 197 | 436 /* By default, a cache of 100 MB is used */ |
| 437 int cacheSize = 100; | |
| 438 | |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
439 boost::filesystem::path cachePath; |
|
231
7097d0eaac76
Move the GDCM decoder out of the Orthanc Web viewer plugin as a separate plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
230
diff
changeset
|
440 ParseConfiguration(decodingThreads, cachePath, cacheSize); |
| 0 | 441 |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
442 LOG(WARNING) << "Web viewer using " << decodingThreads |
|
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
443 << " threads for the decoding of the DICOM images"; |
| 0 | 444 |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
445 LOG(WARNING) << "Storing the cache of the Web viewer in folder: " << cachePath.string(); |
| 0 | 446 |
| 447 | |
| 448 /* Create the cache */ | |
|
4
ecefd45026bf
configuration of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
449 cache_ = new CacheContext(cachePath.string()); |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
450 CacheScheduler& scheduler = cache_->GetScheduler(); |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
451 |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
452 |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
453 /* Look for a change in the versions */ |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
454 std::string orthancVersion("unknown"), webViewerVersion("unknown"); |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
455 bool clear = false; |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
456 if (!scheduler.LookupProperty(orthancVersion, CacheProperty_OrthancVersion) || |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
457 orthancVersion != std::string(context->orthancVersion)) |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
458 { |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
459 LOG(WARNING) << "The version of Orthanc has changed from \"" << orthancVersion |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
460 << "\" to \"" << context->orthancVersion |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
461 << "\": The cache of the Web viewer will be cleared"; |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
462 clear = true; |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
463 } |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
464 |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
465 if (!scheduler.LookupProperty(webViewerVersion, CacheProperty_WebViewerVersion) || |
|
206
d1ed9efdea6c
rename ORTHANC_WEBVIEWER_VERSION as ORTHANC_PLUGIN_VERSION
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
466 webViewerVersion != std::string(ORTHANC_PLUGIN_VERSION)) |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
467 { |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
468 LOG(WARNING) << "The version of the Web viewer plugin has changed from \"" |
|
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
469 << webViewerVersion << "\" to \"" << ORTHANC_PLUGIN_VERSION |
|
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
470 << "\": The cache of the Web viewer will be cleared"; |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
471 clear = true; |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
472 } |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
473 |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
474 |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
475 /* Clear the cache if needed */ |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
476 if (clear) |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
477 { |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
478 LOG(WARNING) << "Clearing the cache of the Web viewer"; |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
479 scheduler.Clear(); |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
480 scheduler.SetProperty(CacheProperty_OrthancVersion, context->orthancVersion); |
|
206
d1ed9efdea6c
rename ORTHANC_WEBVIEWER_VERSION as ORTHANC_PLUGIN_VERSION
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
481 scheduler.SetProperty(CacheProperty_WebViewerVersion, ORTHANC_PLUGIN_VERSION); |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
482 } |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
483 else |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
484 { |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
485 LOG(INFO) << "No change in the versions, no need to clear the cache of the Web viewer"; |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
486 } |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
487 |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
488 |
|
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
489 /* Configure the cache */ |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
490 scheduler.RegisterPolicy(new ViewerPrefetchPolicy(context)); |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
491 scheduler.Register(CacheBundle_SeriesInformation, |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
492 new SeriesInformationAdapter(context, scheduler), 1); |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
493 scheduler.Register(CacheBundle_DecodedImage, |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
494 new DecodedImageAdapter(context), decodingThreads); |
|
4
ecefd45026bf
configuration of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
495 |
|
ecefd45026bf
configuration of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
496 |
|
ecefd45026bf
configuration of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
497 /* Set the quotas */ |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
498 scheduler.SetQuota(CacheBundle_SeriesInformation, 1000, 0); // Keep info about 1000 series |
|
4
ecefd45026bf
configuration of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
499 |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
500 LOG(WARNING) << "Web viewer using a cache of " << cacheSize << " MB"; |
|
4
ecefd45026bf
configuration of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
501 |
|
115
c8ca47a67bf3
automatic clearing of the cache
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
502 scheduler.SetQuota(CacheBundle_DecodedImage, 0, static_cast<uint64_t>(cacheSize) * 1024 * 1024); |
| 0 | 503 } |
| 504 catch (std::runtime_error& e) | |
| 505 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
506 LOG(ERROR) << e.what(); |
| 0 | 507 return -1; |
| 508 } | |
| 509 catch (Orthanc::OrthancException& e) | |
| 510 { | |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
511 if (e.GetErrorCode() == Orthanc::ErrorCode_BadFileFormat) |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
512 { |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
513 LOG(ERROR) << "Unable to read the configuration of the Web viewer plugin"; |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
514 } |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
515 else |
|
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
516 { |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
517 LOG(ERROR) << e.What(); |
|
133
3251ec958a29
Option "RestrictTransferSyntaxes" saying which transfer syntaxes should be decoded with GDCM
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
127
diff
changeset
|
518 } |
| 0 | 519 return -1; |
| 520 } | |
| 521 | |
| 522 | |
| 523 /* Install the callbacks */ | |
|
271
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
524 OrthancPluginRegisterRestCallbackNoLock(context, "/web-viewer/series/(.*)", ServeCache<CacheBundle_SeriesInformation>); |
|
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
525 OrthancPluginRegisterRestCallbackNoLock(context, "/web-viewer/is-stable-series/(.*)", IsStableSeries); |
|
d3b58d11e3ec
removed global variable "context_"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
526 OrthancPluginRegisterRestCallbackNoLock(context, "/web-viewer/instances/(.*)", ServeCache<CacheBundle_DecodedImage>); |
|
218
6318db66448e
Performance: Replaced "OrthancPluginRegisterRestCallback" by "OrthancPluginRegisterRestCallbackNoLock"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
209
diff
changeset
|
527 OrthancPluginRegisterRestCallbackNoLock(context, "/web-viewer/libs/(.*)", ServeEmbeddedFolder<Orthanc::EmbeddedResources::JAVASCRIPT_LIBS>); |
| 0 | 528 |
| 529 #if ORTHANC_STANDALONE == 1 | |
|
218
6318db66448e
Performance: Replaced "OrthancPluginRegisterRestCallback" by "OrthancPluginRegisterRestCallbackNoLock"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
209
diff
changeset
|
530 OrthancPluginRegisterRestCallbackNoLock(context, "/web-viewer/app/(.*)", ServeEmbeddedFolder<Orthanc::EmbeddedResources::WEB_VIEWER>); |
| 0 | 531 #else |
|
218
6318db66448e
Performance: Replaced "OrthancPluginRegisterRestCallback" by "OrthancPluginRegisterRestCallbackNoLock"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
209
diff
changeset
|
532 OrthancPluginRegisterRestCallbackNoLock(context, "/web-viewer/app/(.*)", ServeWebViewer); |
| 0 | 533 #endif |
| 534 | |
| 535 OrthancPluginRegisterOnChangeCallback(context, OnChangeCallback); | |
| 536 | |
| 537 | |
| 538 /* Extend the default Orthanc Explorer with custom JavaScript */ | |
| 539 std::string explorer; | |
| 31 | 540 Orthanc::EmbeddedResources::GetFileResource(explorer, Orthanc::EmbeddedResources::ORTHANC_EXPLORER); |
|
315
05bf4ccfdca9
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
541 OrthancPlugins::ExtendOrthancExplorer(ORTHANC_PLUGIN_NAME, explorer); |
| 0 | 542 |
| 543 return 0; | |
| 544 } | |
| 545 | |
| 546 | |
| 547 ORTHANC_PLUGINS_API void OrthancPluginFinalize() | |
| 548 { | |
|
260
620ed85fb514
replacing OrthancPluginLog...() by LOG(...)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
235
diff
changeset
|
549 LOG(WARNING) << "Finalizing the Web viewer"; |
| 0 | 550 |
| 551 if (cache_ != NULL) | |
| 552 { | |
| 553 delete cache_; | |
| 554 cache_ = NULL; | |
| 555 } | |
| 265 | 556 |
| 557 Orthanc::Logging::Finalize(); | |
| 0 | 558 } |
| 559 | |
| 560 | |
| 561 ORTHANC_PLUGINS_API const char* OrthancPluginGetName() | |
| 562 { | |
|
315
05bf4ccfdca9
fix deprecated calls
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
314
diff
changeset
|
563 return ORTHANC_PLUGIN_NAME; |
| 0 | 564 } |
| 565 | |
| 566 | |
| 567 ORTHANC_PLUGINS_API const char* OrthancPluginGetVersion() | |
| 568 { | |
|
206
d1ed9efdea6c
rename ORTHANC_WEBVIEWER_VERSION as ORTHANC_PLUGIN_VERSION
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
569 return ORTHANC_PLUGIN_VERSION; |
| 0 | 570 } |
| 571 } |