X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDataEntry.h;h=eba677c719869b9995c90711a2dc1f84e7cf4f2c;hb=779c8f5232ad160d353b90d3fa47d0503e17965d;hp=37d6d3e0644dbe2b64b1573063f0dbbfdfbc2066;hpb=af288a85afcf018ea938b95dc5c87284ee9b83d6;p=gdcm.git

diff --git a/src/gdcmDataEntry.h b/src/gdcmDataEntry.h
index 37d6d3e0..eba677c7 100644
--- 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/07 09:46:36 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/11/14 14:23:43 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,7 @@ class GDCM_EXPORT DataEntry  : public DocEntry
 
 public:
    static DataEntry *New(DictEntry *e) {return new DataEntry(e);}
-   static DataEntry *New(DocEntry *d) {return new DataEntry(d);}
+   static DataEntry *New(DocEntry *d)  {return new DataEntry(d);}
 
 // Print
    void Print(std::ostream &os = std::cout, std::string const &indent = "");
@@ -49,7 +49,7 @@ public:
    uint32_t ComputeFullLength();
    
 // Set/Get data
-   /// Sets the value (string) of the current Dicom entry
+   // 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
@@ -57,7 +57,7 @@ public:
    //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)         
+   ///  when it's not string-translatable (e.g : LUT table, overlay, icon)   
    uint8_t *GetBinArea()  { return BinArea; }
    void SetBinArea( uint8_t *area, bool self = true );
    void CopyBinArea( uint8_t *area, uint32_t length );
@@ -76,20 +76,20 @@ public:
    bool IsSelfArea() { return SelfArea; }
 
    ///\brief values for current state of a DataEntry (internal use only)
-   typedef enum
+   enum TValueState
    {
       STATE_LOADED    = 0x00,
       STATE_NOTLOADED = 0x01,
       STATE_UNFOUND   = 0x02,
       STATE_UNREAD    = 0x03
-   } TValueState;
+   };
    
    ///\brief values for current pixel status of a DataEntry (internal use only)
-   typedef enum
+   enum TValueFlag
    {
       FLAG_NONE       = 0x00,
       FLAG_PIXELDATA  = 0x01
-   } TValueFlag;
+   };
 
    // State
    void SetState(const TValueState &state) { State = state; }
@@ -101,7 +101,7 @@ public:
    /// \brief true if Entry not read    
    bool IsUnread()    { return State == STATE_UNREAD; }
    /// \brief true if Entry value properly loaded
-   bool IsGoodValue() { return State == 0; }
+   bool IsGoodValue() { return State == STATE_LOADED; }
 
    // Flags
    /// \brief sets the 'pixel data flag'   
@@ -109,7 +109,7 @@ public:
    /// \brief returns the 'pixel data flag'    
    const TValueFlag &GetFlag() const { return Flag; }
    /// \brief true id Entry is a Pixel Data entry
-   bool IsPixelData() { return (Flag & FLAG_PIXELDATA) != 0; }
+   bool IsPixelData() { return (Flag &FLAG_PIXELDATA) != 0; }
 
    void Copy(DocEntry *doc);
 
@@ -117,7 +117,8 @@ public:
    ///        will NOT be *printed* in order no to polute the screen output
    static const uint32_t &GetMaxSizePrintEntry() { return MaxSizePrintEntry; }
    /// \brief Header Elements too long will not be printed
-   static void SetMaxSizePrintEntry(const uint32_t &size) { MaxSizePrintEntry = size; }
+   static void SetMaxSizePrintEntry(const uint32_t &size) 
+                                                 { MaxSizePrintEntry = size; }
 
 protected:
    DataEntry(DictEntry *e);
@@ -141,7 +142,7 @@ protected:
 private:
    /// \brief 0 for straight entries, FLAG_PIXELDATA for Pixel Data entries
    TValueFlag Flag;
-   /// \brief Entry status : STATE_NOTLOADED,STATE_UNFOUND, STATE_UNREAD, 0
+   /// \brief Entry status:STATE_NOTLOADED,STATE_UNFOUND,STATE_UNREAD,STATE_LOADED
    TValueState State;
 
    /// \brief Size threshold above which an element val