X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.h;h=34275c6d2b7c8e755bc2c62ddb652a1adaade31c;hb=2767ee200a3dc05314954bd8bb3a0427f3fcb7d9;hp=54c465b19fd352ffbd697ecac7fa0258a9fffc9d;hpb=e40fc77cef3155aab87305ce2f8f14d1acbf158f;p=gdcm.git

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index 54c465b1..34275c6d 100644
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:28 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/01/21 11:40:56 $
+  Version:   $Revision: 1.37 $
                                                                                 
   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,55 @@
                                                                                 
 =========================================================================*/
 
-#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
- * \brief   The dicom header of a Dicom file contains a set of such entries
+ * \brief   Any Dicom Document (File header 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)
  */
-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
-   /// current Dicom Document Entry
-   std::string GetValue() { return value; };
+   /// '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 Document Entry
-   void SetValue(std::string val) { value = val; };
+   /// Sets the value (string) of the current Dicom entry.
+   /// The size is updated
+   virtual void SetValue(std::string const &val);
 
-   /// Sets the value (void *) of the current Dicom Document Entry
-   void SetVoidArea(void * val) { voidArea = val; };
+   virtual void Print(std::ostream &os = std::cout, std::string const & indent = ""); 
 
-   virtual void Print(std::ostream &os = std::cout); 
-   virtual void Write(FILE *fp, FileType filetype);
-protected:
+   virtual void WriteContent(std::ofstream *fp, FileType filetype);
 
-   /// \brief for 'non string' values. Will be move to gdcmBinEntry, later
-   void* voidArea;  // clean it out later
+protected:
+   /// Sets the value (string) of the current Dicom entry
+   void SetValueOnly(std::string const &val) { Value = val; }; 
    
 private:
-
 // Members :
   
-   /// \brief Document Entry value, internaly represented as a std::string
-   ///        The Value Representation (\ref gdcmVR) is independently used
+   /// \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;
+   std::string Value;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif