Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.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 6774605d4341
children 7112a8af0b63
comparison
equal deleted inserted replaced
4139:a4f28efdfccf 4140:0ddc5297a8ab
978 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target, 978 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
979 DcmDataset& dataset, 979 DcmDataset& dataset,
980 DicomToJsonFormat format, 980 DicomToJsonFormat format,
981 DicomToJsonFlags flags, 981 DicomToJsonFlags flags,
982 unsigned int maxStringLength, 982 unsigned int maxStringLength,
983 Encoding defaultEncoding,
984 const std::set<DicomTag>& ignoreTagLength) 983 const std::set<DicomTag>& ignoreTagLength)
985 { 984 {
985 const Encoding defaultEncoding = GetDefaultDicomEncoding();
986
986 bool hasCodeExtensions; 987 bool hasCodeExtensions;
987 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding); 988 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
988 989
989 target = Json::objectValue; 990 target = Json::objectValue;
990 DatasetToJson(target, dataset, format, flags, maxStringLength, encoding, hasCodeExtensions, ignoreTagLength); 991 DatasetToJson(target, dataset, format, flags, maxStringLength, encoding, hasCodeExtensions, ignoreTagLength);
2035 } 2036 }
2036 } 2037 }
2037 } 2038 }
2038 2039
2039 2040
2040 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
2041 DcmDataset& dataset,
2042 const std::set<DicomTag>& ignoreTagLength)
2043 {
2044 ExtractDicomAsJson(target, dataset,
2045 DicomToJsonFormat_Full,
2046 DicomToJsonFlags_Default,
2047 ORTHANC_MAXIMUM_TAG_LENGTH,
2048 GetDefaultDicomEncoding(),
2049 ignoreTagLength);
2050 }
2051
2052
2053 void FromDcmtkBridge::InitializeCodecs() 2041 void FromDcmtkBridge::InitializeCodecs()
2054 { 2042 {
2055 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 2043 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1
2056 LOG(INFO) << "Registering JPEG Lossless codecs in DCMTK"; 2044 LOG(INFO) << "Registering JPEG Lossless codecs in DCMTK";
2057 DJLSDecoderRegistration::registerCodecs(); 2045 DJLSDecoderRegistration::registerCodecs();