Mercurial > hg > orthanc
diff OrthancServer/Sources/DicomInstanceToStore.cpp @ 4140:0ddc5297a8ab
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 | 92737070b301 |
line wrap: on
line diff
--- a/OrthancServer/Sources/DicomInstanceToStore.cpp Thu Aug 06 18:25:47 2020 +0200 +++ b/OrthancServer/Sources/DicomInstanceToStore.cpp Fri Aug 07 10:46:50 2020 +0200 @@ -34,6 +34,8 @@ #include "PrecompiledHeadersServer.h" #include "DicomInstanceToStore.h" +#include "OrthancConfiguration.h" + #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" #include "../../OrthancFramework/Sources/Logging.h" @@ -241,22 +243,17 @@ assert(parsed_.HasContent()); // At this point, we have parsed the DICOM file - std::set<DicomTag> ignoreTagLength; if (!summary_.HasContent()) { summary_.Allocate(); - FromDcmtkBridge::ExtractDicomSummary(summary_.GetContent(), - *parsed_.GetContent().GetDcmtkObject().getDataset(), - ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength); + OrthancConfiguration::DefaultExtractDicomSummary(summary_.GetContent(), parsed_.GetContent()); } if (!json_.HasContent()) { json_.Allocate(); - FromDcmtkBridge::ExtractDicomAsJson(json_.GetContent(), - *parsed_.GetContent().GetDcmtkObject().getDataset(), - ignoreTagLength); + OrthancConfiguration::DefaultDicomDatasetToJson(json_.GetContent(), parsed_.GetContent()); } }