X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=4511aab548db6c6a17ba7bf003d49fbf75804b8c;hb=44d34727b676570bf3b4a7cab6076210f159d192;hp=6bf0b28121803837925df0f63985cd1e33e17869;hpb=5632bd68b349f72ddae6d5676193d9b03d50adb2;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 6bf0b281..4511aab5 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/07/07 13:11:38 $ - Version: $Revision: 1.260 $ + Date: $Date: 2005/08/23 14:41:59 $ + Version: $Revision: 1.266 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,11 +62,13 @@ Document::Document() // Load will set it to true if sucessfull Group0002Parsed = false; IsDocumentAlreadyLoaded = false; + IsDocumentModified = true; LoadMode = 0x00000000; // default : load everything, later + SetFileName(""); } /** - * \brief Constructor (not to break the API) + * \brief Constructor (DEPRECATED : not to break the API) * @param fileName 'Document' (File or DicomDir) to be open for parsing */ Document::Document( std::string const &fileName ) @@ -83,8 +85,10 @@ Document::Document( std::string const &fileName ) // Load will set it to true if sucessfull IsDocumentAlreadyLoaded = false; + IsDocumentModified = true; - Load(fileName); + SetFileName(fileName); + Load( ); } /** * \brief Canonical destructor. @@ -99,35 +103,57 @@ Document::~Document () // Public /** - * \brief Loader + * \brief Loader. use SetLoadMode(), SetFileName() before ! + * @return false if file cannot be open or no swap info was found, + * or no tag was found. + */ +bool Document::Load( ) +{ + if ( GetFileName() == "" ) + { + gdcmWarningMacro( "Use SetFileName, before !" ); + return false; + } + return DoTheLoadingDocumentJob( ); +} +/** + * \brief Loader. (DEPRECATED : not to break the API) * @param fileName 'Document' (File or DicomDir) to be open for parsing * @return false if file cannot be open or no swap info was found, * or no tag was found. */ bool Document::Load( std::string const &fileName ) { - if ( IsDocumentAlreadyLoaded ) - { - /* - if ( Filename == fileName ) - { - gdcmWarningMacro( "The file was already parsed inside this " - << "gdcm::Document (its name is: " - << Filename.c_str() ); - return true; - } - */ - gdcmWarningMacro( "A file was already parsed inside this " - << "gdcm::Document (previous name was: " - << Filename.c_str() << ". New name is :" - << fileName ); + Filename = fileName; + return DoTheLoadingDocumentJob( ); +} + +/** + * \brief Performs the Loading Job (internal use only) + * @return false if file cannot be open or no swap info was found, + * or no tag was found. + */ +bool Document::DoTheLoadingDocumentJob( ) +{ + if ( ! IsDocumentModified ) // Nothing to do ! + return true; + + // if ( Filename == fileName ) + // { + // gdcmWarningMacro( "The file was already parsed inside this " + // << "gdcm::Document (its name is: " + // << Filename.c_str() ); + // return true; + // } + + //gdcmWarningMacro( "A file was already parsed inside this " + // << "gdcm::Document (previous name was: " + // << Filename.c_str() << ". New name is :" + // << fileName ); // clean out the Entries, if already parsed // (probabely a mistake from the user) - ClearEntry(); - } - - Filename = fileName; + ClearEntry(); Fp = 0; if ( !OpenFile() ) @@ -895,6 +921,12 @@ void Document::ParseDES(DocEntrySet *set, long offset, break; } + // Uncoment this printf line to be able to 'follow' the DocEntries + // when something *very* strange happens + + //printf( "%04x|%04x %s\n",newDocEntry->GetGroup(), + // newDocEntry->GetElement(), + // newDocEntry->GetVR().c_str() ); used = true; newValEntry = dynamic_cast(newDocEntry); newBinEntry = dynamic_cast(newDocEntry); @@ -926,16 +958,20 @@ void Document::ParseDES(DocEntrySet *set, long offset, // but when "this" is a SQItem, we are inserting this new // valEntry in a sequence item, and the key has the // generalized form (refer to \ref BaseTagKey): - if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) - { - newBinEntry->SetKey( parentSQItem->GetBaseTagKey() - + newBinEntry->GetKey() ); - } + // time waste hunting + //if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) + //{ + // newBinEntry->SetKey( parentSQItem->GetBaseTagKey() + // + newBinEntry->GetKey() ); + //} + if ( !set->AddEntry( newBinEntry ) ) { gdcmWarningMacro( "in ParseDES : cannot add a BinEntry " - << newBinEntry->GetKey() ); + << newBinEntry->GetKey() + << " (at offset : " + << newBinEntry->GetOffset() << " )" ); used=false; } else @@ -957,19 +993,33 @@ void Document::ParseDES(DocEntrySet *set, long offset, // ...but when "set" is a SQItem, we are inserting this new // valEntry in a sequence item. Hence the key has the // generalized form (refer to \ref BaseTagKey): - if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) + + // time waste hunting + //if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) + //{ + // newValEntry->SetKey( parentSQItem->GetBaseTagKey() + // + newValEntry->GetKey() ); + //} + + if ( !set->AddEntry( newValEntry ) ) { - newValEntry->SetKey( parentSQItem->GetBaseTagKey() - + newValEntry->GetKey() ); + gdcmWarningMacro( "in ParseDES : cannot add a ValEntry " + << newValEntry->GetKey() + << " (at offset : " + << newValEntry->GetOffset() << " )" ); + used=false; + } + else + { + // Load only if we can add (not a duplicate key) + LoadDocEntry( newValEntry ); } - if ( LoadMode & NO_SHADOW ) // User asked to skip, if possible, - // shadow groups ( if possible : - // whether element 0x0000 exits) + if ( newValEntry->GetElement() == 0x0000 ) // if on group length { - if ( newValEntry->GetGroup()%2 != 0 ) + if ( newValEntry->GetGroup()%2 != 0 ) // if Shadow Group { - if ( newValEntry->GetElement() == 0x0000 ) + if ( LoadMode & NO_SHADOW ) // if user asked to skip shad.gr { std::string strLgrGroup = newValEntry->GetValue(); int lgrGroup; @@ -978,29 +1028,34 @@ void Document::ParseDES(DocEntrySet *set, long offset, lgrGroup = atoi(strLgrGroup.c_str()); Fp->seekg(lgrGroup, std::ios::cur); used = false; + RemoveEntry( newDocEntry ); + newDocEntry = 0; continue; } } } } - if ( !set->AddEntry( newValEntry ) ) - { - gdcmWarningMacro( "in ParseDES : cannot add a ValEntry " - << newValEntry->GetKey() ); - used=false; - } - else - { - // Load only if we can add (not a duplicate key) - LoadDocEntry( newValEntry ); - } - bool delimitor=newValEntry->IsItemDelimitor(); - if ( delimitor || + // FIXME : Brutal patch, waiting till we find a clever way to guess + // if a doc entry is a Sequence, + // - when it's odd number + // - and the file is Implicit VR Transfert Syntax + // + // '&& offset!=132' is a very fierce way to guess + // if we are at zero level (Probabely not enough ...). + // We want to go on parsing. + if ( (delimitor && offset!=132) || (!delim_mode && ((long)(Fp->tellg())-offset) >= l_max) ) { + if (delimitor && offset!=132) + { + gdcmWarningMacro( "in ParseDES : Item found out of a Sequence " + << newValEntry->GetKey() + << " (at offset : " + << newValEntry->GetOffset() << " )" ); + } if ( !used ) delete newDocEntry; break; @@ -1062,11 +1117,14 @@ void Document::ParseDES(DocEntrySet *set, long offset, // But when "set" is already a SQItem, we are building a nested // sequence, and hence the depth level of the new SeqEntry // we are building, is one level deeper: + + // time waste hunting if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) { newSeqEntry->SetDepthLevel( parentSQItem->GetDepthLevel() + 1 ); - newSeqEntry->SetKey( parentSQItem->GetBaseTagKey() - + newSeqEntry->GetKey() ); + + // newSeqEntry->SetKey( parentSQItem->GetBaseTagKey() + // + newSeqEntry->GetKey() ); } if ( l != 0 ) @@ -1078,20 +1136,24 @@ void Document::ParseDES(DocEntrySet *set, long offset, if ( !set->AddEntry( newSeqEntry ) ) { gdcmWarningMacro( "in ParseDES : cannot add a SeqEntry " - << newSeqEntry->GetKey() ); + << newSeqEntry->GetKey() + << " (at offset : " + << newSeqEntry->GetOffset() << " )" ); used = false; } if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) { if ( !used ) - delete newDocEntry; - break; + delete newDocEntry; + break; } } // end SeqEntry : VR = "SQ" if ( !used ) + { delete newDocEntry; + } } // end While } @@ -1132,12 +1194,14 @@ void Document::ParseSQ( SeqEntry *seqEntry, } // create the current SQItem SQItem *itemSQ = new SQItem( seqEntry->GetDepthLevel() ); +/* std::ostringstream newBase; newBase << seqEntry->GetKey() << "/" << SQItemNumber << "#"; itemSQ->SetBaseTagKey( newBase.str() ); +*/ unsigned int l = newDocEntry->GetReadLength(); if ( l == 0xffffffff ) @@ -1679,9 +1743,15 @@ void Document::SkipDocEntry(DocEntry *entry) */ void Document::SkipToNextDocEntry(DocEntry *currentDocEntry) { - Fp->seekg((long)(currentDocEntry->GetOffset()), std::ios::beg); + int l = currentDocEntry->GetReadLength(); + if ( l == -1 ) // length = 0xffff shouldn't appear here ... + // ... but PMS imagers happen ! + return; + Fp->seekg((long)(currentDocEntry->GetOffset()), std::ios::beg); if (currentDocEntry->GetGroup() != 0xfffe) // for fffe pb + { Fp->seekg( (long)(currentDocEntry->GetReadLength()),std::ios::cur); + } } /** @@ -2093,7 +2163,9 @@ DocEntry *Document::ReadNextDocEntry() { DictEntry *dictEntry = GetDictEntry(group,elem); if ( dictEntry ) + { realVR = dictEntry->GetVR(); + } } }