comparison OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 1928:84c7eaeb5244

Configuration::GetDefaultEncoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Mar 2016 14:12:31 +0100
parents 5011a597b6ce
children cda5b0ab4ce5
comparison
equal deleted inserted replaced
1927:b60f27664b8f 1928:84c7eaeb5244
84 #include "../../Core/DicomFormat/DicomArray.h" 84 #include "../../Core/DicomFormat/DicomArray.h"
85 #include "../../Core/Logging.h" 85 #include "../../Core/Logging.h"
86 #include "../../Core/OrthancException.h" 86 #include "../../Core/OrthancException.h"
87 #include "../FromDcmtkBridge.h" 87 #include "../FromDcmtkBridge.h"
88 #include "../ToDcmtkBridge.h" 88 #include "../ToDcmtkBridge.h"
89 #include "../OrthancInitialization.h"
89 90
90 #include <dcmtk/dcmdata/dcistrmb.h> 91 #include <dcmtk/dcmdata/dcistrmb.h>
91 #include <dcmtk/dcmdata/dcistrmf.h> 92 #include <dcmtk/dcmdata/dcistrmf.h>
92 #include <dcmtk/dcmdata/dcfilefo.h> 93 #include <dcmtk/dcmdata/dcfilefo.h>
93 #include <dcmtk/dcmdata/dcmetinf.h> 94 #include <dcmtk/dcmdata/dcmetinf.h>
392 payload.answers->Add(answer); 393 payload.answers->Add(answer);
393 } 394 }
394 else 395 else
395 { 396 {
396 DicomMap m; 397 DicomMap m;
397 FromDcmtkBridge::Convert(m, *responseIdentifiers); 398 FromDcmtkBridge::Convert(m, *responseIdentifiers,
399 Configuration::GetDefaultEncoding());
398 400
399 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL)) 401 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL))
400 { 402 {
401 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level); 403 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level);
402 } 404 }