ENH: Reorganize the code to prepare multiple fragments

[gdcm.git] / src / gdcmVR.h

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 1b4af5611dcc34ab95d61a7eb731bdbc991a54ba..f3fca668413ae4f1569a2f28dea52421791ed4de 100644 (file)
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/11 15:15:38 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/10/18 12:58:29 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,8 @@
 #define GDCMVR_H
 
 #include "gdcmCommon.h"
+#include "gdcmVRKey.h"
+
 #include <map>
 #include <string>
 #include <iostream>
@@ -28,7 +30,6 @@ namespace gdcm
 {
 
 //-----------------------------------------------------------------------------
-typedef std::string VRKey;
 typedef std::string VRAtr;
 /// Value Representation Hash Table
 typedef std::map<VRKey, VRAtr> VRHT;
@@ -46,12 +47,19 @@ public:
 
    void Print(std::ostream &os = std::cout);
 
-   int Count(VRKey const &key);
+   /// \brief   Get the count for an element
+   int Count(VRKey const &key) { return vr.count(key); };
+
    bool IsVROfBinaryRepresentable(VRKey const &tested);
    bool IsVROfStringRepresentable(VRKey const &tested);
-   bool IsVROfSequence(VRKey const &tested);
 
-   bool IsValidVR(VRKey const &key);
+   /// \brief   Simple predicate that checks whether the given argument
+   ///          corresponds to the Value Representation of a \ref SeqEntry
+   bool IsVROfSequence(VRKey const &tested) { return tested == "SQ"; }
+
+   bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); }
+
+   unsigned short GetAtomicElementLength(VRKey const &vr);
 
 private:
    VRHT vr;