X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.h;h=8728d51b58a0068aee944087edb5823b13dde942;hb=e24cb386c7f7f528be31335de6942dfbbf21334a;hp=78eba77999fe5d5fd795cd3b9c12d05dc9a4ad32;hpb=0287dd00505798c37e7fe9c31a4923151fb658eb;p=gdcm.git

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 78eba779..8728d51b 100644
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/27 21:28:56 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2005/10/20 14:45:11 $
+  Version:   $Revision: 1.23 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,21 +20,23 @@
 #define GDCMVR_H
 
 #include "gdcmCommon.h"
+#include "gdcmVRKey.h"
+
 #include <map>
 #include <string>
 #include <iostream>
+
 namespace gdcm 
 {
 
 //-----------------------------------------------------------------------------
-typedef std::string VRKey;
 typedef std::string VRAtr;
 /// Value Representation Hash Table
 typedef std::map<VRKey, VRAtr> VRHT;
 
 //-----------------------------------------------------------------------------
-/*
- * Container for dicom Value Representation Hash Table
+/**
+ * \brief Container for dicom Value Representation Hash Table
  * \note   This is a singleton
  */
 class GDCM_EXPORT VR 
@@ -44,9 +46,25 @@ public:
    ~VR();
 
    void Print(std::ostream &os = std::cout);
-   int Count(VRKey const & key);
-   bool IsVROfGdcmBinaryRepresentable(VRKey const & tested);
-   bool IsVROfGdcmStringRepresentable(VRKey const & tested);
+
+   /// \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);
+
+   /// \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"; }
+
+// Remove inline optimization for VS6
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
+   bool IsValidVR(VRKey const &key);
+#else
+   bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); }
+#endif
+
+   unsigned short GetAtomicElementLength(VRKey const &tested);
 
 private:
    VRHT vr;