* src/gdcmDocument.[h|cxx] : set the Transfert Syntax values to the header

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 7d44ebb776538c50ef672dd96c9a58815138bbb1..411d7d31859a98e519ef93d55976b38b035a40b5 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: 2004/10/24 03:33:41 $
-  Version:   $Revision: 1.55 $
+  Date:      $Date: 2004/11/25 13:12:02 $
+  Version:   $Revision: 1.63 $
  
   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,
@@ -59,6 +60,41 @@ enum TransferSyntaxType {
   UnknownTS
 };
 
+static const char *TransferSyntaxStrings[] =  {
+  // Implicit VR Little Endian
+  "1.2.840.10008.1.2",
+  // Implicit VR Little Endian DLX G.E?
+  "1.2.840.113619.5.2",
+  // Explicit VR Little Endian
+  "1.2.840.10008.1.2.1",
+  // Deflated Explicit VR Little Endian
+  "1.2.840.10008.1.2.1.99",
+  // Explicit VR Big Endian
+  "1.2.840.10008.1.2.2",
+  // JPEG Baseline (Process 1)
+  "1.2.840.10008.1.2.4.50",
+  // JPEG Extended (Process 2 & 4)
+  "1.2.840.10008.1.2.4.51",
+  // JPEG Extended (Process 3 & 5)
+  "1.2.840.10008.1.2.4.52",
+  // JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8)
+  "1.2.840.10008.1.2.4.53",
+  // JPEG Full Progression, Non-Hierarchical (Process 10 & 12)
+  "1.2.840.10008.1.2.4.55",
+  // JPEG Lossless, Non-Hierarchical (Process 14)
+  "1.2.840.10008.1.2.4.57",
+  // JPEG Lossless, Hierarchical, First-Order Prediction (Process 14, [Selection Value 1])
+  "1.2.840.10008.1.2.4.70",
+  // JPEG 2000 Lossless
+  "1.2.840.10008.1.2.4.90",
+  // JPEG 2000
+  "1.2.840.10008.1.2.4.91",
+  // RLE Lossless
+  "1.2.840.10008.1.2.5",
+  // Unknown
+  "Unknown Transfer Syntax"
+};
+
 //-----------------------------------------------------------------------------
 /**
  * \brief Derived by both Header and DicomDir
@@ -153,19 +189,19 @@ public:
 
    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
@@ -193,8 +229,8 @@ public:
    virtual std::string GetEntryVRByNumber(uint16_t group, uint16_t elem);
    virtual int     GetEntryLengthByNumber(uint16_t group, uint16_t elem);
 //protected:
-   virtual bool SetEntryByName  (std::string const & content, 
-                                 std::string const & tagName);
+   virtual bool SetEntryByName  ( std::string const & content, 
+                                  TagName const & tagName );
    virtual bool SetEntryByNumber(std::string const & content,
                                  uint16_t group, uint16_t element);
    virtual bool SetEntryByNumber(uint8_t* content, int lgth,
@@ -202,7 +238,7 @@ public:
    virtual bool SetEntryLengthByNumber(uint32_t length,
                                        uint16_t group, uint16_t element);
 
-   virtual size_t GetEntryOffsetByNumber (uint16_t group, uint16_t elem);
+   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);
@@ -211,7 +247,7 @@ public:
 
    // 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,14 +297,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; }
@@ -276,9 +312,6 @@ public:
    /// 'Swap code' accessor (see \ref SwapCode )
    int GetSwapCode() { return SwapCode; }
    
-   /// File pointer
-   std::ifstream * GetFP() { return Fp; }
-
    bool operator<(Document &document);
 
 };