comparison OrthancServer/FromDcmtkBridge.h @ 1744:b3de74dec2d5 db-changes

integration mainline->db-changes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 26 Oct 2015 12:30:34 +0100
parents ec66a16aa398
children 57b9e6890482
comparison
equal deleted inserted replaced
1729:54d78925cbb6 1744:b3de74dec2d5
63 static bool IsPrivateTag(const DicomTag& tag); 63 static bool IsPrivateTag(const DicomTag& tag);
64 64
65 static bool IsUnknownTag(const DicomTag& tag); 65 static bool IsUnknownTag(const DicomTag& tag);
66 66
67 static DicomValue* ConvertLeafElement(DcmElement& element, 67 static DicomValue* ConvertLeafElement(DcmElement& element,
68 DicomToJsonFlags flags,
68 Encoding encoding); 69 Encoding encoding);
69 70
70 static void ToJson(Json::Value& parent, 71 static void ToJson(Json::Value& parent,
71 DcmElement& element, 72 DcmElement& element,
72 DicomToJsonFormat format, 73 DicomToJsonFormat format,
74 DicomToJsonFlags flags,
73 unsigned int maxStringLength, 75 unsigned int maxStringLength,
74 Encoding encoding); 76 Encoding dicomEncoding);
75 77
76 static void ToJson(Json::Value& target, 78 static void ToJson(Json::Value& target,
77 DcmDataset& dataset, 79 DcmDataset& dataset,
78 DicomToJsonFormat format, 80 DicomToJsonFormat format,
81 DicomToJsonFlags flags,
79 unsigned int maxStringLength); 82 unsigned int maxStringLength);
80 83
81 static std::string GetName(const DicomTag& tag); 84 static std::string GetName(const DicomTag& tag);
82 85
83 static DicomTag ParseTag(const char* name); 86 static DicomTag ParseTag(const char* name);
104 DicomValue* value) 107 DicomValue* value)
105 { 108 {
106 target.SetValue(ParseTag(tagName), value); 109 target.SetValue(ParseTag(tagName), value);
107 } 110 }
108 111
109 static void Print(FILE* fp,
110 const DicomMap& m);
111
112 static void ToJson(Json::Value& result, 112 static void ToJson(Json::Value& result,
113 const DicomMap& values, 113 const DicomMap& values,
114 bool simplify); 114 bool simplify);
115 115
116 static std::string GenerateUniqueIdentifier(ResourceType level); 116 static std::string GenerateUniqueIdentifier(ResourceType level);