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

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index f9fa8beb..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: 2004/10/10 00:42:55 $
-  Version:   $Revision: 1.25 $
+  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,43 +20,50 @@
 #define GDCMVALENTRY_H
 
 #include "gdcmDocEntry.h"
+#include "gdcmContentEntry.h"
+
 #include <iostream>
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmValEntry
- * \brief   The dicom header of a Dicom file contains a set of such entries
- *          (when successfuly parsed against a given Dicom dictionary)
+ * \brief   Any Dicom Document (File or DicomDir) contains 
+ *           a set of DocEntry  - Dicom entries -
+ *          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 gdcmValEntry  : public gdcmDocEntry
+class GDCM_EXPORT ValEntry  : public ContentEntry
 {
 public:
-   gdcmValEntry(gdcmDictEntry* e);
-   gdcmValEntry(gdcmDocEntry* d); 
-   virtual ~gdcmValEntry();
 
-   /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a
-   /// 'string', if it's stored as an integer in the header of the
-   /// current Dicom Document Entry
-   std::string & GetValue() { return Value; };
-    
-   /// Sets the value (string) of the current Dicom Document Entry
-   void SetValue(std::string const & val) { Value = val; };
+   // Contructors and Destructor are public.
+   ValEntry(DictEntry *e);
+   ValEntry(DocEntry *d); 
+
+   ~ValEntry();
+
+   // Other accessors are inherited from gdcm::ContentEntry
 
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype);
+   void Print(std::ostream &os = std::cout,std::string const & indent = ""); 
+
+   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:
    
 private:
-// Members :
-  
-   /// \brief Document Entry value, internaly represented as a std::string
-   ///        The Value Representation (\ref gdcmVR) is independently used
-   ///        in order to interpret (decode) this field.
-   std::string  Value;
+
 };
 
+} // end namespace gdcm
+
 //-----------------------------------------------------------------------------
 #endif