ENH: Since HandleOutOfGroup0002 need access to the transfer syntax move the method...

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index 1c8447954049944c81214c34e70fd96c080e32eb..8d4425fa1b4f01f1eabee0f7e9738fd0f1c58e19 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 16:45:51 $
-  Version:   $Revision: 1.77 $
+  Date:      $Date: 2005/01/11 23:06:35 $
+  Version:   $Revision: 1.83 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,25 +36,6 @@ class Dict;
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
-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
@@ -66,12 +47,8 @@ public:
    virtual bool IsReadable();
    FileType GetFileType();
 
-   TransferSyntaxType GetTransferSyntax();
+   std::string GetTransferSyntax();
 
-   bool IsJPEGLossless();
-   bool IsJPEG2000();
-   bool IsJPEG();
-   bool IsEncapsulate();
    bool IsDicomV3();
 
    RLEFramesInfo *GetRLEInfo() { return RLEInfo; }
@@ -111,42 +88,42 @@ 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,ValEntry *entry);
-   virtual bool SetEntry(uint8_t *content, int lgth,BinEntry *entry);
-
-   virtual void *GetEntryBinAreaByNumber(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);
-
-   DocEntry *GetDocEntryByNumber(uint16_t group, uint16_t element); 
-   ValEntry *GetValEntryByNumber(uint16_t group, uint16_t element); 
-   BinEntry *GetBinEntryByNumber(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);
-
-   bool ReplaceIfExistByNumber ( std::string const &value,
-                                 uint16_t group, uint16_t elem );
+   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 *GetEntryBinArea(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 *GetDocEntry(uint16_t group, uint16_t element); 
+   ValEntry *GetValEntry(uint16_t group, uint16_t element); 
+   BinEntry *GetBinEntry(uint16_t group, uint16_t element); 
+
+   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 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);
 
    void LoadDocEntrySafe(DocEntry *entry);
    TagDocEntryHT *BuildFlatHashTable();
-      
-// Divers
-   static std::string GetTransferSyntaxValue(TransferSyntaxType type);
+
+   /// Return the Transfer Syntax as a string
+   std::string GetTransferSyntaxName();
 
 protected:
 // Methods
@@ -161,7 +138,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 );
 
@@ -174,6 +151,12 @@ protected:
    /// what is written on disc.
    int SwapCode;
 
+   ///\brief whether we already parsed group 0002
+   bool Group0002Parsed;
+
+   ///\brief whether file has a DCM Preamble
+   bool HasDCMPreamble;
+
    /// File Pointer, opened during Header parsing.
    std::ifstream *Fp;
 
@@ -230,7 +213,7 @@ private:
 
    void Initialise();
    bool CheckSwap();
-   void SwitchSwapToBigEndian();
+   void SwitchByteSwapCode();
    void SetMaxSizeLoadEntry(long);
    void SetMaxSizePrintEntry(long);
 
@@ -241,7 +224,8 @@ private:
    void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
                                    DocEntrySet* set );
 
-   void HandleBrokenEndian(uint16_t  group, uint16_t  elem);
+   void HandleBrokenEndian(uint16_t &group, uint16_t &elem);
+   void HandleOutOfGroup0002(uint16_t group);
 
 // Variables
    /// Public dictionary used to parse this header