X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=ccec60d0d211392786a94ebb0ea7c5cd8be33ae5;hb=9886f353508c0874d5c0283c1c55561a4a001b0f;hp=b7bf7b524002106f7d48c82076a16f8ef9ebb76f;hpb=779118e4b64c99707fc46fbecd840863a3eaf365;p=gdcm.git diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index b7bf7b52..ccec60d0 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/06 15:18:42 $ - Version: $Revision: 1.259 $ + Date: $Date: 2005/07/11 20:47:00 $ + Version: $Revision: 1.264 $ 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,34 +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; - } + 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; - gdcmWarningMacro( "A file was already parsed inside this " - << "gdcm::Document (previous name was: " - << Filename.c_str() << ". New name is :" - << fileName ); + // 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() ) @@ -898,8 +925,9 @@ void Document::ParseDES(DocEntrySet *set, long offset, newValEntry = dynamic_cast(newDocEntry); newBinEntry = dynamic_cast(newDocEntry); - if ( newValEntry || newBinEntry ) + if ( newValEntry || newBinEntry ) { + //////////////////////////// ContentEntry if ( newBinEntry ) { vr = newDocEntry->GetVR(); @@ -914,6 +942,7 @@ void Document::ParseDES(DocEntrySet *set, long offset, } //////////////////// BinEntry or UNKOWN VR: + // When "this" is a Document the Key is simply of the // form ( group, elem )... if ( dynamic_cast< Document* > ( set ) ) @@ -923,20 +952,26 @@ 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() ); - } - LoadDocEntry( newBinEntry ); + // 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() ); used=false; } - } + else + { + // Load only if we can add (not a duplicate key) + LoadDocEntry( newBinEntry ); + } + } // end BinEntry else { /////////////////////// ValEntry @@ -950,14 +985,13 @@ 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 ) ) - { - newValEntry->SetKey( parentSQItem->GetBaseTagKey() - + newValEntry->GetKey() ); - } - - LoadDocEntry( newValEntry ); - bool delimitor=newValEntry->IsItemDelimitor(); + + // time waste hunting + //if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) ) + //{ + // newValEntry->SetKey( parentSQItem->GetBaseTagKey() + // + newValEntry->GetKey() ); + //} if ( LoadMode & NO_SHADOW ) // User asked to skip, if possible, // shadow groups ( if possible : @@ -986,14 +1020,16 @@ void Document::ParseDES(DocEntrySet *set, long offset, << newValEntry->GetKey() ); used=false; } - - if (delimitor) + else { - if ( !used ) - delete newDocEntry; - break; + // Load only if we can add (not a duplicate key) + LoadDocEntry( newValEntry ); } - if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max ) + + bool delimitor=newValEntry->IsItemDelimitor(); + + if ( delimitor || + (!delim_mode && ((long)(Fp->tellg())-offset) >= l_max) ) { if ( !used ) delete newDocEntry; @@ -1056,11 +1092,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 ) @@ -1082,11 +1121,11 @@ void Document::ParseDES(DocEntrySet *set, long offset, delete newDocEntry; break; } - } + } // end SeqEntry : VR = "SQ" if ( !used ) delete newDocEntry; - } + } // end While } /** @@ -1126,12 +1165,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 )