Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/07/06 08:42:33 $
- Version: $Revision: 1.257 $
+ 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
// 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 )
// Load will set it to true if sucessfull
IsDocumentAlreadyLoaded = false;
+ IsDocumentModified = true;
- Load(fileName);
+ SetFileName(fileName);
+ Load( );
}
/**
* \brief Canonical destructor.
// Public
/**
- * \brief Loader
- * @param fileName 'Document' (File or DicomDir) to be open for parsing
+ * \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( std::string const &fileName )
+bool Document::Load( )
{
- // We should clean out anything that already exists.
- // Check IsDocumentAlreadyLoaded to be sure.
- if ( IsDocumentAlreadyLoaded )
+ if ( GetFileName() == "" )
{
- gdcmWarningMacro( "A file was already parsed inside this "
- << "gdcm::Document (previous name was: "
- << Filename.c_str() << ". New name is :"
- << fileName );
- // todo : clean out the 'Document'
- // Should we call ClearEntry() on the parent object ?!?
+ 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 )
+{
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();
Fp = 0;
if ( !OpenFile() )
newValEntry = dynamic_cast<ValEntry*>(newDocEntry);
newBinEntry = dynamic_cast<BinEntry*>(newDocEntry);
- if ( newValEntry || newBinEntry )
+ if ( newValEntry || newBinEntry )
{
+ //////////////////////////// ContentEntry
if ( newBinEntry )
{
vr = newDocEntry->GetVR();
}
//////////////////// BinEntry or UNKOWN VR:
+
// When "this" is a Document the Key is simply of the
// form ( group, elem )...
if ( dynamic_cast< Document* > ( set ) )
// 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() );
+ 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
// ...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 :
if ( !set->AddEntry( newValEntry ) )
{
- //gdcmWarningMacro( "in ParseDES : cannot add a ValEntry "
- // << newValEntry->GetKey() );
+ gdcmWarningMacro( "in ParseDES : cannot add a ValEntry "
+ << 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;
// 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 )
}
if ( !set->AddEntry( newSeqEntry ) )
{
- //gdcmWarningMacro( "in ParseDES : cannot add a SeqEntry "
- // << newSeqEntry->GetKey() );
+ gdcmWarningMacro( "in ParseDES : cannot add a SeqEntry "
+ << newSeqEntry->GetKey() );
used = false;
}
delete newDocEntry;
break;
}
- }
+ } // end SeqEntry : VR = "SQ"
if ( !used )
delete newDocEntry;
- }
+ } // end While
}
/**
}
// 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 )
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff