X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.h;h=5eae1d58c972d6699dbe64d5c7c99f45fd0f347b;hb=4f9bdf403cb37c61df4da30f9fd9f5d9fe4da9bb;hp=efbc1375e158017760a7971983b9c83959c2dc94;hpb=95bd53cf67628322e4fa7280ef2397f042ec1c77;p=gdcm.git

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index efbc1375..5eae1d58 100644
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/20 16:35:10 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/24 16:10:52 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,7 +24,7 @@
 
 namespace gdcm 
 {
-class Header;
+class File;
 class ValEntry;
 class BinEntry;
 class PixelReadConvert;
@@ -32,7 +32,7 @@ class PixelWriteConvert;
 class DocEntryArchive;
 //-----------------------------------------------------------------------------
 /**
- * \brief In addition to Dicom Header exploration, this class is designed
+ * \brief In addition to Dicom header exploration, this class is designed
  * for accessing the image/volume content. One can also use it to
  * write Dicom/ACR-NEMA/RAW files.
  */
@@ -47,15 +47,15 @@ public:
      
 public:
    FileHelper( );
-   FileHelper( Header *header );
+   FileHelper( File *header );
    FileHelper( std::string const &filename );
  
    virtual ~FileHelper();
 
    void Print(std::ostream &os = std::cout, std::string const & indent = ""); 
 
-   /// Accessor to \ref Header
-   Header *GetHeader() { return HeaderInternal; }
+   /// Accessor to \ref File
+   File *GetFile() { return FileInternal; }
 
    size_t GetImageDataSize();
    size_t GetImageDataRawSize();
@@ -66,14 +66,14 @@ public:
 
    void SetImageData(uint8_t *data, size_t expectedSize);
 
-   // User datas
+   // User data
    void SetUserData(uint8_t *data, size_t expectedSize);
    uint8_t* GetUserData();
    size_t GetUserDataSize();
-   // RBG datas (from file
+   // RBG data (from file
    uint8_t* GetRGBData();
    size_t GetRGBDataSize();
-   // RAW datas (from file
+   // RAW data (from file
    uint8_t* GetRawData();
    size_t GetRawDataSize();
 
@@ -86,9 +86,9 @@ public:
    bool WriteAcr      (std::string const &fileName);
    bool Write         (std::string const &fileName);
 
-   bool SetEntry(std::string const &content,
+   bool SetEntryValue(std::string const &content,
                  uint16_t group, uint16_t elem);
-   bool SetEntry(uint8_t *content, int lgth,
+   bool SetEntryBinArea(uint8_t *content, int lgth,
                  uint16_t group, uint16_t elem);
    bool ReplaceOrCreate(std::string const &content,
                         uint16_t group, uint16_t elem);
@@ -98,7 +98,7 @@ public:
    uint8_t* GetLutRGBA();
 
    // Write mode
-   void SetWriteModeToRaw() { SetWriteMode(WMODE_RAW); };
+   void SetWriteModeToRaw()          { SetWriteMode(WMODE_RAW); };
    void SetWriteModeToRGB()          { SetWriteMode(WMODE_RGB); };
    void SetWriteMode(FileMode mode)  { WriteMode = mode; };
    FileMode GetWriteMode()           { return WriteMode; };
@@ -131,15 +131,15 @@ protected:
    BinEntry *CopyBinEntry(uint16_t group,uint16_t elem);
 
 private:
-   void Initialise();
+   void Initialize();
 
    uint8_t *GetRaw();
 
 // members variables:
-   /// Header to use to load the file
-   Header *HeaderInternal;
+   /// gdcm::File to use to load the file
+   File *FileInternal;
 
-   /// \brief Whether the underlying \ref Header was loaded by
+   /// \brief Whether the underlying \ref gdcm::File was loaded by
    ///  the constructor or passed to the constructor. When false
    ///  the destructor is in charge of deletion.
    bool SelfHeader;