X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmParser.cxx;h=9a1c07cea4a1934d63cfb10120e64333ab917198;hb=c5618e6b8276e1b21bbea354fe8bcba3c78eb4bd;hp=6cccb5a483cf9096737ab0a811018a68e5823393;hpb=b9ab8805bd66e5fc6dc74788435df455899eb661;p=gdcm.git

diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx
index 6cccb5a4..9a1c07ce 100644
--- a/src/gdcmParser.cxx
+++ b/src/gdcmParser.cxx
@@ -1,5 +1,13 @@
 // gdcmParser.cxx
 //-----------------------------------------------------------------------------
+//#define UINT32_MAX    (4294967295U)
+
+
+#include "gdcmParser.h"
+#include "gdcmGlobal.h"
+#include "gdcmUtil.h"
+#include "gdcmDebug.h"
+
 #include <errno.h>
 #include <vector>
 
@@ -10,24 +18,18 @@
    #include <netinet/in.h>
 #endif
 
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
 #  include <iomanip>
 
-#include "gdcmParser.h"
-#include "gdcmGlobal.h"
-#include "gdcmUtil.h"
-#include "gdcmDebug.h"
-
 #define UI1_2_840_10008_1_2      "1.2.840.10008.1.2"
 #define UI1_2_840_10008_1_2_1    "1.2.840.10008.1.2.1"
 #define UI1_2_840_10008_1_2_2    "1.2.840.10008.1.2.2"
 #define UI1_2_840_10008_1_2_1_99 "1.2.840.10008.1.2.1.99"
 
+typedef struct {
+   guint32 totalSQlength;
+   guint32 alreadyParsedlength;
+} pileElem;
+
 //-----------------------------------------------------------------------------
 // Refer to gdcmParser::CheckSwap()
 const unsigned int gdcmParser::HEADER_LENGTH_TO_READ = 256;
@@ -35,8 +37,6 @@ const unsigned int gdcmParser::HEADER_LENGTH_TO_READ = 256;
 // Refer to gdcmParser::SetMaxSizeLoadEntry()
 const unsigned int gdcmParser::MAX_SIZE_LOAD_ELEMENT_VALUE = 4096;
 
-// Refer to gdcmParser::SetMaxSizePrintEntry()
-// TODO : Right now, better see "define, in gdcmHederEntry.cxx
 const unsigned int gdcmParser::MAX_SIZE_PRINT_ELEMENT_VALUE = 64;
 
 //-----------------------------------------------------------------------------
@@ -69,9 +69,8 @@ gdcmParser::gdcmParser(const char *inFilename,
 
    if ( !OpenFile(exception_on_error))
       return;
-   if (ParseHeader()) {
-     LoadHeaderEntries();
-   }   
+
+   LoadHeaderEntries();   
    CloseFile();
 
    wasUpdated = 0;  // will be set to 1 if user adds an entry
@@ -79,7 +78,6 @@ gdcmParser::gdcmParser(const char *inFilename,
 }
 
 /**
- * \ingroup gdcmParser
  * \brief  constructor 
  * @param   exception_on_error
  */
@@ -95,7 +93,6 @@ gdcmParser::gdcmParser(bool exception_on_error) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Canonical destructor.
  */
 gdcmParser::~gdcmParser (void) {
@@ -106,7 +103,6 @@ gdcmParser::~gdcmParser (void) {
 //-----------------------------------------------------------------------------
 // Print
 /**
-  * \ingroup gdcmParser
   * \brief   Prints the Header Entries (Dicom Elements)
   *          from the chained list
   * @return
@@ -122,71 +118,7 @@ void gdcmParser::PrintEntry(std::ostream & os) {
    } 
 }
 
-/**
-  * \ingroup gdcmParser
-  * \brief   Prints the Header Entries (Dicom Elements)
-  *          from the chained list
-  *          and skips the elements belonging to a SeQuence
-  * @return
-  */ 
-void gdcmParser::PrintEntryNoSQ(std::ostream & os) {
-   int countSQ = 0;
-   for (ListTag::iterator i = listEntries.begin();  
-        i != listEntries.end();
-        ++i)
-   {
-       if ( (*i)->GetVR() == "SQ"){
-          countSQ ++;
-       }
-
-       if ( (*i)->GetGroup() == 0xfffe  && (*i)->GetElement() == 0xe0dd){
-          countSQ --;
-          continue;
-       }
-              
-       if (countSQ == 0) { 
-         (*i)->SetPrintLevel(printLevel);
-         (*i)->Print(os);
-       }   
-   } 
-}
 
-/**
-  * \ingroup gdcmParser
-  * \brief   Prints the Header Entries (Dicom Elements)
-  *          from the chained list
-  *          and indents the elements belonging to a SeQuence
-  * @return
-  */ 
-void gdcmParser::PrintEntryNiceSQ(std::ostream & os) {
-   int countSQ = 0;
-   std::ostringstream tab; 
-   tab << "   ";
-   for (ListTag::iterator i = listEntries.begin();  
-        i != listEntries.end();
-        ++i)
-   {
-       // we ignore '0 length' SeQuences
-       if ( (*i)->GetVR() == "SQ" && (*i)->GetReadLength()!=0){
-          countSQ ++;
-       }
-       // a SeQuence is over when a Sequence Delimiter Item is found
-       // pb : 'actual length' Sequence have NO Sequence Delimiter
-       // --> They 'never' finish : check the global length !
-       if ( (*i)->GetGroup() == 0xfffe  && (*i)->GetElement() == 0xe0dd){
-          countSQ --;
-          continue;
-       } 
-
-                    
-       if (countSQ != 0) { 
-          for (int i=0;i<countSQ;i++)
-	     os << tab.str();
-       } 
-       (*i)->SetPrintLevel(printLevel);
-       (*i)->Print(os);         
-   } 
-}
 /**
   * \brief   Prints The Dict Entries of THE public Dicom Dictionary
   * @return
@@ -274,7 +206,6 @@ bool gdcmParser::IsImplicitVRLittleEndianTransferSyntax(void) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Determines if the Transfer Syntax was already encountered
  *          and if it corresponds to a ExplicitVRLittleEndian one.
  * @return  True when ExplicitVRLittleEndian found. False in all other cases.
@@ -395,32 +326,35 @@ bool gdcmParser::CloseFile(void) {
  * \return Always true.
  */
 bool gdcmParser::Write(FILE *fp, FileType type) {
-// ==============
-// TODO The stuff was rewritten using the chained list instead 
-//      of the H table
-//      so we could remove the GroupHT from the gdcmParser
-// To be checked
-// =============
-
-   // TODO : move the following lines (and a lot of others, to be written)
-   // to a future function CheckAndCorrectHeader
+/// \todo
+///  ==============
+///      The stuff will have to be rewritten using the SeQuence based 
+///       tree-like stucture instead  of the chained list .
+///      (so we shall remove the GroupHT from the gdcmParser)
+///      To be checked
+/// =============
+
+   /// \todo move the following lines (and a lot of others, to be written)
+   /// to a future function CheckAndCorrectHeader
    
-   // Question :
-   // Comment pourrait-on savoir si le DcmHeader vient d'un fichier
-   // DicomV3 ou non (FileType est un champ de gdcmParser ...)
-   // WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA
-   // no way 
-   // a moins de se livrer a un tres complique ajout des champs manquants.
-   // faire un CheckAndCorrectHeader (?)  
+   /// \todo
+   /// Question :
+   /// Comment pourrait-on savoir si le DcmHeader vient d'un fichier
+   /// DicomV3 ou non (FileType est un champ de gdcmParser ...)
+   /// WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA
+   /// no way 
+   /// a moins de se livrer a un tres complique ajout des champs manquants.
+   /// faire un CheckAndCorrectHeader (?)  
 
    if (type == ImplicitVR) 
    {
       std::string implicitVRTransfertSyntax = UI1_2_840_10008_1_2;
       ReplaceOrCreateByNumber(implicitVRTransfertSyntax,0x0002, 0x0010);
       
-      //FIXME Refer to standards on page 21, chapter 6.2 "Value representation":
-      //      values with a VR of UI shall be padded with a single trailing null
-      //      Dans le cas suivant on doit pader manuellement avec un 0
+      /// \todo Refer to standards on page 21, chapter 6.2
+      ///       "Value representation": values with a VR of UI shall be
+      ///       padded with a single trailing null
+      ///       Dans le cas suivant on doit pader manuellement avec un 0
       
       SetEntryLengthByNumber(18, 0x0002, 0x0010);
    } 
@@ -430,24 +364,26 @@ bool gdcmParser::Write(FILE *fp, FileType type) {
       std::string explicitVRTransfertSyntax = UI1_2_840_10008_1_2_1;
       ReplaceOrCreateByNumber(explicitVRTransfertSyntax,0x0002, 0x0010);
       
-      //FIXME Refer to standards on page 21, chapter 6.2 "Value representation":
-      //      values with a VR of UI shall be padded with a single trailing null
-      //      Dans le cas suivant on doit pader manuellement avec un 0
+      /// \todo Refer to standards on page 21, chapter 6.2
+      ///       "Value representation": values with a VR of UI shall be
+      ///       padded with a single trailing null
+      ///       Dans le cas suivant on doit pader manuellement avec un 0
       
       SetEntryLengthByNumber(20, 0x0002, 0x0010);
    }
 
-/* TODO : rewrite later, if really usefull
-
---> Warning : un-updated odd groups lengths can causes pb 
--->           (xmedcon breaks)
---> to be re- written with future org.
-
-   if ( (type == ImplicitVR) || (type == ExplicitVR) )
-      UpdateGroupLength(false,type);
-   if ( type == ACR)
-      UpdateGroupLength(true,ACR);
-*/
+/**
+ * \todo rewrite later, if really usefull
+ *
+ *       --> Warning : un-updated odd groups lengths can causes pb 
+ *       -->           (xmedcon breaks)
+ *       --> to be re- written with future org.
+ *
+ * if ( (type == ImplicitVR) || (type == ExplicitVR) )
+ *    UpdateGroupLength(false,type);
+ * if ( type == ACR)
+ *    UpdateGroupLength(true,ACR);
+ */
 
    WriteEntries(fp,type);
    return(true);
@@ -511,7 +447,6 @@ int gdcmParser::CheckIfEntryExistByNumber(guint16 group, guint16 element ) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches within Header Entries (Dicom Elements) parsed with 
  *          the public and private dictionaries 
  *          for the element value of a given tag.
@@ -529,7 +464,6 @@ std::string gdcmParser::GetEntryByName(std::string tagName) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches within Header Entries (Dicom Elements) parsed with 
  *          the public and private dictionaries 
  *          for the element value representation of a given tag.
@@ -554,7 +488,6 @@ std::string gdcmParser::GetEntryVRByName(std::string tagName) {
 
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches within Header Entries (Dicom Elements) parsed with 
  *          the public and private dictionaries 
  *          for the element value representation of a given tag.
@@ -571,7 +504,6 @@ std::string gdcmParser::GetEntryByNumber(guint16 group, guint16 element){
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches within Header Entries (Dicom Elements) parsed with 
  *          the public and private dictionaries 
  *          for the element value representation of a given tag..
@@ -593,7 +525,6 @@ std::string gdcmParser::GetEntryVRByNumber(guint16 group, guint16 element) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches within Header Entries (Dicom Elements) parsed with 
  *          the public and private dictionaries 
  *          for the value length of a given tag..
@@ -608,7 +539,6 @@ int gdcmParser::GetEntryLengthByNumber(guint16 group, guint16 element) {
    return elem->GetLength();
 }
 /**
- * \ingroup gdcmParser
  * \brief   Sets the value (string) of the Header Entry (Dicom Element)
  * @param   content string value of the Dicom Element
  * @param   tagName name of the searched Dicom Element.
@@ -624,7 +554,6 @@ bool gdcmParser::SetEntryByName(std::string content,std::string tagName) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Accesses an existing gdcmHeaderEntry (i.e. a Dicom Element)
  *          through it's (group, element) and modifies it's content with
  *          the given value.
@@ -675,7 +604,6 @@ bool gdcmParser::SetEntryByNumber(std::string content,
 }  
 
 /**
- * \ingroup gdcmParser
  * \brief   Accesses an existing gdcmHeaderEntry (i.e. a Dicom Element)
  *          in the PubHeaderEntrySet of this instance
  *          through it's (group, element) and modifies it's length with
@@ -700,7 +628,6 @@ bool gdcmParser::SetEntryLengthByNumber(guint32 l,
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Gets (from Header) the offset  of a 'non string' element value 
  *          (LoadElementValues has already be executed)
  * @param Group   group of the Entry 
@@ -720,7 +647,6 @@ size_t gdcmParser::GetEntryOffsetByNumber(guint16 Group, guint16 Elem)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Gets (from Header) a 'non string' element value 
  *          (LoadElementValues has already be executed)  
  * @param Group   group of the Entry 
@@ -753,16 +679,16 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem)
    size_t o =(size_t)Element->GetOffset();
    fseek(fp, o, SEEK_SET);
    size_t l=Element->GetLength();
-   void * a = malloc(l);
+   char* a = new char[l];
    if(!a) 
       return NULL;
 
    SetEntryVoidAreaByNumber(a, Group, Elem);
-   // TODO check the result 
+   /// \todo check the result 
    size_t l2 = fread(a, 1, l ,fp);
    if(l != l2) 
    {
-      free(a);
+      delete[] a;
       return NULL;
    }
 
@@ -770,7 +696,6 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Sets a 'non string' value to a given Dicom Element
  * @param   area
  * @param   group Group number of the searched Dicom Element 
@@ -789,7 +714,6 @@ bool gdcmParser::SetEntryVoidAreaByNumber(void * area,
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Update the entries with the shadow dictionary. 
  *          Only non even entries are analyzed       
  */
@@ -833,7 +757,6 @@ void gdcmParser::UpdateShaEntries(void) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches within the Header Entries for a Dicom Element of
  *          a given tag.
  * @param   tagName name of the searched Dicom Element.
@@ -849,7 +772,6 @@ void gdcmParser::UpdateShaEntries(void) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief  retrieves a Dicom Element (the first one) using (group, element)
  * \warning (group, element) IS NOT an identifier inside the Dicom Header
  *           if you think it's NOT UNIQUE, check the count number
@@ -868,7 +790,6 @@ gdcmHeaderEntry* gdcmParser::GetHeaderEntryByNumber(guint16 group, guint16 eleme
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   retrieves the Dicom Elements (all of them) using (group, element) 
  * @param   group Group number of the searched Dicom Element.
  * @param   element Element number of the searched Dicom Element.
@@ -881,7 +802,6 @@ IterHT gdcmParser::GetHeaderEntrySameNumber(guint16 group, guint16 element){
 }
 
 /**
- * \ingroup       gdcmParser
  * \brief         Loads the element while preserving the current
  *                underlying file position indicator as opposed to
  *                to LoadHeaderEntry that modifies it.
@@ -1171,7 +1091,7 @@ bool gdcmParser::WriteEntry(gdcmHeaderEntry *tag, FILE *_fp,FileType type)
 
 bool gdcmParser::WriteEntries(FILE *_fp,FileType type)
 {   
-   // TODO (?) tester les echecs en ecriture (apres chaque fwrite)
+   /// \todo (?) check write failures (after *each* fwrite)
      
    for (ListTag::iterator tag2=listEntries.begin();
                           tag2 != listEntries.end();
@@ -1184,13 +1104,10 @@ bool gdcmParser::WriteEntries(FILE *_fp,FileType type)
          if ((*tag2)->GetElement() %2)
             // Ignore the "shadow" groups
             continue;
-         if ((*tag2)->GetVR() == "SQ" )
-            // For the time being sequences are simply ignored
-            // TODO : find a trick not to *skip* the SeQuences !
-            continue;
-         if ((*tag2)->GetGroup() == 0xfffe )
-            // Ignore the documented delimiter
+         if ((*tag2)->GetVR() == "SQ" ) // ignore Sequences
             continue;
+         if ((*tag2)->GetSQDepthLevel() != 0) // Not only ignore the SQ element
+            continue;	    
       } 
       if (! WriteEntry(*tag2,_fp,type) )
          return false;
@@ -1199,7 +1116,6 @@ bool gdcmParser::WriteEntries(FILE *_fp,FileType type)
 }   
 
 /**
- * \ingroup gdcmParser
  * \brief   writes on disc according to the requested format
  *          (ACR-NEMA, ExplicitVR, ImplicitVR) the image,
  *          using only the last synonym of each mutimap H Table post.
@@ -1223,13 +1139,10 @@ void gdcmParser::WriteEntriesDeprecated(FILE *_fp,FileType type) {
         tag2 != tagHT.end();
         ++tag2){
       if ( type == ACR ){ 
-         if ((*tag2->second).GetGroup() < 0x0008)   continue; // ignore pure DICOM V3 groups
-         if ((*tag2->second).GetElement() %2)       continue; // ignore shadow groups
-         if ((*tag2->second).GetVR() == "SQ" )      continue; // ignore Sequences
-         // TODO : find a trick to *skip* the SeQuences !
-         // Not only ignore the SQ element
-	 // --> will be done with the next organization
-         if ((*tag2->second).GetGroup() == 0xfffe ) continue; // ignore delimiters	
+         if ((*tag2->second).GetGroup() < 0x0008)    continue; // ignore pure DICOM V3 groups
+         if ((*tag2->second).GetElement() %2)        continue; // ignore shadow groups
+         if ((*tag2->second).GetVR() == "SQ" )       continue; // ignore Sequences
+         if ((*tag2->second).GetSQDepthLevel() != 0) continue; // Not only ignore the SQ element          
       }
       if ( ! WriteEntry(tag2->second,_fp,type))
          break;
@@ -1237,7 +1150,6 @@ void gdcmParser::WriteEntriesDeprecated(FILE *_fp,FileType type) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Swaps back the bytes of 4-byte long integer accordingly to
  *          processor order.
  * @return  The properly swaped 32 bits integer.
@@ -1266,7 +1178,6 @@ guint32 gdcmParser::SwapLong(guint32 a) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Unswaps back the bytes of 4-byte long integer accordingly to
  *          processor order.
  * @return  The properly unswaped 32 bits integer.
@@ -1276,7 +1187,6 @@ guint32 gdcmParser::UnswapLong(guint32 a) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Swaps the bytes so they agree with the processor order
  * @return  The properly swaped 16 bits integer.
  */
@@ -1287,7 +1197,6 @@ guint16 gdcmParser::SwapShort(guint16 a) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Unswaps the bytes so they agree with the processor order
  * @return  The properly unswaped 16 bits integer.
  */
@@ -1298,11 +1207,10 @@ guint16 gdcmParser::UnswapShort(guint16 a) {
 //-----------------------------------------------------------------------------
 // Private
 /**
- * \ingroup gdcmParser
- * \brief   Parses the header of the file but WITHOUT loading element values.
- * @return  false if file is not ACR-NEMA / DICOM
+ * \brief   Parses the header of the file and load element values.
+ * @return  false if file is not ACR-NEMA / PAPYRUS / DICOM 
  */
-bool gdcmParser::ParseHeader(bool exception_on_error) throw(gdcmFormatError) {
+bool gdcmParser::LoadHeaderEntries(bool exception_on_error) throw(gdcmFormatError) {
    (void)exception_on_error;
    rewind(fp);
    if (!CheckSwap())
@@ -1314,27 +1222,19 @@ bool gdcmParser::ParseHeader(bool exception_on_error) throw(gdcmFormatError) {
      if ( (ignoreShadow==0) || (newHeaderEntry->GetGroup()%2) == 0) { 
         AddHeaderEntry(newHeaderEntry); 
      }     
-   }
-   return true;
-}
-
-/**
- * \ingroup gdcmParser
- * \brief   Loads the element values of all the Header Entries pointed in the
- *          public Chained List.
- */
-void gdcmParser::LoadHeaderEntries(void) {
-   rewind(fp);
-   for (ListTag::iterator i = GetListEntry().begin();
-      i != GetListEntry().end();
-      ++i)
-   {
-      LoadHeaderEntry(*i);
-   }
-            
+   }   
    rewind(fp);
-
-   // Load 'non string' values   
+   // Be carefull : merging this two loops may cause troubles ...
+   for (ListTag::iterator i = GetListEntry().begin();                           
+        i != GetListEntry().end();                                                
+        ++i)                                                                      
+   {                                                                            
+      LoadHeaderEntry(*i);                                                      
+   }                                                                            
+   rewind(fp);                                                                     
+   
+   // Load 'non string' values
+      
    std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004);   
    if( PhotometricInterpretation == "PALETTE COLOR " ) {
       LoadEntryVoidArea(0x0028,0x1200);  // gray LUT   
@@ -1346,7 +1246,7 @@ void gdcmParser::LoadHeaderEntries(void) {
       LoadEntryVoidArea(0x0028,0x1222);  // Segmented Green Palette Color LUT Data
       LoadEntryVoidArea(0x0028,0x1223);  // Segmented Blue  Palette Color LUT Data
    } 
-   //FIXME : how to use it?
+   //FIXME later : how to use it?
    LoadEntryVoidArea(0x0028,0x3006);  //LUT Data (CTX dependent)     
    
    // --------------------------------------------------------------
@@ -1358,7 +1258,8 @@ void gdcmParser::LoadHeaderEntries(void) {
    std::string RecCode;
    RecCode = GetEntryByNumber(0x0008, 0x0010); // recognition code
    if (RecCode == "ACRNEMA_LIBIDO_1.1" ||
-       RecCode == "CANRME_AILIBOD1_1." ) 
+       RecCode == "CANRME_AILIBOD1_1." )  // for brain-damaged softwares
+                                          // with "little-endian strings"
    {
          filetype = ACR_LIBIDO; 
          std::string rows    = GetEntryByNumber(0x0028, 0x0010);
@@ -1366,11 +1267,11 @@ void gdcmParser::LoadHeaderEntries(void) {
          SetEntryByNumber(columns, 0x0028, 0x0010);
          SetEntryByNumber(rows   , 0x0028, 0x0011);
    }
-   // ----------------- End of Special Patch ----------------
+   // ----------------- End of Special Patch ----------------   
+   return true;
 }
 
 /**
- * \ingroup       gdcmParser
  * \brief         Loads the element content if its length doesn't exceed
  *                the value specified with gdcmParser::SetMaxSizeLoadEntry()
  * @param         Entry Header Entry (Dicom Element) to be dealt with
@@ -1380,25 +1281,14 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry)  {
    guint16 group  = Entry->GetGroup();
    std::string  vr= Entry->GetVR();
    guint32 length = Entry->GetLength();
-   bool SkipLoad  = false;
 
    fseek(fp, (long)Entry->GetOffset(), SEEK_SET);
-   
-   // the test was commented out to 'go inside' the SeQuences
-   // we don't any longer skip them !
-    
-   // if( vr == "SQ" )  //  (DO NOT remove this comment)
-   //    SkipLoad = true;
 
    // A SeQuence "contains" a set of Elements.  
    //          (fffe e000) tells us an Element is beginning
    //          (fffe e00d) tells us an Element just ended
    //          (fffe e0dd) tells us the current SeQuence just ended
-   if( group == 0xfffe )
-      SkipLoad = true;
-
-   if ( SkipLoad ) {
-      Entry->SetLength(0);
+   if( group == 0xfffe ) {
       Entry->SetValue("gdcm::Skipped");
       return;
    }
@@ -1483,7 +1373,6 @@ void gdcmParser::LoadHeaderEntry(gdcmHeaderEntry *Entry)  {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   add a new Dicom Element pointer to 
  *          the H Table and at the end of the chained List
  * \warning push_bash in listEntries ONLY during ParseHeader
@@ -1499,7 +1388,6 @@ void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief  Find the value Length of the passed Header Entry
  * @param  Entry Header Entry whose length of the value shall be loaded. 
  */
@@ -1508,6 +1396,7 @@ void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) {
    //guint16 group   = Entry->GetGroup(); //FIXME
    std::string  vr = Entry->GetVR();
    guint16 length16;
+       
    
    if ( (filetype == ExplicitVR) && (! Entry->IsImplicitVR()) ) 
    {
@@ -1611,7 +1500,6 @@ void gdcmParser::AddHeaderEntry(gdcmHeaderEntry *newHeaderEntry) {
 }
 
 /**
- * \ingroup   gdcmParser
  * \brief     Find the Value Representation of the current Dicom Element.
  * @param     Entry
  */
@@ -1648,7 +1536,6 @@ void gdcmParser::FindHeaderEntryVR( gdcmHeaderEntry *Entry)
 }
 
 /**
- * \ingroup   gdcmParser
  * \brief     Check the correspondance between the VR of the header entry
  *            and the taken VR. If they are different, the header entry is 
  *            updated with the new VR.
@@ -1720,7 +1607,6 @@ bool gdcmParser::CheckHeaderEntryVR(gdcmHeaderEntry *Entry, VRKey vr)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Get the transformed value of the header entry. The VR value 
  *          is used to define the transformation to operate on the value
  * \warning NOT end user intended method !
@@ -1790,7 +1676,6 @@ std::string gdcmParser::GetHeaderEntryValue(gdcmHeaderEntry *Entry)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Get the reverse transformed value of the header entry. The VR 
  *          value is used to define the reverse transformation to operate on
  *          the value
@@ -1844,7 +1729,6 @@ std::string gdcmParser::GetHeaderEntryUnvalue(gdcmHeaderEntry *Entry)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Skip a given Header Entry 
  * \warning NOT end user intended method !
  * @param   entry 
@@ -1855,15 +1739,13 @@ void gdcmParser::SkipHeaderEntry(gdcmHeaderEntry *entry)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   When the length of an element value is obviously wrong (because
  *          the parser went Jabberwocky) one can hope improving things by
  *          applying this heuristic.
  */
 void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 FoundLength) 
 {
-   Entry->SetReadLength(FoundLength); // will be updated only if a bug is found
-     
+   Entry->SetReadLength(FoundLength); // will be updated only if a bug is found        
    if ( FoundLength == 0xffffffff) {
       FoundLength = 0;
    }
@@ -1879,7 +1761,7 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found
    }
       
    // Sorry for the patch!  
-   // XMedCom did the trick to read some nasty GE images ...
+   // XMedCom did the trick to read some naughty GE images ...
    if (FoundLength == 13) {
       // The following 'if' will be removed when there is no more
       // images on Creatis HDs with a 13 length for Manufacturer...
@@ -1907,20 +1789,20 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found
          FoundLength =0;      // ReadLength is unchanged 
    } 
     
-   // a SeQuence Element is beginning                                          
-   // fffe|e000 is just a marker, its length *should be* zero                                               
+   // we found a 'delimiter' element                                         
+   // fffe|xxxx is just a marker, we don't take its length into account                                                   
    else if(Entry->GetGroup() == 0xfffe)
-   { 
+   {    
                                          // *normally, fffe|0000 doesn't exist ! 
      if( Entry->GetElement() != 0x0000 ) // gdcm-MR-PHILIPS-16-Multi-Seq.dcm
-                                         // causes extra troubles :-(                                                        
-         FoundLength =0;
-   }         
+                                         // causes extra troubles :-(                                                              	
+        FoundLength =0;
+   } 
+           
    Entry->SetUsableLength(FoundLength);
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Apply some heuristics to predict whether the considered 
  *          element value contains/represents an integer or not.
  * @param   Entry The element value on which to apply the predicate.
@@ -1964,7 +1846,6 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) {
    return false;
 }
 /**
- * \ingroup gdcmParser
  * \brief  Find the Length till the next sequence delimiter
  * \warning NOT end user intended method !
  * @return 
@@ -2016,7 +1897,6 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief Reads a supposed to be 16 Bits integer
  *       (swaps it depending on processor endianity) 
  * @return read value
@@ -2037,7 +1917,6 @@ guint16 gdcmParser::ReadInt16(void) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief  Reads a supposed to be 32 Bits integer
  *         (swaps it depending on processor endianity)  
  * @return read value
@@ -2058,7 +1937,6 @@ guint32 gdcmParser::ReadInt32(void) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief skips bytes inside the source file 
  * \warning NOT end user intended method !
  * @return 
@@ -2069,7 +1947,6 @@ void gdcmParser::SkipBytes(guint32 NBytes) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief Loads all the needed Dictionaries
  * \warning NOT end user intended method !   
  */
@@ -2080,7 +1957,6 @@ void gdcmParser::Initialise(void)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Discover what the swap code is (among little endian, big endian,
  *          bad little endian, bad big endian).
  *          sw is set
@@ -2264,7 +2140,6 @@ bool gdcmParser::CheckSwap() {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief Restore the unproperly loaded values i.e. the group, the element
  *        and the dictionary entry depending on them. 
  */
@@ -2292,7 +2167,6 @@ void gdcmParser::SwitchSwapToBigEndian(void)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief  during parsing, Header Elements too long are not loaded in memory 
  * @param NewSize
  */
@@ -2310,13 +2184,8 @@ void gdcmParser::SetMaxSizeLoadEntry(long NewSize)
 
 
 /**
- * \ingroup gdcmParser
  * \brief Header Elements too long will not be printed
- * \warning 
- * \todo : not yet usable 
- *          (see MAX_SIZE_PRINT_ELEMENT_VALUE 
- *           in gdcmHeaderEntry gdcmLoadEntry)
- *             
+ * \todo  See comments of \ref gdcmParser::MAX_SIZE_PRINT_ELEMENT_VALUE 
  * @param NewSize
  */
 void gdcmParser::SetMaxSizePrintEntry(long NewSize) 
@@ -2332,7 +2201,6 @@ void gdcmParser::SetMaxSizePrintEntry(long NewSize)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches both the public and the shadow dictionary (when they
  *          exist) for the presence of the DictEntry with given name.
  *          The public dictionary has precedence on the shadow one.
@@ -2363,7 +2231,6 @@ gdcmDictEntry *gdcmParser::GetDictEntryByName(std::string Name)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Searches both the public and the shadow dictionary (when they
  *          exist) for the presence of the DictEntry with given
  *          group and element. The public dictionary has precedence on the
@@ -2396,7 +2263,6 @@ gdcmDictEntry *gdcmParser::GetDictEntryByNumber(guint16 group,guint16 element)
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Read the next tag but WITHOUT loading it's value
  * @return  On succes the newly created HeaderEntry, NULL on failure.      
  */
@@ -2433,7 +2299,6 @@ gdcmHeaderEntry *gdcmParser::ReadNextHeaderEntry(void) {
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Build a new Element Value from all the low level arguments. 
  *          Check for existence of dictionary entry, and build
  *          a default one when absent.
@@ -2456,7 +2321,6 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByName(std::string Name)
 }  
 
 /**
- * \ingroup gdcmParser
  * \brief   Request a new virtual dict entry to the dict set
  * @param   group  group   of the underlying DictEntry
  * @param   element  element of the underlying DictEntry
@@ -2473,7 +2337,6 @@ gdcmDictEntry *gdcmParser::NewVirtualDictEntry(guint16 group, guint16 element,
 }
 
 /**
- * \ingroup gdcmParser
  * \brief   Build a new Element Value from all the low level arguments. 
  *          Check for existence of dictionary entry, and build
  *          a default one when absent.
@@ -2497,9 +2360,8 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByNumber(guint16 Group, guint16 Elem)
    return NewEntry;
 }
 
-// Never used; commented out, waiting for removal.
+/// \todo Never used; commented out, waiting for removal.
 /**
- * \ingroup gdcmParser
  * \brief   Small utility function that creates a new manually crafted
  *          (as opposed as read from the file) gdcmHeaderEntry with user
  *          specified name and adds it to the public tag hash table.
@@ -2532,7 +2394,6 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByNumber(guint16 Group, guint16 Elem)
 //}
 
 /**
- * \ingroup gdcmParser
  * \brief   Generate a free TagKey i.e. a TagKey that is not present
  *          in the TagHt dictionary.
  * @param   group The generated tag must belong to this group.