ENH: Minor cleanup, mostly cosmetic

[gdcm.git] / src / gdcmValEntry.h

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index c2a21b84bb5057d012a3374486d65d5398b09c73..6afc162f2180fc6b47f4dd57cfb48814e59e1c2d 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/24 18:03:14 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/10/28 03:10:58 $
+  Version:   $Revision: 1.29 $
                                                                                 
   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,56 +16,49 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMValEntry_H
-#define GDCMValEntry_H
-
-#include <iostream>
-#include <stdio.h>
+#ifndef GDCMVALENTRY_H
+#define GDCMVALENTRY_H
 
 #include "gdcmDocEntry.h"
+#include <iostream>
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmValEntry
+ * \ingroup ValEntry
  * \brief   The dicom header of a Dicom file contains a set of such entries
  *          (when successfuly parsed against a given Dicom dictionary)
  */
-class GDCM_EXPORT gdcmValEntry  : public gdcmDocEntry {
-
+class GDCM_EXPORT ValEntry  : public DocEntry
+{
 public:
-
-   gdcmValEntry(gdcmDictEntry* e);
-
-   gdcmValEntry(gdcmDocEntry* d); 
-   virtual ~gdcmValEntry();
+   ValEntry(DictEntry* e);
+   ValEntry(DocEntry* d); 
+   ~ValEntry();
 
    /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a
-   /// 'string', if it's stored as an integer in the header of the
+   /// 'string', event if it's stored as an integer in the header of the
    /// current Dicom Document Entry
-   inline std::string  GetValue()     { return value; };
+   std::string const & GetValue() const { return Value; };
     
    /// Sets the value (string) of the current Dicom Document Entry
-   inline void SetValue(std::string val)  { value = val;  };
-       
-   /// Sets the value (void *) of the current Dicom Document Entry
-   inline void SetVoidArea(void * val)  { voidArea = val;  };
-          
+   void SetValue(std::string const & val) { Value = val; };
+
    virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype);
-protected:
+   virtual void Write(std::ofstream *fp, FileType filetype);
 
-   /// \brief for 'non string' values. Will be move to gdcmBinEntry, later
-   void* voidArea;  // clean it out later
+protected:
    
 private:
-
 // Members :
   
    /// \brief Document Entry value, internaly represented as a std::string
-   ///        The Value Representation (\ref gdcmVR) is independently used
+   ///        The Value Representation (\ref VR) is independently used
    ///        in order to interpret (decode) this field.
-   std::string  value;
+   std::string Value;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif