Mercurial > hg > orthanc-dicomweb
changeset 327:39dd8b84b20f refactoring
integration mainline->refactoring
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 21 Jun 2019 11:51:21 +0200 |
| parents | 0823e71d1c14 (current diff) e694970cd263 (diff) |
| children | d74e12cfeba3 ac37898aaa8e |
| files | Plugin/DicomWebClient.cpp Plugin/Plugin.cpp WebApplication/app.js |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri Jun 21 11:29:04 2019 +0200 +++ b/NEWS Fri Jun 21 11:51:21 2019 +0200 @@ -1,6 +1,12 @@ Pending changes in the mainline =============================== +=> Recommended SDK version: 1.5.7 <= +=> Minimum SDK version: 1.5.4 <= + +* Web user interface for QIDO-RS, WADO-RS and STOW-RS clients +* Full refactoring of multipart parsing +* Jobs are available in WADO-RS client and STOW-RS client * Support "Transfer-Encoding: chunked" to reduce memory consumption in STOW-RS (provided the SDK version is above 1.5.7) * Handling of the HTTP header "Forwarded" for WADO-RS
--- a/Plugin/DicomWebClient.cpp Fri Jun 21 11:29:04 2019 +0200 +++ b/Plugin/DicomWebClient.cpp Fri Jun 21 11:51:21 2019 +0200 @@ -1306,7 +1306,8 @@ retrievedInstances_.splice(retrievedInstances_.end(), instances); context.SetProgress(position_, resources_.size()); - context.SetContent("NetworkUsageMB", boost::lexical_cast<std::string>(networkSize_ / (1024llu * 1024llu))); + context.SetContent("NetworkUsageMB", boost::lexical_cast<std::string> + (networkSize_ / static_cast<uint64_t>(1024 * 1024))); context.SetContent("ReceivedInstancesCount", boost::lexical_cast<std::string>(retrievedInstances_.size())); }
--- a/Plugin/Plugin.cpp Fri Jun 21 11:29:04 2019 +0200 +++ b/Plugin/Plugin.cpp Fri Jun 21 11:51:21 2019 +0200 @@ -484,6 +484,7 @@ ORTHANC_PLUGINS_API int32_t OrthancPluginInitialize(OrthancPluginContext* context) { assert(DisplayPerformanceWarning(context)); + OrthancPlugins::SetGlobalContext(context); Orthanc::Logging::Initialize(context); @@ -500,6 +501,11 @@ return -1; } +#if HAS_ORTHANC_PLUGIN_CHUNKED_HTTP_CLIENT == 0 + LOG(WARNING) << "Performance warning in DICOMweb: The plugin was compiled against " + << "Orthanc SDK <= 1.5.6. STOW and WADO chunked transfers will be entirely stored in RAM."; +#endif + OrthancPluginSetDescription(context, "Implementation of DICOMweb (QIDO-RS, STOW-RS and WADO-RS) and WADO-URI."); try