comparison OrthancServer/FromDcmtkBridge.h @ 2125:b9bd52c72ba2

cleaning up
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Nov 2016 12:38:09 +0100
parents a657f7772e69
children 03b065778fc3
comparison
equal deleted inserted replaced
2124:2b1520efa282 2125:b9bd52c72ba2
31 31
32 32
33 #pragma once 33 #pragma once
34 34
35 #include "ServerEnumerations.h" 35 #include "ServerEnumerations.h"
36 #include "OrthancInitialization.h"
36 37
37 #include "../Core/DicomFormat/DicomElement.h" 38 #include "../Core/DicomFormat/DicomElement.h"
38 #include "../Core/DicomFormat/DicomMap.h" 39 #include "../Core/DicomFormat/DicomMap.h"
39 40
40 #include <dcmtk/dcmdata/dcdatset.h> 41 #include <dcmtk/dcmdata/dcdatset.h>
43 #include <dcmtk/dcmdata/dcfilefo.h> 44 #include <dcmtk/dcmdata/dcfilefo.h>
44 #include <json/json.h> 45 #include <json/json.h>
45 46
46 namespace Orthanc 47 namespace Orthanc
47 { 48 {
48 class FromDcmtkBridge 49 class FromDcmtkBridge : public boost::noncopyable
49 { 50 {
51 private:
52 FromDcmtkBridge(); // Pure static class
53
54 static void ExtractDicomSummary(DicomMap& target,
55 DcmItem& dataset,
56 unsigned int maxStringLength,
57 Encoding defaultEncoding);
58
50 public: 59 public:
51 static void InitializeDictionary(); 60 static void InitializeDictionary();
52 61
53 static void RegisterDictionaryTag(const DicomTag& tag, 62 static void RegisterDictionaryTag(const DicomTag& tag,
54 ValueRepresentation vr, 63 ValueRepresentation vr,
58 const std::string& privateCreator); 67 const std::string& privateCreator);
59 68
60 static Encoding DetectEncoding(DcmItem& dataset, 69 static Encoding DetectEncoding(DcmItem& dataset,
61 Encoding defaultEncoding); 70 Encoding defaultEncoding);
62 71
63 static void Convert(DicomMap& target, 72 static void ExtractDicomSummary(DicomMap& target,
64 DcmItem& dataset, 73 DcmItem& dataset)
65 unsigned int maxStringLength, 74 {
66 Encoding defaultEncoding); 75 ExtractDicomSummary(target, dataset, ORTHANC_MAXIMUM_TAG_LENGTH, Configuration::GetDefaultEncoding());
76 }
67 77
68 static DicomTag Convert(const DcmTag& tag); 78 static DicomTag Convert(const DcmTag& tag);
69 79
70 static DicomTag GetTag(const DcmElement& element); 80 static DicomTag GetTag(const DcmElement& element);
71 81