* Reorder source code

[gdcm.git] / src / gdcmValEntry.h

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index 86f4f43679c6bc4d5234381dae3813bd60f8ec12..8c13e78f6c353177ff76d2baa63b38a51cb995b1 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/21 04:43:02 $
-  Version:   $Revision: 1.11 $
+  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
-  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,54 +16,54 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMValEntry_H
-#define GDCMValEntry_H
-
-#include <iostream>
-#include <stdio.h>
+#ifndef GDCMVALENTRY_H
+#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();
+   // Contructors and Destructor are public.
+   ValEntry(DictEntry *e);
+   ValEntry(DocEntry *d); 
 
-   /// \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
-   inline std::string  GetValue(void)     { return value; };
-    
-   /// Sets the value (string) of the current Dicom Document Entry
-   inline void SetValue(std::string val)  { value = val;  };
-   
-   virtual void Print(std::ostream &os = std::cout); 
-           
-protected:
+   ~ValEntry();
 
-   /// \brief for 'non string' values. Will be move to gdcmBinEntry, later
-   void* voidArea;  // clean it out later
+   // Other accessors are inherited from gdcm::ContentEntry
+
+   void Print(std::ostream &os = std::cout,std::string const & indent = ""); 
+
+   void WriteContent(std::ofstream *fp, FileType filetype); 
    
-private:
+   /// Sets the value (string) of the current Dicom entry.
+   /// The size is updated
+   void SetValue(std::string const &val);
 
-// Variables
-  
-   /// \brief Document Entry value, stored as a std::string (VR will be used,
-   /// later, to decode)
+protected:
    
-   std::string  value;
+private:
 
 };
 
+} // end namespace gdcm
+
 //-----------------------------------------------------------------------------
 #endif