Mercurial > hg > orthanc

comparison OrthancServer/FromDcmtkBridge.h @ 2128:9329ba17a069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Possibility to DELETE "dicom-as-json" attachments to reconstruct them
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Nov 2016 15:13:16 +0100
parents 03b065778fc3
children bb199bccdc45
comparison
equal deleted inserted replaced
2127:bfa92c9328d7 2128:9329ba17a069
55 { 55 {
56 #if ORTHANC_BUILD_UNIT_TESTS == 1 56 #if ORTHANC_BUILD_UNIT_TESTS == 1
57 FRIEND_TEST(FromDcmtkBridge, FromJson); 57 FRIEND_TEST(FromDcmtkBridge, FromJson);
58 #endif 58 #endif
59 59
60 friend class ParsedDicomFile;
61
60 private: 62 private:
61 FromDcmtkBridge(); // Pure static class 63 FromDcmtkBridge(); // Pure static class
62 64
63 static void ExtractDicomSummary(DicomMap& target, 65 static void ExtractDicomSummary(DicomMap& target,
64 DcmItem& dataset, 66 DcmItem& dataset,
77 DicomToJsonFormat format, 79 DicomToJsonFormat format,
78 DicomToJsonFlags flags, 80 DicomToJsonFlags flags,
79 unsigned int maxStringLength, 81 unsigned int maxStringLength,
80 Encoding dicomEncoding); 82 Encoding dicomEncoding);
81 83
84 static void ExtractDicomAsJson(Json::Value& target,
85 DcmDataset& dataset,
86 DicomToJsonFormat format,
87 DicomToJsonFlags flags,
88 unsigned int maxStringLength);
89
82 public: 90 public:
83 static void InitializeDictionary(); 91 static void InitializeDictionary();
84 92
85 static void RegisterDictionaryTag(const DicomTag& tag, 93 static void RegisterDictionaryTag(const DicomTag& tag,
86 ValueRepresentation vr, 94 ValueRepresentation vr,
108 DicomToJsonFlags flags, 116 DicomToJsonFlags flags,
109 unsigned int maxStringLength, 117 unsigned int maxStringLength,
110 Encoding encoding); 118 Encoding encoding);
111 119
112 static void ExtractDicomAsJson(Json::Value& target, 120 static void ExtractDicomAsJson(Json::Value& target,
113 DcmDataset& dataset, 121 DcmDataset& dataset)
114 DicomToJsonFormat format, 122 {
115 DicomToJsonFlags flags, 123 ExtractDicomAsJson(target, dataset, DicomToJsonFormat_Full, DicomToJsonFlags_Default, ORTHANC_MAXIMUM_TAG_LENGTH);
116 unsigned int maxStringLength); 124 }
117 125
118 static void ExtractHeaderAsJson(Json::Value& target, 126 static void ExtractHeaderAsJson(Json::Value& target,
119 DcmMetaInfo& header, 127 DcmMetaInfo& header,
120 DicomToJsonFormat format, 128 DicomToJsonFormat format,
121 DicomToJsonFlags flags, 129 DicomToJsonFlags flags,