Fix warnings, and fix TestWriteRead

[gdcm.git] / src / gdcmValEntry.h

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index b40401fa87c42cb2090dcbbcf7c45873fb913e5c..c2a21b84bb5057d012a3374486d65d5398b09c73 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -1,39 +1,71 @@
-// gdcmValEntry.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmValEntry.h,v $
+  Language:  C++
+  Date:      $Date: 2004/06/24 18:03:14 $
+  Version:   $Revision: 1.17 $
+                                                                                
+  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.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMValEntry_H
 #define GDCMValEntry_H
 
 #include <iostream>
 #include <stdio.h>
 
+#include "gdcmDocEntry.h"
+
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmBinEntry
+ * \ingroup gdcmValEntry
  * \brief   The dicom header of a Dicom file contains a set of such entries
  *          (when successfuly parsed against a given Dicom dictionary)
- *          This one contains a 'non string' value
  */
-class GDCM_EXPORT gdcmDocEntry  : public gdcmValEntry {
+class GDCM_EXPORT gdcmValEntry  : public gdcmDocEntry {
 
 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
+   inline std::string  GetValue()     { 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;  };
+          
+   virtual void Print(std::ostream &os = std::cout); 
+   virtual void Write(FILE *fp, FileType filetype);
 protected:
 
+   /// \brief for 'non string' values. Will be move to gdcmBinEntry, later
+   void* voidArea;  // clean it out later
+   
 private:
 
-// Variables
+// Members :
   
-   /// \brief Header Entry value, stores as a std::string (VR will be used,
-   /// later, to decode)
+   /// \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;
-
-
-
-
-
-
-
-
+};
 
 //-----------------------------------------------------------------------------
 #endif