X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.h;h=8c13e78f6c353177ff76d2baa63b38a51cb995b1;hb=0416947420d9168401c99e7fbf0dca0a081c9175;hp=34275c6d2b7c8e755bc2c62ddb652a1adaade31c;hpb=c094e185dd6404df031524ccae8e1b51e3b84871;p=gdcm.git

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index 34275c6d..8c13e78f 100644
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/21 11:40:56 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/02/02 16:18:49 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,7 @@
 #define GDCMVALENTRY_H
 
 #include "gdcmDocEntry.h"
+#include "gdcmContentEntry.h"
 
 #include <iostream>
 
@@ -27,43 +28,40 @@ namespace gdcm
 {
 //-----------------------------------------------------------------------------
 /**
- * \brief   Any Dicom Document (File header or DicomDir) contains 
+ * \brief   Any Dicom Document (File or DicomDir) contains 
  *           a set of DocEntry  - Dicom entries -
- *          (when successfuly parsed against a given Dicom dictionary)
- *          ValEntry is an elementary DocEntry (as opposed to SeqEntry)
+ *          ValEntry is an elementary DocEntry (i.e. a ContentEntry, 
+ *           as opposed to SeqEntry)
+ *          whose content is 'std::string representable' : characters,
+ *          or integers (loaded in memory as a std::string)
+ *          ValEntry is a specialisation of ContentEntry
  */
-class GDCM_EXPORT ValEntry  : public DocEntry
+class GDCM_EXPORT ValEntry  : public ContentEntry
 {
 public:
+
+   // Contructors and Destructor are public.
    ValEntry(DictEntry *e);
    ValEntry(DocEntry *d); 
+
    ~ValEntry();
 
-   /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a
-   /// 'string', event if it's physically stored as an integer in the header of the
-   /// current Document (File or DicomDir)
-   std::string const &GetValue() const { return Value; };
-    
-   /// Sets the value (string) of the current Dicom entry.
-   /// The size is updated
-   virtual void SetValue(std::string const &val);
+   // Other accessors are inherited from gdcm::ContentEntry
 
-   virtual void Print(std::ostream &os = std::cout, std::string const & indent = ""); 
+   void Print(std::ostream &os = std::cout,std::string const & indent = ""); 
 
-   virtual void WriteContent(std::ofstream *fp, FileType filetype);
+   void WriteContent(std::ofstream *fp, FileType filetype); 
+   
+   /// Sets the value (string) of the current Dicom entry.
+   /// The size is updated
+   void SetValue(std::string const &val);
 
 protected:
-   /// Sets the value (string) of the current Dicom entry
-   void SetValueOnly(std::string const &val) { Value = val; }; 
    
 private:
-// Members :
-  
-   /// \brief Dicom entry value, internaly represented as a std::string.
-   ///        The Value Representation (\ref VR) is independently used
-   ///        in order to interpret (decode) this field.
-   std::string Value;
+
 };
+
 } // end namespace gdcm
 
 //-----------------------------------------------------------------------------