Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancConfiguration.cpp @ 4140:0ddc5297a8ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
centralization of default parameters for JSON/DicomMap conversions from DCMTK
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 07 Aug 2020 10:46:50 +0200
parents 05b8fd21089c
children b3c5418109a9
comparison
equal deleted inserted replaced
4139:a4f28efdfccf 4140:0ddc5297a8ab
32 32
33 33
34 #include "PrecompiledHeadersServer.h" 34 #include "PrecompiledHeadersServer.h"
35 #include "OrthancConfiguration.h" 35 #include "OrthancConfiguration.h"
36 36
37 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
37 #include "../../OrthancFramework/Sources/HttpServer/HttpServer.h" 38 #include "../../OrthancFramework/Sources/HttpServer/HttpServer.h"
38 #include "../../OrthancFramework/Sources/Logging.h" 39 #include "../../OrthancFramework/Sources/Logging.h"
39 #include "../../OrthancFramework/Sources/OrthancException.h" 40 #include "../../OrthancFramework/Sources/OrthancException.h"
40 #include "../../OrthancFramework/Sources/SystemToolbox.h" 41 #include "../../OrthancFramework/Sources/SystemToolbox.h"
41 #include "../../OrthancFramework/Sources/TemporaryFile.h" 42 #include "../../OrthancFramework/Sources/TemporaryFile.h"
894 std::string OrthancConfiguration::GetDefaultPrivateCreator() const 895 std::string OrthancConfiguration::GetDefaultPrivateCreator() const
895 { 896 {
896 // New configuration option in Orthanc 1.6.0 897 // New configuration option in Orthanc 1.6.0
897 return GetStringParameter("DefaultPrivateCreator", ""); 898 return GetStringParameter("DefaultPrivateCreator", "");
898 } 899 }
900
901
902 void OrthancConfiguration::DefaultExtractDicomSummary(DicomMap& target,
903 ParsedDicomFile& dicom)
904 {
905 std::set<DicomTag> ignoreTagLength;
906 dicom.ExtractDicomSummary(target, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
907 }
908
909
910 void OrthancConfiguration::DefaultDicomDatasetToJson(Json::Value& target,
911 ParsedDicomFile& dicom)
912 {
913 std::set<DicomTag> ignoreTagLength;
914 DefaultDicomDatasetToJson(target, dicom, ignoreTagLength);
915 }
916
917
918 void OrthancConfiguration::DefaultDicomDatasetToJson(Json::Value& target,
919 ParsedDicomFile& dicom,
920 const std::set<DicomTag>& ignoreTagLength)
921 {
922 dicom.DatasetToJson(target, DicomToJsonFormat_Full, DicomToJsonFlags_Default,
923 ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
924 }
925
926
927 void OrthancConfiguration::DefaultDicomHeaderToJson(Json::Value& target,
928 ParsedDicomFile& dicom)
929 {
930 std::set<DicomTag> ignoreTagLength;
931 dicom.HeaderToJson(target, DicomToJsonFormat_Full);
932 }
899 } 933 }