Document::CheckIfEntryExist is now public

[gdcm.git] / src / gdcmDocument.h

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index d237d0d24c1047311c73236750662cb2eb4226e5..a504c596c88b2841eccbf47ef2d11dc7bbdf5dd4 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/11 11:37:13 $
-  Version:   $Revision: 1.79 $
+  Date:      $Date: 2005/01/17 16:52:21 $
+  Version:   $Revision: 1.88 $
  
   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; }
@@ -115,8 +92,8 @@ public:
                          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 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);   
 
@@ -136,17 +113,19 @@ public:
                              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 );
+   bool ReplaceIfExist(std::string const &value,
+                       uint16_t group, uint16_t elem );
+
+   bool CheckIfEntryExist(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);
+   /*TagDocEntryHT *BuildFlatHashTable();*/
+
+   /// Return the Transfer Syntax as a string
+   std::string GetTransferSyntaxName();
 
 protected:
 // Methods
@@ -161,7 +140,6 @@ protected:
    void ComputeRLEInfo();
    void ComputeJPEGFragmentInfo();
    // Entry
-   bool CheckIfEntryExist(uint16_t group, uint16_t elem );
 
    int ComputeGroup0002Length( FileType filetype );
 
@@ -169,9 +147,18 @@ protected:
    /// Refering underlying filename.
    std::string Filename;
 
-   /// \brief SWap code (e.g. Big Endian, Little Endian, Bad Big Endian,
-   /// Bad Little Endian) according to the processor Endianity and
-   /// what is written on disc.
+   /// \brief Swap code gives an information on the byte order of a 
+   ///  supposed to be an int32, as it's read on disc 
+   /// (depending on the image Transfer Syntax *and* on the processor endianess)
+   /// as opposed as it should in memory to be dealt as an int32.
+   /// For instance :
+   /// - a 'Little Endian' image, read with a little endian processor
+   /// will have a SwapCode= 1234 (the order is OK; nothing to do)
+   /// - a 'Little Endian' image, read with a big endian procesor
+   /// will have a SwapCode= 4321 (the order is wrong; int32 an int16 must be
+   /// swapped)
+   /// note : values 2143, 4321, 3412 remain for the ACR-NEMA time, and
+   /// the well knowed 'Bad Big Endian' and 'Bad Little Endian' codes
    int SwapCode;
 
    ///\brief whether we already parsed group 0002
@@ -244,11 +231,11 @@ private:
    DocEntry *ReadNextDocEntry();
 
    uint32_t GenerateFreeTagKeyInGroup(uint16_t group);
-   void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
-                                   DocEntrySet* set );
+/*   void BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
+                                   DocEntrySet* set );*/
 
-   void HandleBrokenEndian(uint16_t  group, uint16_t  elem);
-   void HandleOutOfGroup0002(uint16_t group);
+   void HandleBrokenEndian(uint16_t &group, uint16_t &elem);
+   void HandleOutOfGroup0002(uint16_t &group, uint16_t &elem);
 
 // Variables
    /// Public dictionary used to parse this header