diff OrthancServer/FromDcmtkBridge.h @ 2006:6301bbcbcaed

more generic support of value representations
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 09 Jun 2016 14:48:40 +0200
parents 9b61701c35f2
children a657f7772e69
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.h	Wed Jun 08 12:36:21 2016 +0200
+++ b/OrthancServer/FromDcmtkBridge.h	Thu Jun 09 14:48:40 2016 +0200
@@ -50,7 +50,7 @@
     static void InitializeDictionary();
 
     static void RegisterDictionaryTag(const DicomTag& tag,
-                                      const DcmEVR& vr,
+                                      ValueRepresentation vr,
                                       const std::string& name,
                                       unsigned int minMultiplicity,
                                       unsigned int maxMultiplicity);
@@ -131,7 +131,9 @@
     static bool SaveToMemoryBuffer(std::string& buffer,
                                    DcmDataset& dataSet);
 
-    static ValueRepresentation GetValueRepresentation(const DicomTag& tag);
+    static ValueRepresentation Convert(DcmEVR vr);
+
+    static ValueRepresentation LookupValueRepresentation(const DicomTag& tag);
 
     static DcmElement* CreateElementForTag(const DicomTag& tag);
     
@@ -146,8 +148,6 @@
                                 bool decodeDataUriScheme,
                                 Encoding dicomEncoding);
 
-    static DcmEVR ParseValueRepresentation(const std::string& s);
-
     static DcmPixelSequence* GetPixelSequence(DcmDataset& dataset);
 
     static Encoding ExtractEncoding(const Json::Value& json,