Now AddEntry works in the correct spot

[gdcm.git] / src / gdcmDocEntry.h

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 2a5ddc89617bd25a2dae2064a0f417463c8f3d20..a76778b6fa4d0aad425a23c97754c763587f98d2 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/21 11:40:55 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/01/31 12:19:33 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,6 +43,8 @@ public:
    DocEntry(DictEntry*);
    virtual ~DocEntry() {};
 
+   virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); 
+
    /// Returns the Dicom Group number of the current Dicom entry
    uint16_t      GetGroup()     { return DicomDict->GetGroup();  };
 
@@ -77,7 +79,6 @@ public:
    /// \warning offset of the *value*, not of the Dicom entry
    size_t GetOffset() { return Offset; };
 
-
    /// \brief Sets only 'Read Length' (*not* 'Usable Length') of the current
    /// Dicom entry
    void SetReadLength(uint32_t l) { ReadLength = l; };
@@ -128,21 +129,12 @@ public:
    
    uint32_t GetFullLength();
    
-   void Copy(DocEntry *doc);
+   virtual void Copy(DocEntry *e);
 
    bool IsItemDelimitor();
    bool IsSequenceDelimitor();   
 
-   virtual void Print (std::ostream &os = std::cout, std::string const & indent = ""); 
-
 protected:
-   /// \brief   Sets the DicEntry of the current Dicom entry
-   /// \remarks Used only by the gdcm::File !!! (possible because of a friend 
-   ///          link between them)
-   /// @param   newEntry pointer to the DictEntry
-   void SetDictEntry(DictEntry *newEntry) { DicomDict = newEntry; };
-
-// Variables
    /// \brief pointer to the underlying Dicom dictionary element
    DictEntry *DicomDict;
    
@@ -158,7 +150,7 @@ protected:
    /// breaking the underlying dictionary.
    bool ImplicitVR;
 
-   /// Offset from the begining of file for direct user access
+   /// Offset from the beginning of file for direct user access
    size_t Offset; 
 
    /// \brief Generalized key of this DocEntry (for details on
@@ -166,9 +158,6 @@ protected:
    TagKey Key;
 
 private:
-   // FIXME: In fact we should be more specific and use :
-   // friend DocEntry *File::ReadNextElement(void);
-   friend class File;    
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------