Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 20:16:57 $
- Version: $Revision: 1.85 $
+ Date: $Date: 2004/12/07 13:39:33 $
+ Version: $Revision: 1.88 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
SetElements(tmp, list);
CallEndMethod();
- for(VectDocument::iterator it=list.begin();
- it!=list.end();
- ++it)
+ for(VectDocument::iterator itDoc=list.begin();
+ itDoc!=list.end();
+ ++itDoc)
{
- delete dynamic_cast<Header *>(*it);
+ delete dynamic_cast<Header *>(*itDoc);
}
}
cc != lastOneButSequence;
++cc)
{
- m->AddDocEntry( cc->second );
+ m->AddEntry( cc->second );
}
}
else // after root directory parsing
entry->SetOffset(0); // just to avoid further missprinting
entry->SetValue( it->Value );
- // dealing with value length ...
-
- if( dictEntry->GetGroup() == 0xfffe)
- {
- entry->SetLength(entry->GetValue().length());
- }
- else if( dictEntry->GetVR() == "UL" || dictEntry->GetVR() == "SL" )
- {
- entry->SetLength( 4 );
- }
- else if( dictEntry->GetVR() == "US" || dictEntry->GetVR() == "SS" )
- {
- entry->SetLength(2);
- }
- else if( dictEntry->GetVR() == "SQ" )
- {
- entry->SetLength( 0xffffffff );
- }
- else
- {
- entry->SetLength( entry->GetValue().length() );
- }
- p->AddDocEntry( entry );
+ p->AddEntry( entry );
}
Patients.push_front( p );
entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry !
entry->SetOffset(0); // just to avoid further missprinting
- entry->SetLength(0); // just to avoid further missprinting
if( header )
{
val = it->Value;
}
- // GDCM_UNFOUND or not !
-
entry->SetValue( val ); // troubles expected when vr=SQ ...
- if( dictEntry )
- {
- if( dictEntry->GetGroup() == 0xfffe )
- {
- entry->SetLength( entry->GetValue().length() ); // FIXME
- }
- else if( dictEntry->GetVR() == "UL" || dictEntry->GetVR() == "SL" )
- {
- entry->SetLength(4);
- }
- else if( dictEntry->GetVR() == "US" || dictEntry->GetVR() == "SS" )
- {
- entry->SetLength(2);
- }
- else if( dictEntry->GetVR() == "SQ" )
- {
- entry->SetLength( 0xffffffff );
- }
- else
- {
- entry->SetLength( entry->GetValue().length() );
- }
- }
-
if ( type == GDCM_DICOMDIR_META ) // fusible : should never print !
{
std::cout << "GDCM_DICOMDIR_META ?!? should never print that"