According to Benoit's suggestion, and without any objection from anybody

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index bacbe5cf278ef919a829082f3d312ceb3271231b..dbef76f490e6c35e4e4b3884438d17dffdab5c2f 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 08:46:18 $
-  Version:   $Revision: 1.76 $
+  Date:      $Date: 2005/01/08 15:03:59 $
+  Version:   $Revision: 1.78 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -111,33 +111,33 @@ public:
 
 // Content entries
 
-   virtual bool SetEntryByNumber(std::string const &content,
-                                 uint16_t group, uint16_t element);
-   virtual bool SetEntryByNumber(uint8_t *content, int lgth,
-                                 uint16_t group, uint16_t element);
+   virtual bool SetEntry(std::string const &content,
+                         uint16_t group, uint16_t element);
+   virtual bool SetEntry(uint8_t *content, int lgth,
+                         uint16_t group, uint16_t element);
    virtual bool SetEntry(std::string const &content,ValEntry *entry);
    virtual bool SetEntry(uint8_t *content, int lgth,BinEntry *entry);
 
-   virtual void *GetEntryBinAreaByNumber(uint16_t group, uint16_t elem);   
+   virtual void *GetEntryBinArea(uint16_t group, uint16_t elem);   
 
-   virtual std::string GetEntryByNumber  (uint16_t group, uint16_t elem);
-   virtual std::string GetEntryVRByNumber(uint16_t group, uint16_t elem);
-   virtual int GetEntryLengthByNumber(uint16_t group, uint16_t elem);
+   virtual std::string GetEntry  (uint16_t group, uint16_t elem);
+   virtual std::string GetEntryVR(uint16_t group, uint16_t elem);
+   virtual int GetEntryLength(uint16_t group, uint16_t elem);
 
-   DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element); 
-   ValEntry *GetValEntryByNumber(uint16_t group, uint16_t element); 
-   BinEntry *GetBinEntryByNumber(uint16_t group, uint16_t element); 
+   DocEntry *GetDocEntry(uint16_t group, uint16_t element); 
+   ValEntry *GetValEntry(uint16_t group, uint16_t element); 
+   BinEntry *GetBinEntry(uint16_t group, uint16_t element); 
 
-   ValEntry *ReplaceOrCreateByNumber(std::string const &value,
-                                     uint16_t group, uint16_t elem,
-                                     TagName const &vr = GDCM_UNKNOWN);
-   BinEntry *ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
-                                     uint16_t group, uint16_t elem,
-                                     TagName const &vr = GDCM_UNKNOWN);
-   SeqEntry *ReplaceOrCreateByNumber(uint16_t group, uint16_t elem);
+   ValEntry *ReplaceOrCreate(std::string const &value,
+                             uint16_t group, uint16_t elem,
+                             TagName const &vr = GDCM_UNKNOWN);
+   BinEntry *ReplaceOrCreate(uint8_t* binArea, int lgth,
+                             uint16_t group, uint16_t elem,
+                             TagName const &vr = GDCM_UNKNOWN);
+   SeqEntry *ReplaceOrCreate(uint16_t group, uint16_t elem);
 
-   bool ReplaceIfExistByNumber ( std::string const &value,
-                                 uint16_t group, uint16_t elem );
+   bool ReplaceIfExist ( std::string const &value,
+                         uint16_t group, uint16_t elem );
    
    virtual void LoadEntryBinArea(uint16_t group, uint16_t elem);
    virtual void LoadEntryBinArea(BinEntry *entry);
@@ -161,7 +161,7 @@ protected:
    void ComputeRLEInfo();
    void ComputeJPEGFragmentInfo();
    // Entry
-   bool CheckIfEntryExistByNumber(uint16_t group, uint16_t elem );
+   bool CheckIfEntryExist(uint16_t group, uint16_t elem );
 
    int ComputeGroup0002Length( FileType filetype );
 
@@ -208,20 +208,19 @@ private:
 
    void LoadDocEntry         (DocEntry *e);
    void FindDocEntryLength   (DocEntry *e) throw ( FormatError );
+   uint32_t FindDocEntryLengthOBOrOW() throw( FormatUnexpected );
    std::string FindDocEntryVR();
    bool CheckDocEntryVR      (VRKey k);
 
-   std::string GetDocEntryValue  (DocEntry *e);
-   std::string GetDocEntryUnvalue(DocEntry *e);
+   std::string GetDocEntryValue  (DocEntry *entry);
+   std::string GetDocEntryUnvalue(DocEntry *entry);
 
 
-   void SkipDocEntry          (DocEntry *e);
-   void SkipToNextDocEntry    (long offset,long readLgth);
+   void SkipDocEntry          (DocEntry *entry);
+   void SkipToNextDocEntry    (DocEntry *entry);
 
-   void FixDocEntryFoundLength(DocEntry *e, uint32_t l);
-   bool IsDocEntryAnInteger   (DocEntry *e);
-
-   uint32_t FindDocEntryLengthOB() throw( FormatUnexpected );
+   void FixDocEntryFoundLength(DocEntry *entry,uint32_t l);
+   bool IsDocEntryAnInteger   (DocEntry *entry);
 
    uint16_t ReadInt16() throw ( FormatError );
    uint32_t ReadInt32() throw ( FormatError );