ENH: Minor cleanup, mostly cosmetic

[gdcm.git] / src / gdcmVR.h

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 9301e24a2b59b9d24f523cb39cf3681e6c6489fe..933e7f0f8bce82dac03c644b100439a492cb4321 100644 (file)
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -1,4 +1,20 @@
-// gdcmVR.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/28 03:10:58 $
+  Version:   $Revision: 1.14 $
+                                                                                
+  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
@@ -6,20 +22,37 @@
 #include "gdcmCommon.h"
 #include <map>
 #include <string>
+#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;
+
+//-----------------------------------------------------------------------------
+/*
+ * Container for dicom Value Representation Hash Table
+ * \note   This is a singleton
+ */
+class GDCM_EXPORT VR 
+{
+public:
+   VR(void);
+   ~VR();
+
+   void Print(std::ostream &os = std::cout);
+   int Count(VRKey const & key);
+   bool IsVROfGdcmBinaryRepresentable(VRKey const & tested);
+   bool IsVROfGdcmStringRepresentable(VRKey const & tested);
 
-/// 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