X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.h;h=2fed34d18eec9b28ee3c865b9c145ee305fcf18e;hb=3b1f8ebdc8a9483b7b6971821c06293ac8ed7363;hp=68d7fee3940e5c6fb979329bfba7011fb530db3a;hpb=05abd393cf82392c894dd1d852e2273b0648671d;p=gdcm.git

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 68d7fee3..2fed34d1 100644
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -1,25 +1,82 @@
-// gdcmVR.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.h,v $
+  Language:  C++
+  Date:      $Date: 2005/10/26 08:04:16 $
+  Version:   $Revision: 1.26 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
 #ifndef GDCMVR_H
 #define GDCMVR_H
 
+#include "gdcmRefCounter.h"
+#include "gdcmVRKey.h"
+
 #include <map>
 #include <string>
-#include "gdcmCommon.h"
+#include <iostream>
+
+namespace gdcm 
+{
 
-typedef std::string VRKey;
+//-----------------------------------------------------------------------------
 typedef std::string VRAtr;
-typedef std::map<VRKey, VRAtr> VRHT;    // Value Representation Hash Table
+/// Value Representation Hash Table
+typedef std::map<VRKey, VRAtr> VRHT;
+
+//-----------------------------------------------------------------------------
+/**
+ * \brief Container for dicom Value Representation Hash Table
+ * \note   This is a singleton
+ */
+class GDCM_EXPORT VR : public RefCounter
+{
+   gdcmTypeMacro(VR);
+
+public:
+   static VR *New() {return new VR();}
+
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const &indent = "" );
+
+   /// \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
+/// \brief checks is a supposed-to-be VR is a 'legal' one.
+   bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); }
+#endif
+
+   unsigned short GetAtomicElementLength(VRKey const &tested);
+
+protected:
+   VR();
+   ~VR();
 
-/// Container for dicom Value Representation Hash Table
-/// \note   This is a singleton
-class GDCM_EXPORT gdcmVR {
 private:
    VRHT vr;
-public:
-	gdcmVR(void);
-   ~gdcmVR();
-   int Count(VRKey key);
 };
+} // end namespace gdcm
 
+//-----------------------------------------------------------------------------
 #endif