Mercurial > hg > orthanc
comparison OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 2381:b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 29 Aug 2017 19:59:01 +0200 |
parents | 3ab96768d144 |
children |
comparison
equal
deleted
inserted
replaced
2380:96b3ec054b69 | 2381:b8969010b534 |
---|---|
85 #include "../../Core/DicomFormat/DicomArray.h" | 85 #include "../../Core/DicomFormat/DicomArray.h" |
86 #include "../../Core/Logging.h" | 86 #include "../../Core/Logging.h" |
87 #include "../../Core/OrthancException.h" | 87 #include "../../Core/OrthancException.h" |
88 #include "../FromDcmtkBridge.h" | 88 #include "../FromDcmtkBridge.h" |
89 #include "../ToDcmtkBridge.h" | 89 #include "../ToDcmtkBridge.h" |
90 #include "../OrthancInitialization.h" | |
91 | 90 |
92 #include <dcmtk/dcmdata/dcistrmb.h> | 91 #include <dcmtk/dcmdata/dcistrmb.h> |
93 #include <dcmtk/dcmdata/dcistrmf.h> | 92 #include <dcmtk/dcmdata/dcistrmf.h> |
94 #include <dcmtk/dcmdata/dcfilefo.h> | 93 #include <dcmtk/dcmdata/dcfilefo.h> |
95 #include <dcmtk/dcmdata/dcmetinf.h> | 94 #include <dcmtk/dcmdata/dcmetinf.h> |
400 payload.answers->Add(answer); | 399 payload.answers->Add(answer); |
401 } | 400 } |
402 else | 401 else |
403 { | 402 { |
404 DicomMap m; | 403 DicomMap m; |
405 Configuration::ExtractDicomSummary(m, *responseIdentifiers); | 404 FromDcmtkBridge::ExtractDicomSummary(m, *responseIdentifiers); |
406 | 405 |
407 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL)) | 406 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL)) |
408 { | 407 { |
409 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level, false); | 408 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level, false); |
410 } | 409 } |
411 | 410 |