Fix mistypings

[gdcm.git] / src / gdcmVR.h

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index d5ba7785855df944b163b2cae818a5cb3b34701a..80d6a3406b34a333e06d06fc59a95c2ebd8be632 100644 (file)
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:28 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2007/09/17 12:16:01 $
+  Version:   $Revision: 1.34 $
                                                                                 
   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.htm for details.
+  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
@@ -16,39 +16,67 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMVR_H
-#define GDCMVR_H
+#ifndef _GDCMVR_H_
+#define _GDCMVR_H_
+
+#include "gdcmRefCounter.h"
+#include "gdcmVRKey.h"
 
-#include "gdcmCommon.h"
 #include <map>
 #include <string>
 #include <iostream>
 
+namespace GDCM_NAME_SPACE 
+{
+
 //-----------------------------------------------------------------------------
-typedef std::string gdcmVRKey;
-typedef std::string gdcmVRAtr;
+typedef std::string VRAtr;
 /// Value Representation Hash Table
-typedef std::map<gdcmVRKey, gdcmVRAtr> gdcmVRHT;
+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 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(gdcmVRKey key);
-   bool IsVROfGdcmBinaryRepresentable(gdcmVRKey);
-   bool IsVROfGdcmStringRepresentable(gdcmVRKey);
+protected:
+   VR();
+   ~VR();
 
 private:
-   gdcmVRHT vr;
+   VRHT vr;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif