X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.h;h=7e4e8d9901c6e5acb2151e3aa90c2737311df69c;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=628f8bca77c40f22255d23aeeb26d9fc7a7004e4;hpb=9649936f884197f6f6260aae051d33729bce07d5;p=gdcm.git

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 628f8bca..7e4e8d99 100644
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/28 03:10:57 $
-  Version:   $Revision: 1.56 $
+  Date:      $Date: 2004/11/26 10:55:04 $
+  Version:   $Revision: 1.66 $
  
   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,7 @@ namespace gdcm
 
 enum TransferSyntaxType {
   ImplicitVRLittleEndian = 0,
+  ImplicitVRLittleEndianDLXGE,
   ExplicitVRLittleEndian,
   DeflatedExplicitVRLittleEndian,
   ExplicitVRBigEndian,
@@ -149,23 +150,23 @@ public:
    std::ifstream * OpenFile();
    bool CloseFile();
 
-   void Write( std::ofstream* fp, FileType type );
+   void WriteContent( std::ofstream* fp, FileType type );
 
    ValEntry* ReplaceOrCreateByNumber(std::string const & value,
                                      uint16_t group, uint16_t elem,
-                                     std::string const & vr = "unkn");
+                                     TagName const & vr = "unkn");
    
    BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
                                      uint16_t group, uint16_t elem,
-                                     std::string const & vr = "unkn");
+                                     TagName const & vr = "unkn");
 
    SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem);
 
    bool ReplaceIfExistByNumber ( std::string const & value,
                                  uint16_t group, uint16_t elem );
    
-   virtual void* LoadEntryBinArea(uint16_t group, uint16_t elem);
-   virtual void* LoadEntryBinArea(BinEntry* entry);
+   virtual void LoadEntryBinArea(uint16_t group, uint16_t elem);
+   virtual void LoadEntryBinArea(BinEntry* entry);
       
    // System access (meaning endian related !?)
    uint16_t SwapShort(uint16_t);   // needed by File
@@ -173,6 +174,8 @@ public:
    uint16_t UnswapShort(uint16_t); // needed by File
    uint32_t UnswapLong(uint32_t);  // needed by File
 
+   static std::string GetTransferSyntaxValue(TransferSyntaxType type);
+
 protected:
    // Constructor and destructor are protected to forbid end user 
    // to instanciate from this class Document (only Header and
@@ -194,24 +197,33 @@ public:
    virtual int     GetEntryLengthByNumber(uint16_t group, uint16_t elem);
 //protected:
    virtual bool SetEntryByName  (std::string const & content, 
-                                 std::string const & tagName);
+                                 TagName const & tagName );
    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 SetEntryLengthByNumber(uint32_t length,
-                                       uint16_t group, uint16_t element);
-
-   virtual size_t GetEntryOffsetByNumber (uint16_t group, uint16_t elem);
+   // FIXME
+   // Verify the usefull of this method... otherwise remove it
+   // It's body is commented in the .xx
+   //virtual bool SetEntryLengthByNumber(uint32_t length,
+   //                                    uint16_t group, uint16_t element);
+
+   // FIXME
+   // Verify the usefull of this method... otherwise remove it
+   // It's body is commented in the .xx
+   // virtual size_t GetEntryOffsetByNumber(uint16_t group, uint16_t elem);
    virtual void* GetEntryBinAreaByNumber(uint16_t group, uint16_t elem);   
-   virtual bool  SetEntryBinAreaByNumber(uint8_t* a, uint16_t group,
-                                                   uint16_t elem);
+   // FIXME
+   // Verify the usefull of this method... otherwise remove it
+   // It's body is commented in the .xx
+   //virtual bool  SetEntryBinAreaByNumber(uint8_t* a, uint16_t group,
+   //                                                uint16_t elem);
 
    virtual void UpdateShaEntries();
 
    // Header entry
    DocEntry* GetDocEntryByNumber(uint16_t group, uint16_t element); 
-   DocEntry* GetDocEntryByName  (std::string const & tagName);
+   DocEntry* GetDocEntryByName  (TagName const & tagName);
 
    ValEntry* GetValEntryByNumber(uint16_t group, uint16_t element); 
    //BinEntry* GetBinEntryByNumber(uint16_t group, uint16_t element); 
@@ -261,6 +273,7 @@ private:
    void BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
                                    DocEntrySet* set );
 
+   void HandleBrokenEndian(uint16_t  group, uint16_t  elem);
 public:
 // Accessors:
    /// Accessor to \ref PrintLevel
@@ -275,9 +288,6 @@ public:
    /// 'Swap code' accessor (see \ref SwapCode )
    int GetSwapCode() { return SwapCode; }
    
-   /// File pointer
-   std::ifstream * GetFP() { return Fp; }
-
    bool operator<(Document &document);
 
 };