X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDocEntry.h;h=724c9b83465b4adb3531656df504ae3dd631be11;hb=d9145e01b1e8f7f5378def524f6ffd5f9491abaf;hp=2a5ddc89617bd25a2dae2064a0f417463c8f3d20;hpb=c094e185dd6404df031524ccae8e1b51e3b84871;p=gdcm.git

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 2a5ddc89..724c9b83 100644
--- 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/07/11 14:40:40 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -41,19 +41,27 @@ class GDCM_EXPORT DocEntry : public Base
 {
 public:
    DocEntry(DictEntry*);
+   /// \brief Canonical Destructor
    virtual ~DocEntry() {};
 
+   virtual void Print (std::ostream &os = std::cout, std::string const &indent = ""); 
+   virtual void WriteContent(std::ofstream *fp, FileType filetype);
+
+   /// \brief  Gets the DicEntry of the current Dicom entry
+   /// @return The DicEntry of the current Dicom entry
+   DictEntry * GetDictEntry() { return DicomDict; }; 
+
    /// Returns the Dicom Group number of the current Dicom entry
    uint16_t      GetGroup()     { return DicomDict->GetGroup();  };
 
    /// Returns the Dicom Element number of the current Dicom entry
    uint16_t      GetElement()   { return DicomDict->GetElement();};
 
-   /// Returns the 'key' of the current Dicom entry
+   /// Set the 'key' of the current Dicom entry
    void  SetKey( TagKey const &key ) { Key = key; }
 
    /// Returns the 'key' of the current Dicom entry
-   std::string const &GetKey() const { return Key; }
+   TagKey const &GetKey() const { return Key; }
 
    /// \brief Returns the 'Name' '(e.g. "Patient's Name") found in the Dicom
    /// Dictionnary of the current Dicom Header Entry
@@ -77,11 +85,9 @@ 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; };
-
    /// \brief Returns the 'read length' of the current Dicom entry
    /// \warning this value is the one stored in the Dicom header but not
    ///          mandatoryly the one thats's used (in case on SQ, or delimiters,
@@ -91,15 +97,14 @@ public:
    /// \brief Sets both 'Read Length' and 'Usable Length' of the current
    /// Dicom entry
    void SetLength(uint32_t l) { Length = l; };
-      
    /// \brief Returns the actual value length of the current Dicom entry
    /// \warning this value is not *always* the one stored in the Dicom header
    ///          in case of well knowned bugs
    uint32_t GetLength() { return Length; };
-    
 
-   // The following 3 members, for internal use only ! 
-   
+   uint32_t GetFullLength();
+
+// The following 3 members, for internal use only ! 
    /// \brief   Sets the offset of the Dicom entry
    /// \warning use with caution !
    /// @param   of offset to be set
@@ -120,29 +125,12 @@ public:
    /// @return true if the VM is unknown
    bool IsVMUnknown() { return DicomDict->IsVMUnknown(); };
 
-   /// \brief  Gets the DicEntry of the current Dicom entry
-   /// @return The DicEntry of the current Dicom entry
-   DictEntry * GetDictEntry() { return DicomDict; }; 
-   
-   virtual void WriteContent(std::ofstream *fp, FileType filetype);
-   
-   uint32_t GetFullLength();
-   
-   void Copy(DocEntry *doc);
-
    bool IsItemDelimitor();
    bool IsSequenceDelimitor();   
-
-   virtual void Print (std::ostream &os = std::cout, std::string const & indent = ""); 
+   
+   virtual void Copy(DocEntry *e);
 
 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 +146,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 +154,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
 //-----------------------------------------------------------------------------