Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerJobs/MergeStudyJob.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 d9473bd5ed43
comparison
equal deleted inserted replaced
4139:a4f28efdfccf 4140:0ddc5297a8ab
34 #include "MergeStudyJob.h" 34 #include "MergeStudyJob.h"
35 35
36 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" 36 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
37 #include "../../../OrthancFramework/Sources/Logging.h" 37 #include "../../../OrthancFramework/Sources/Logging.h"
38 #include "../../../OrthancFramework/Sources/SerializationToolbox.h" 38 #include "../../../OrthancFramework/Sources/SerializationToolbox.h"
39 #include "../OrthancConfiguration.h"
39 #include "../ServerContext.h" 40 #include "../ServerContext.h"
40 41
41 42
42 namespace Orthanc 43 namespace Orthanc
43 { 44 {
199 200
200 DicomMap dicom; 201 DicomMap dicom;
201 202
202 { 203 {
203 ServerContext::DicomCacheLocker locker(GetContext(), instances.front()); 204 ServerContext::DicomCacheLocker locker(GetContext(), instances.front());
204 locker.GetDicom().ExtractDicomSummary(dicom, ORTHANC_MAXIMUM_TAG_LENGTH); 205 OrthancConfiguration::DefaultExtractDicomSummary(dicom, locker.GetDicom());
205 } 206 }
206 207
207 const std::set<DicomTag> moduleTags = removals_; 208 const std::set<DicomTag> moduleTags = removals_;
208 for (std::set<DicomTag>::const_iterator it = moduleTags.begin(); 209 for (std::set<DicomTag>::const_iterator it = moduleTags.begin();
209 it != moduleTags.end(); ++it) 210 it != moduleTags.end(); ++it)