Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 3577:33cfcc74d1b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
argument "ignoreTagLength" to ParsedDicomFile::ExtractDicomSummary()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 19 Nov 2019 17:26:02 +0100
parents b3bdd6dc10f2
children 0654d0838de8
comparison
equal deleted inserted replaced
3575:1d403ecf3391 3577:33cfcc74d1b1
454 454
455 455
456 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target, 456 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
457 DcmItem& dataset, 457 DcmItem& dataset,
458 unsigned int maxStringLength, 458 unsigned int maxStringLength,
459 Encoding defaultEncoding) 459 Encoding defaultEncoding,
460 { 460 const std::set<DicomTag>& ignoreTagLength)
461 std::set<DicomTag> ignoreTagLength; 461 {
462
463 bool hasCodeExtensions; 462 bool hasCodeExtensions;
464 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding); 463 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
465 464
466 target.Clear(); 465 target.Clear();
467 for (unsigned long i = 0; i < dataset.card(); i++) 466 for (unsigned long i = 0; i < dataset.card(); i++)
2146 } 2145 }
2147 #endif 2146 #endif
2148 2147
2149 2148
2150 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target, 2149 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
2151 DcmItem& dataset) 2150 DcmItem& dataset,
2151 const std::set<DicomTag>& ignoreTagLength)
2152 { 2152 {
2153 ExtractDicomSummary(target, dataset, 2153 ExtractDicomSummary(target, dataset,
2154 ORTHANC_MAXIMUM_TAG_LENGTH, 2154 ORTHANC_MAXIMUM_TAG_LENGTH,
2155 GetDefaultDicomEncoding()); 2155 GetDefaultDicomEncoding(), ignoreTagLength);
2156 } 2156 }
2157 2157
2158 2158
2159 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target, 2159 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
2160 DcmDataset& dataset, 2160 DcmDataset& dataset,