Mercurial > hg > orthanc
comparison OrthancServer/Internals/StoreScp.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 | 96b3ec054b69 |
children |
comparison
equal
deleted
inserted
replaced
2380:96b3ec054b69 | 2381:b8969010b534 |
---|---|
83 #include "../PrecompiledHeadersServer.h" | 83 #include "../PrecompiledHeadersServer.h" |
84 #include "StoreScp.h" | 84 #include "StoreScp.h" |
85 | 85 |
86 #include "../FromDcmtkBridge.h" | 86 #include "../FromDcmtkBridge.h" |
87 #include "../ToDcmtkBridge.h" | 87 #include "../ToDcmtkBridge.h" |
88 #include "../OrthancInitialization.h" | |
89 #include "../../Core/OrthancException.h" | 88 #include "../../Core/OrthancException.h" |
90 #include "../../Core/Logging.h" | 89 #include "../../Core/Logging.h" |
91 | 90 |
92 #include <dcmtk/dcmdata/dcfilefo.h> | 91 #include <dcmtk/dcmdata/dcfilefo.h> |
93 #include <dcmtk/dcmdata/dcmetinf.h> | 92 #include <dcmtk/dcmdata/dcmetinf.h> |
166 Json::Value dicomJson; | 165 Json::Value dicomJson; |
167 std::string buffer; | 166 std::string buffer; |
168 | 167 |
169 try | 168 try |
170 { | 169 { |
171 Configuration::ExtractDicomSummary(summary, **imageDataSet); | 170 FromDcmtkBridge::ExtractDicomSummary(summary, **imageDataSet); |
172 Configuration::ExtractDicomAsJson(dicomJson, **imageDataSet); | 171 FromDcmtkBridge::ExtractDicomAsJson(dicomJson, **imageDataSet); |
173 | 172 |
174 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, **imageDataSet)) | 173 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, **imageDataSet)) |
175 { | 174 { |
176 LOG(ERROR) << "cannot write DICOM file to memory"; | 175 LOG(ERROR) << "cannot write DICOM file to memory"; |
177 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; | 176 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; |