Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4137:6774605d4341

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keep only one signature for FromDcmtkBridge::ExtractDicomSummary()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 06 Aug 2020 17:38:55 +0200
parents 2724977419fb
children 0ddc5297a8ab
comparison
equal deleted inserted replaced
4136:2724977419fb 4137:6774605d4341
468 468
469 469
470 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target, 470 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
471 DcmItem& dataset, 471 DcmItem& dataset,
472 unsigned int maxStringLength, 472 unsigned int maxStringLength,
473 Encoding defaultEncoding,
474 const std::set<DicomTag>& ignoreTagLength) 473 const std::set<DicomTag>& ignoreTagLength)
475 { 474 {
475 const Encoding defaultEncoding = GetDefaultDicomEncoding();
476
476 bool hasCodeExtensions; 477 bool hasCodeExtensions;
477 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding); 478 Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
478 479
479 target.Clear(); 480 target.Clear();
480 for (unsigned long i = 0; i < dataset.card(); i++) 481 for (unsigned long i = 0; i < dataset.card(); i++)
2034 } 2035 }
2035 } 2036 }
2036 } 2037 }
2037 2038
2038 2039
2039 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
2040 DcmItem& dataset,
2041 unsigned int maxStringLength,
2042 const std::set<DicomTag>& ignoreTagLength)
2043 {
2044 ExtractDicomSummary(target, dataset, maxStringLength,
2045 GetDefaultDicomEncoding(), ignoreTagLength);
2046 }
2047
2048
2049 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target, 2040 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
2050 DcmDataset& dataset, 2041 DcmDataset& dataset,
2051 const std::set<DicomTag>& ignoreTagLength) 2042 const std::set<DicomTag>& ignoreTagLength)
2052 { 2043 {
2053 ExtractDicomAsJson(target, dataset, 2044 ExtractDicomAsJson(target, dataset,