Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/ParsedDicomFile.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 a4f28efdfccf
children 7112a8af0b63
comparison
equal deleted inserted replaced
4139:a4f28efdfccf 4140:0ddc5297a8ab
1426 DicomToJsonFlags flags, 1426 DicomToJsonFlags flags,
1427 unsigned int maxStringLength) 1427 unsigned int maxStringLength)
1428 { 1428 {
1429 std::set<DicomTag> ignoreTagLength; 1429 std::set<DicomTag> ignoreTagLength;
1430 FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(), 1430 FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(),
1431 format, flags, maxStringLength, 1431 format, flags, maxStringLength, ignoreTagLength);
1432 GetDefaultDicomEncoding(), ignoreTagLength);
1433 } 1432 }
1434 1433
1435 1434
1436 void ParsedDicomFile::DatasetToJson(Json::Value& target, 1435 void ParsedDicomFile::DatasetToJson(Json::Value& target,
1437 DicomToJsonFormat format, 1436 DicomToJsonFormat format,
1438 DicomToJsonFlags flags, 1437 DicomToJsonFlags flags,
1439 unsigned int maxStringLength, 1438 unsigned int maxStringLength,
1440 const std::set<DicomTag>& ignoreTagLength) 1439 const std::set<DicomTag>& ignoreTagLength)
1441 { 1440 {
1442 FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(), 1441 FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(),
1443 format, flags, maxStringLength, 1442 format, flags, maxStringLength, ignoreTagLength);
1444 GetDefaultDicomEncoding(), ignoreTagLength);
1445 }
1446
1447
1448 void ParsedDicomFile::DatasetToJson(Json::Value& target,
1449 const std::set<DicomTag>& ignoreTagLength)
1450 {
1451 FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(), ignoreTagLength);
1452 }
1453
1454
1455 void ParsedDicomFile::DatasetToJson(Json::Value& target)
1456 {
1457 const std::set<DicomTag> ignoreTagLength;
1458 FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(), ignoreTagLength);
1459 } 1443 }
1460 1444
1461 1445
1462 void ParsedDicomFile::HeaderToJson(Json::Value& target, 1446 void ParsedDicomFile::HeaderToJson(Json::Value& target,
1463 DicomToJsonFormat format) 1447 DicomToJsonFormat format)