Mercurial > hg > orthanc

comparison OrthancServer/DicomInstanceToStore.cpp @ 2381:b8969010b534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncoupling DCMTK primitives from Orthanc::Configuration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 19:59:01 +0200
parents a3a65de1840f
children 7284093111b0
comparison
equal deleted inserted replaced
2380:96b3ec054b69 2381:b8969010b534
33 33
34 #include "PrecompiledHeadersServer.h" 34 #include "PrecompiledHeadersServer.h"
35 #include "DicomInstanceToStore.h" 35 #include "DicomInstanceToStore.h"
36 36
37 #include "FromDcmtkBridge.h" 37 #include "FromDcmtkBridge.h"
38 #include "OrthancInitialization.h"
39 #include "../Core/Logging.h" 38 #include "../Core/Logging.h"
40 39
41 #include <dcmtk/dcmdata/dcfilefo.h> 40 #include <dcmtk/dcmdata/dcfilefo.h>
42 #include <dcmtk/dcmdata/dcdeftag.h> 41 #include <dcmtk/dcmdata/dcdeftag.h>
43 42
104 // At this point, we have parsed the DICOM file 103 // At this point, we have parsed the DICOM file
105 104
106 if (!summary_.HasContent()) 105 if (!summary_.HasContent())
107 { 106 {
108 summary_.Allocate(); 107 summary_.Allocate();
109 Configuration::ExtractDicomSummary(summary_.GetContent(), 108 FromDcmtkBridge::ExtractDicomSummary(summary_.GetContent(),
110 *parsed_.GetContent().GetDcmtkObject().getDataset()); 109 *parsed_.GetContent().GetDcmtkObject().getDataset());
111 } 110 }
112 111
113 if (!json_.HasContent()) 112 if (!json_.HasContent())
114 { 113 {
115 json_.Allocate(); 114 json_.Allocate();
116 Configuration::ExtractDicomAsJson(json_.GetContent(), 115 FromDcmtkBridge::ExtractDicomAsJson(json_.GetContent(),
117 *parsed_.GetContent().GetDcmtkObject().getDataset()); 116 *parsed_.GetContent().GetDcmtkObject().getDataset());
118 } 117 }
119 } 118 }
120 119
121 120
122 121