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

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 6b730260..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/18 12:49:22 $
-  Version:   $Revision: 1.52 $
+  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
@@ -36,9 +36,30 @@ class SeqEntry;
 
 #include <map>
 #include <list>
+#include <fstream>
+
 namespace gdcm 
 {
 
+enum TransferSyntaxType {
+  ImplicitVRLittleEndian = 0,
+  ImplicitVRLittleEndianDLXGE,
+  ExplicitVRLittleEndian,
+  DeflatedExplicitVRLittleEndian,
+  ExplicitVRBigEndian,
+  JPEGBaselineProcess1,
+  JPEGExtendedProcess2_4,
+  JPEGExtendedProcess3_5,
+  JPEGSpectralSelectionProcess6_8,
+  JPEGFullProgressionProcess10_12,
+  JPEGLosslessProcess14,
+  JPEGLosslessProcess14_1,
+  JPEG2000Lossless,
+  JPEG2000,
+  RLELossless,
+  UnknownTS
+};
+
 //-----------------------------------------------------------------------------
 /**
  * \brief Derived by both Header and DicomDir
@@ -75,7 +96,7 @@ protected:
    int SwapCode;
 
    /// File Pointer, opened during Header parsing.
-   FILE* Fp;
+   std::ifstream* Fp;
 
    /// ACR, ACR_LIBIDO, ExplicitVR, ImplicitVR, Unknown
    FileType Filetype;  
@@ -117,45 +138,35 @@ public:
 
 // Informations contained in the parser
    virtual bool IsReadable();
-   bool IsGivenTransferSyntax(std::string const & syntaxToCheck);
-   bool IsImplicitVRLittleEndianTransferSyntax();
-   bool IsExplicitVRLittleEndianTransferSyntax();
-   bool IsDeflatedExplicitVRLittleEndianTransferSyntax();
-   bool IsExplicitVRBigEndianTransferSyntax();
-   bool IsRLELossLessTransferSyntax();
-   bool IsJPEGBaseLineProcess1TransferSyntax();
-   bool IsJPEGExtendedProcess2_4TransferSyntax();
-   bool IsJPEGExtendedProcess3_5TransferSyntax();
-   bool IsJPEGSpectralSelectionProcess6_8TransferSyntax();
+   TransferSyntaxType GetTransferSyntax();
    bool IsJPEGLossless();
    bool IsJPEG2000();
-   bool IsJPEGTransferSyntax();
-   bool IsEncapsulateTransferSyntax();
+   bool IsJPEG();
+   bool IsEncapsulate();
    bool IsDicomV3();
 
    FileType GetFileType();
 
-   FILE* OpenFile();
+   std::ifstream * OpenFile();
    bool CloseFile();
 
-   void Write( FILE* 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");
+                                     uint16_t group, uint16_t elem,
+                                     TagName const & vr = "unkn");
    
    BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
-                                         uint16_t group, uint16_t elem,
-                                         std::string const & VR="unkn");
+                                     uint16_t group, uint16_t elem,
+                                     TagName const & vr = "unkn");
 
    SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem);
 
    bool ReplaceIfExistByNumber ( std::string const & value,
-                                 uint16_t group,
-                                 uint16_t elem );
+                                 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
@@ -163,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
@@ -184,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); 
@@ -251,14 +273,14 @@ private:
    void BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
                                    DocEntrySet* set );
 
-
+   void HandleBrokenEndian(uint16_t  group, uint16_t  elem);
 public:
 // Accessors:
    /// Accessor to \ref PrintLevel
    void SetPrintLevel(int level) { PrintLevel = level; }
 
    /// Accessor to \ref Filename
-   const std::string &GetFileName() { return Filename; }
+   const std::string &GetFileName() const { return Filename; }
 
    /// Accessor to \ref Filename
    void SetFileName(std::string const & fileName) { Filename = fileName; }
@@ -266,9 +288,6 @@ public:
    /// 'Swap code' accessor (see \ref SwapCode )
    int GetSwapCode() { return SwapCode; }
    
-   /// File pointer
-   FILE * GetFP() { return Fp; }
-
    bool operator<(Document &document);
 
 };