X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.h;h=b187b30f12d8f31c0cd4a97e1d57ae22e03c4ef5;hb=db08881d6b93af8af99bf1b114c72828454c20a3;hp=7dd8e1ff8c1924937445c3dc83eb48bf748b727e;hpb=9f596ccd6001b165eca959c6a7b104eb10ff9911;p=gdcm.git

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 7dd8e1ff..b187b30f 100644
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -1,37 +1,82 @@
-// gdcmVR.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.h,v $
+  Language:  C++
+  Date:      $Date: 2007/05/23 14:18:12 $
+  Version:   $Revision: 1.32 $
+                                                                                
+  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 "gdcmCommon.h"
+#include "gdcmRefCounter.h"
+#include "gdcmVRKey.h"
+
 #include <map>
 #include <string>
 #include <iostream>
 
+namespace GDCM_NAME_SPACE 
+{
+
 //-----------------------------------------------------------------------------
-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;
 
 //-----------------------------------------------------------------------------
-/*
- * Container for dicom Value Representation Hash Table
+/**
+ * \brief Container for dicom Value Representation Hash Table
  * \note   This is a singleton
  */
-class GDCM_EXPORT gdcmVR 
+class GDCM_EXPORT VR : public RefCounter
 {
+   gdcmTypeMacro(VR);
+
 public:
-	gdcmVR(void);
-   ~gdcmVR();
+   static VR *New() {return new VR();}
+
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const & = "" );
+
+   /// \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 if 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);
 
-   void Print(std::ostream &os = std::cout);
-   int Count(VRKey key);
-   bool IsVROfGdcmBinaryRepresentable(VRKey);
-   bool IsVROfGdcmStringRepresentable(VRKey);
+protected:
+   VR();
+   ~VR();
 
 private:
    VRHT vr;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif