ENH: Try to sync gdcm CVS and gdcm 1.2. ~2000 lines of changes, please be gentle...

[gdcm.git] / src / gdcmDataEntry.h

diff --git a/src/gdcmDataEntry.h b/src/gdcmDataEntry.h
index eba677c719869b9995c90711a2dc1f84e7cf4f2c..d3a37de21a015dd102af0f5d91392446d150cc35 100644 (file)
--- a/src/gdcmDataEntry.h
+++ b/src/gdcmDataEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/14 14:23:43 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2006/01/20 09:17:25 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,9 @@ class GDCM_EXPORT DataEntry  : public DocEntry
    gdcmTypeMacro(DataEntry);
 
 public:
+/// \brief Contructs a DataEntry with a RefCounter from DictEntry
    static DataEntry *New(DictEntry *e) {return new DataEntry(e);}
+/// \brief Contructs a DataEntry with a RefCounter from DocEntry
    static DataEntry *New(DocEntry *d)  {return new DataEntry(d);}
 
 // Print
@@ -51,10 +53,6 @@ public:
 // Set/Get data
    // Sets the value (string) of the current Dicom entry
    //virtual void SetValue(std::string const &val);
-   /// \brief Returns the 'Value' (e.g. "Dupond^Marcel") converted 
-   /// into a 'string', event if it's physically stored on disk as an integer
-   /// (e.g. : 0x000c returned as "12")
-   //virtual std::string const &GetValue() const { return Value; }
 
    /// \brief Returns the area value of the current Dicom Entry
    ///  when it's not string-translatable (e.g : LUT table, overlay, icon)   
@@ -92,8 +90,10 @@ public:
    };
 
    // State
+   /// \brief Sets the state (Loaded, NotLoaded, UnFound, ...) of the DataEntry
    void SetState(const TValueState &state) { State = state; }
-   const TValueState &GetState() const { return State; }
+   /// \brief Returns the state (Loaded, NotLoaded, ...) of the DataEntry
+      const TValueState &GetState() const { return State; }
    /// \brief true when value Entry not loaded  
    bool IsNotLoaded() { return State == STATE_NOTLOADED; }
    /// \brief true if Entry not found  
@@ -111,7 +111,7 @@ public:
    /// \brief true id Entry is a Pixel Data entry
    bool IsPixelData() { return (Flag &FLAG_PIXELDATA) != 0; }
 
-   void Copy(DocEntry *doc);
+   virtual void Copy(DocEntry *doc);
 
    /// \brief returns the size threshold above which an element value 
    ///        will NOT be *printed* in order no to polute the screen output
@@ -145,8 +145,7 @@ private:
    /// \brief Entry status:STATE_NOTLOADED,STATE_UNFOUND,STATE_UNREAD,STATE_LOADED
    TValueState State;
 
-   /// \brief Size threshold above which an element val
-   ///        By default, this upper bound is fixed to 64 bytes.
+   /// \brief Size threshold above which an element is printed
    static uint32_t MaxSizePrintEntry;   
 };