Codebase list orthanc-dicomweb / f8e2d8c
New upstream version 1.4+dfsg jodogne-guest 3 years ago
10 changed file(s) with 54 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all
+4
-4
.hg_archival.txt less more
00 repo: d5f45924411123cfd02d035fd50b8e37536eadef
1 node: 4bfe89488bc1eec56b6b3eb8716b68e4ed3663dd
2 branch: OrthancDicomWeb-1.3
1 node: b751b1383e075319ab286e1388aebc032f34d0b2
2 branch: OrthancDicomWeb-1.4
33 latesttag: null
4 latesttagdistance: 437
5 changessincelatesttag: 466
4 latesttagdistance: 443
5 changessincelatesttag: 472
+2
-2
CMakeLists.txt less more
2020
2121 project(OrthancDicomWeb)
2222
23 set(ORTHANC_DICOM_WEB_VERSION "1.3")
23 set(ORTHANC_DICOM_WEB_VERSION "1.4")
2424
2525 if (ORTHANC_DICOM_WEB_VERSION STREQUAL "mainline")
2626 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
2727 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
2828 else()
29 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.0")
29 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.1")
3030 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
3131 endif()
3232
+8
-0
NEWS less more
00 Pending changes in the mainline
11 ===============================
2
3
4 Version 1.4 (2020-12-18)
5 ========================
6
7 * "Extrapolate" mode doesn't fail if no consensus is found in WADO-RS Retrieve Metadata.
8 This is necessary for proper behavior of the Stone Web viewer on very small series.
9 * Fix issue #190 (STOW-RS fails is multipart boundary is surrounded by quotes in headers)
210
311
412 Version 1.3 (2020-10-19)
+2
-1
Plugin/DicomWebClient.cpp less more
2323 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
2424 #include "DicomWebServers.h"
2525
26 #include <ChunkedBuffer.h>
2627 #include <Compatibility.h>
2728 #include <HttpServer/MultipartStreamReader.h>
28 #include <ChunkedBuffer.h>
29 #include <Logging.h>
2930 #include <Toolbox.h>
3031
3132 #include <json/reader.h>
+1
-0
Plugin/Plugin.cpp less more
2525 #include "WadoRs.h"
2626 #include "WadoUri.h"
2727
28 #include <Logging.h>
2829 #include <SystemToolbox.h>
2930 #include <Toolbox.h>
3031
+1
-0
Plugin/QidoRs.cpp less more
2626
2727 #include <DicomFormat/DicomMap.h>
2828 #include <DicomFormat/DicomTag.h>
29 #include <Logging.h>
2930 #include <Toolbox.h>
3031
3132 #include <list>
+10
-0
Plugin/StowRs.cpp less more
5858 "The STOW-RS plugin currently only supports \"application/dicom\" subtype");
5959 }
6060
61 // Hotfix for bug #190, until the Orthanc Framework is fixed
62 // https://bugs.orthanc-server.com/show_bug.cgi?id=190
63 if (!boundary.empty() &&
64 boundary.size() >= 2 &&
65 boundary[0] == '"' &&
66 boundary[boundary.size() - 1] == '"')
67 {
68 boundary = boundary.substr(1, boundary.size() - 2);
69 }
70
6171 parser_.reset(new Orthanc::MultipartStreamReader(boundary));
6272 parser_->SetHandler(*this);
6373 }
+7
-3
Plugin/WadoRs.cpp less more
2424
2525 #include <Compatibility.h>
2626 #include <ChunkedBuffer.h>
27 #include <Logging.h>
2728 #include <Toolbox.h>
2829
2930 #include <memory>
393394 ++current;
394395 }
395396
397 target.SetValue(tag, maxValue, false);
398
396399 // Take the ceiling of the number of available instances
397400 const size_t threshold = instances_.size() / 2 + 1;
398 if (maxCount >= threshold)
399 {
400 target.SetValue(tag, maxValue, false);
401 if (maxCount < threshold)
402 {
403 LOG(WARNING) << "No consensus on the value of a tag during WADO-RS Retrieve "
404 << "Metadata in Extrapolate mode: " << tag.Format();
401405 }
402406 }
403407 }
+1
-0
Plugin/WadoRsRetrieveRendered.cpp less more
2424 #include <Images/Image.h>
2525 #include <Images/ImageProcessing.h>
2626 #include <Images/ImageTraits.h>
27 #include <Logging.h>
2728 #include <Toolbox.h>
2829
2930 #include <boost/algorithm/string/predicate.hpp>
+18
-0
Resources/Orthanc/CMake/DownloadOrthancFramework.cmake less more
117117 set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
118118 elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
119119 set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
120 elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.1")
121 set(ORTHANC_FRAMEWORK_MD5 "db094f96399cbe8b9bbdbce34884c220")
120122
121123 # Below this point are development snapshots that were used to
122124 # release some plugin, before an official release of the Orthanc
128130 elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
129131 # DICOMweb 1.1 (framework pre-1.6.0)
130132 set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
133 elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
134 # Stone Web viewer 1.0 (framework pre-1.8.1)
135 set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
136 elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
137 # PostgreSQL 3.3 (framework pre-1.8.2)
138 set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
131139 endif()
132140 endif()
133141 endif()
523531 include_directories(${DCMTK_INCLUDE_DIRS})
524532 link_libraries(${DCMTK_LIBRARIES})
525533 endif()
534
535 # Optional component - OpenSSL
536 if (ENABLE_SSL)
537 include(FindOpenSSL)
538 if (NOT ${OPENSSL_FOUND})
539 message(FATAL_ERROR "Unable to find OpenSSL")
540 endif()
541 include_directories(${OPENSSL_INCLUDE_DIR})
542 link_libraries(${OPENSSL_LIBRARIES})
543 endif()
526544 endif()
527545
528546 # Look for Orthanc framework shared library