ENH: Fix a shadow variable

[gdcm.git] / src / gdcmVR.h

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 3be7fa4c79ae2e8a8e80f0f63ef53c59df46dcc5..d5ba7785855df944b163b2cae818a5cb3b34701a 100644 (file)
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -1,28 +1,54 @@
-// gdcmVR.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.h,v $
+  Language:  C++
+  Date:      $Date: 2004/07/02 13:55:28 $
+  Version:   $Revision: 1.10 $
+                                                                                
+  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.
+                                                                                
+     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 <map>
 #include <string>
-#include "gdcmCommon.h"
+#include <iostream>
 
-typedef string VRKey;
-typedef string VRAtr;
-typedef map<VRKey, VRAtr> VRHT;    // Value Representation Hash Table
+//-----------------------------------------------------------------------------
+typedef std::string gdcmVRKey;
+typedef std::string gdcmVRAtr;
+/// Value Representation Hash Table
+typedef std::map<gdcmVRKey, gdcmVRAtr> gdcmVRHT;
 
+//-----------------------------------------------------------------------------
 /*
- * \defgroup gdcmVR
- * \brief  Container for dicom Value Representation Hash Table
+ * Container for dicom Value Representation Hash Table
  * \note   This is a singleton
  */
-class GDCM_EXPORT gdcmVR {
-private:
-   VRHT *dicom_vr;
+class GDCM_EXPORT gdcmVR 
+{
 public:
-       gdcmVR();
+   gdcmVR(void);
    ~gdcmVR();
-   int Count(VRKey);
+
+   void Print(std::ostream &os = std::cout);
+   int Count(gdcmVRKey key);
+   bool IsVROfGdcmBinaryRepresentable(gdcmVRKey);
+   bool IsVROfGdcmStringRepresentable(gdcmVRKey);
+
+private:
+   gdcmVRHT vr;
 };
 
+//-----------------------------------------------------------------------------
 #endif