Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/07/06 15:18:42 $
- Version: $Revision: 1.259 $
+ Date: $Date: 2005/08/23 12:57:49 $
+ Version: $Revision: 1.265 $
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
+ * \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( );
+}
- gdcmWarningMacro( "A file was already parsed inside this "
- << "gdcm::Document (previous name was: "
- << Filename.c_str() << ". New name is :"
- << fileName );
+/**
+ * \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() )
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<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() );
+ << newBinEntry->GetKey()
+ << " (at offset : "
+ << newBinEntry->GetOffset() << " )" );
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 ) )
+
+ // 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 );
}
-
- LoadDocEntry( newValEntry );
- bool delimitor=newValEntry->IsItemDelimitor();
- 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;
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;
- }
+ bool delimitor=newValEntry->IsItemDelimitor();
- if (delimitor)
- {
- if ( !used )
- delete newDocEntry;
- break;
- }
- if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max )
+ // 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 (offset!=132)
+ {
+ gdcmWarningMacro( "in ParseDES : Item found out of a Sequence "
+ << newValEntry->GetKey()
+ << " (at offset : "
+ << newValEntry->GetOffset() << " )" );
+ }
if ( !used )
delete newDocEntry;
break;
// 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() );
+ << 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
}
/**
}
// 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 )
*/
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);
+ }
}
/**
{
DictEntry *dictEntry = GetDictEntry(group,elem);
if ( dictEntry )
+ {
realVR = dictEntry->GetVR();
+ }
}
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff