Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/01/19 15:24:28 $
- Version: $Revision: 1.107 $
+ Date: $Date: 2006/01/27 10:01:33 $
+ Version: $Revision: 1.185 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
+//-----------------------------------------------------------------------------
+// For full DICOMDIR description, see:
+// PS 3.3-2003, pages 731-750
+//-----------------------------------------------------------------------------
#include "gdcmDicomDir.h"
+#include "gdcmDicomDirObject.h"
#include "gdcmDicomDirStudy.h"
#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirVisit.h"
#include "gdcmDicomDirImage.h"
#include "gdcmDicomDirPatient.h"
#include "gdcmDicomDirMeta.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
#include "gdcmGlobal.h"
-#include "gdcmHeader.h"
+#include "gdcmFile.h"
#include "gdcmSeqEntry.h"
#include "gdcmSQItem.h"
-#include "gdcmValEntry.h"
+#include "gdcmDataEntry.h"
+#include "gdcmCommandManager.h"
#include <fstream>
#include <string>
# include <unistd.h>
#endif
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memset
+#endif
+
+// ----------------------------------------------------------------------------
+// Note for future developpers
+// ----------------------------------------------------------------------------
+//
+// Dicom PS 3.3 describes the relationship between Directory Records, as follow
+// (see also PS 4.3, 2004, page 50 for Entity-Relationship model)
+//
+// Directory Record Type Directory Record Types which may be included
+// in the next lower-level directory Entity
+//
+// (Root directory Entity) PATIENT, TOPIC, PRIVATE
+//
+// PATIENT STUDY, PRIVATE
+//
+// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT, PRIVATE
+//
+// SERIES IMAGE, OVERLAYS, MODALITY LUT, VOI LUT,
+// CURVE, STORED PRINT, RT DOSE, RT STRUCTURE SET
+// RT PLAN, RT TREAT RECORD, PRESENTATION, WAVEFORM,
+// SR DOCUMENT, KEY OBJECT DOC, SPECTROSCOPY,
+// RAW DATA, REGISTRATION, FIDUCIAL, PRIVATE,
+// ENCAP DOC
+// IMAGE
+// OVERLAY
+// MODALITY LUT
+// VOI LUT
+// CURVE
+// STORED PRINT
+// RT DOSE
+// RT STRUCTURE SET
+// RT PLAN
+// RT TREAT RECORD
+// PRESENTATION
+// WAVEFORM
+// SR DOCUMENT
+// KEY OBJECT DOC
+// SPECTROSCOPY
+// RAW DATA
+// REGISTRATION
+// FIDUCIAL
+// PRIVATE
+// ENCAP DOC
+//
+// ----------------------
+// The current gdcm version only deals with :
+//
+// (Root directory Entity) PATIENT
+// PATIENT STUDY
+// STUDY SERIES
+// STUDY VISIT
+// SERIES IMAGE
+// IMAGE /
+//
+// DicomDir::CreateDicomDir will have to be completed
+// Treelike structure management will have to be upgraded
+// ----------------------------------------------------------------------------
+
namespace gdcm
{
-
-//-----------------------------------------------------------------------------
-// For full DICOMDIR description, see:
-// PS 3.3-2003, pages 731-750
//-----------------------------------------------------------------------------
// Constructor / Destructor
-
/**
* \brief Constructor : creates an empty DicomDir
*/
DicomDir::DicomDir()
- :Document( )
-{
+{
Initialize(); // sets all private fields to NULL
- MetaElems = NewMeta();
+ ParseDir = false;
+ NewMeta();
}
/**
- * \brief Constructor Parses recursively the directory and creates the DicomDir
- * or uses an already built DICOMDIR, depending on 'parseDir' value.
- * @param fileName name
- * - of the root directory (parseDir = true)
- * - of the DICOMDIR (parseDir = false)
- * @param parseDir boolean
- * - true if user passed an entry point
- * and wants to explore recursively the directories
- * - false if user passed an already built DICOMDIR file
- * and wants to use it
+ * \brief Canonical destructor
*/
-DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
- Document( fileName )
+DicomDir::~DicomDir()
{
- // At this step, Document constructor is already executed,
- // whatever user passed (a root directory or a DICOMDIR)
- // and whatever the value of parseDir was.
- // (nothing is cheked in Document constructor, to avoid overhead)
+ ClearPatient();
+ if ( MetaElems )
+ {
+ MetaElems->Delete();
+ }
+}
- Initialize(); // sets all private fields to NULL
+//-----------------------------------------------------------------------------
+// Public
- // if user passed a root directory, sure we didn't get anything
- if ( TagHT.begin() == TagHT.end() ) // when user passed a Directory to parse
+/**
+ * \brief Loader. use SetFileName(fn)
+ * or SetLoadMode(lm) + SetDirectoryName(dn) before !
+ * @return false if file cannot be open or no swap info was found,
+ * or no tag was found.
+ */
+bool DicomDir::Load( )
+{
+ if (!ParseDir)
{
- if (!parseDir)
- gdcmVerboseMacro( "Entry HT empty for file: "<<fileName);
+ if ( ! this->Document::Load( ) )
+ return false;
+ }
+ return DoTheLoadingJob( );
+}
- // Only if user passed a root directory
- // ------------------------------------
- if ( fileName == "." )
- {
- // user passed '.' as Name
- // we get current directory name
- char dummy[1000];
- getcwd(dummy, (size_t)1000);
- SetFileName( dummy ); // will be converted into a string
- }
+/**
+ * \brief Does 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 DicomDir::DoTheLoadingJob( )
+{
+ Progress = 0.0f;
+ Abort = false;
- if ( parseDir ) // user asked for a recursive parsing of a root directory
+ if (!ParseDir)
+ {
+ // Only if user passed a DICOMDIR
+ // ------------------------------
+ Fp = 0;
+ if (!Document::Load() )
{
- MetaElems = NewMeta();
-
- gdcmVerboseMacro( "Parse directory and create the DicomDir");
- ParseDirectory();
+ return false;
}
- else
+
+ if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse
{
- /// \todo if parseDir == false, it should be tagged as an error
- // NO ! user may just call ParseDirectory() *after* constructor
+ gdcmWarningMacro( "Entry HT empty for file: "<< GetFileName());
+ return false;
}
- }
- // Only if user passed a DICOMDIR
- // ------------------------------
- else
- {
// Directory record sequence
DocEntry *e = GetDocEntry(0x0004, 0x1220);
if ( !e )
{
- gdcmVerboseMacro( "NO 'Directory record sequence' (0x0004,0x1220)"
- << " in file " << fileName);
- /// \todo FIXME : what do we do when the parsed file IS NOT a
- /// DICOMDIR file ?
+ gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)"
+ << " in file " << GetFileName());
+ return false;
}
else
CreateDicomDir();
}
-}
-
-/**
- * \brief Canonical destructor
- */
-DicomDir::~DicomDir()
-{
- SetStartMethod(NULL);
- SetProgressMethod(NULL);
- SetEndMethod(NULL);
-
- for(ListDicomDirPatient::iterator cc = Patients.begin();
- cc!= Patients.end();
- ++cc)
- {
- delete *cc;
- }
- if ( MetaElems )
- {
- delete MetaElems;
- }
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief Canonical Printer
- */
-void DicomDir::Print(std::ostream &os, std::string const & )
-{
- if( MetaElems )
- {
- MetaElems->SetPrintLevel(PrintLevel);
- MetaElems->Print(os);
- }
- for(ListDicomDirPatient::iterator cc = Patients.begin();
- cc != Patients.end();
- ++cc)
+ else
{
- (*cc)->SetPrintLevel(PrintLevel);
- (*cc)->Print(os);
+ // Only if user passed a root directory
+ // ------------------------------------
+ if ( GetFileName() == "." )
+ {
+ // user passed '.' as Name
+ // we get current directory name
+ char buf[2048];
+ const char *cwd = getcwd(buf, 2048);
+ if( cwd )
+ {
+ SetFileName( buf ); // will be converted into a string
+ }
+ else
+ {
+ gdcmErrorMacro( "Path was too long to fit on 2048 bytes" );
+ }
+ }
+ NewMeta();
+ gdcmDebugMacro( "Parse directory and create the DicomDir : "
+ << GetFileName() );
+ ParseDirectory();
}
+ return true;
}
-//-----------------------------------------------------------------------------
-// Public
/**
* \brief This predicate, based on hopefully reasonable heuristics,
- * decides whether or not the current header was properly parsed
+ * decides whether or not the current document was properly parsed
* and contains the mandatory information for being considered as
* a well formed and usable DicomDir.
* @return true when Document is the one of a reasonable DicomDir,
*/
bool DicomDir::IsReadable()
{
- if( Filetype == Unknown)
+ if ( Filetype == Unknown )
{
- gdcmVerboseMacro( "Wrong filetype");
+ gdcmErrorMacro( "Wrong filetype for " << GetFileName());
return false;
}
- if( !MetaElems )
+ if ( !MetaElems )
{
- gdcmVerboseMacro( "Meta Elements missing in DicomDir");
+ gdcmWarningMacro( "Meta Elements missing in DicomDir");
return false;
}
- if( Patients.size() <= 0 )
+ if ( Patients.size() <= 0 )
{
- gdcmVerboseMacro( "NO Patient in DicomDir");
+ gdcmWarningMacro( "NO Patient in DicomDir");
return false;
}
}
/**
- * \brief Sets all fields to NULL
- */
-
-void DicomDir::Initialize()
+ * \brief adds *the* Meta to a partially created DICOMDIR
+ */
+DicomDirMeta *DicomDir::NewMeta()
{
- StartMethod = NULL;
- ProgressMethod = NULL;
- EndMethod = NULL;
- StartMethodArgDelete = NULL;
- ProgressMethodArgDelete = NULL;
- EndMethodArgDelete = NULL;
- StartArg = NULL;
- ProgressArg = NULL;
- EndArg = NULL;
-
- Progress = 0.0;
- Abort = false;
+ if ( MetaElems )
+ MetaElems->Delete();
- MetaElems = NULL;
-}
+ DocEntry *entry = GetFirstEntry();
+ if ( entry )
+ {
+ MetaElems = DicomDirMeta::New(true); // true = empty
+ entry = GetFirstEntry();
+ while( entry )
+ {
+ if ( dynamic_cast<SeqEntry *>(entry) )
+ break;
-/**
- * \brief fills the whole structure, starting from a root Directory
- */
-void DicomDir::ParseDirectory()
-{
- CreateDicomDirChainedList( GetFileName() );
- CreateDicomDir();
-}
+ MetaElems->AddEntry(entry);
+ RemoveEntry(entry);
-/**
- * \brief Set the start method to call when the parsing of the
- * directory starts.
- * @param method Method to call
- * @param arg Argument to pass to the method
- * @param argDelete Argument
- * \warning In python : the arg parameter isn't considered
- */
-void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg,
- DicomDir::Method *argDelete )
-{
- if( StartArg && StartMethodArgDelete )
+ entry = GetFirstEntry();
+ }
+ }
+ else // after root directory parsing
{
- StartMethodArgDelete( StartArg );
+ MetaElems = DicomDirMeta::New(false); // false = not empty
}
-
- StartMethod = method;
- StartArg = arg;
- StartMethodArgDelete = argDelete;
+ MetaElems->SetSQItemNumber(0); // To avoid further missprinting
+ return MetaElems;
}
/**
- * \brief Set the method to delete the argument
- * The argument is destroyed when the method is changed or when the
- * class is destroyed
- * @param method Method to call to delete the argument
+ * \brief adds a new Patient (with the basic elements) to a partially created
+ * DICOMDIR
*/
-void DicomDir::SetStartMethodArgDelete( DicomDir::Method *method )
+DicomDirPatient *DicomDir::NewPatient()
{
- StartMethodArgDelete = method;
+ DicomDirPatient *dd = DicomDirPatient::New();
+ AddPatientToEnd( dd );
+ return dd;
}
/**
- * \brief Set the progress method to call when the parsing of the
- * directory progress
- * @param method Method to call
- * @param arg Argument to pass to the method
- * @param argDelete Argument
- * \warning In python : the arg parameter isn't considered
+ * \brief Remove all Patients
*/
-void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg,
- DicomDir::Method *argDelete )
+void DicomDir::ClearPatient()
{
- if( ProgressArg && ProgressMethodArgDelete )
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc!= Patients.end();
+ ++cc)
{
- ProgressMethodArgDelete( ProgressArg );
+ (*cc)->Unregister();
}
-
- ProgressMethod = method;
- ProgressArg = arg;
- ProgressMethodArgDelete = argDelete;
+ Patients.clear();
}
/**
- * \brief Set the method to delete the argument
- * The argument is destroyed when the method is changed or when the
- * class is destroyed
- * @param method Method to call to delete the argument
- */
-void DicomDir::SetProgressMethodArgDelete( DicomDir::Method *method )
+ * \brief Get the first entry while visiting the DicomDirPatients
+ * \return The first DicomDirPatient if found, otherwhise NULL
+ */
+DicomDirPatient *DicomDir::GetFirstPatient()
{
- ProgressMethodArgDelete = method;
+ ItPatient = Patients.begin();
+ if ( ItPatient != Patients.end() )
+ return *ItPatient;
+ return NULL;
}
/**
- * \brief Set the end method to call when the parsing of the directory ends
- * @param method Method to call
- * @param arg Argument to pass to the method
- * @param argDelete Argument
- * \warning In python : the arg parameter isn't considered
+ * \brief Get the next entry while visiting the DicomDirPatients
+ * \note : meaningfull only if GetFirstEntry already called
+ * \return The next DicomDirPatient if found, otherwhise NULL
*/
-void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg,
- DicomDir::Method *argDelete )
+DicomDirPatient *DicomDir::GetNextPatient()
{
- if( EndArg && EndMethodArgDelete )
- {
- EndMethodArgDelete( EndArg );
- }
+ gdcmAssertMacro (ItPatient != Patients.end());
- EndMethod = method;
- EndArg = arg;
- EndMethodArgDelete = argDelete;
+ ++ItPatient;
+ if ( ItPatient != Patients.end() )
+ return *ItPatient;
+ return NULL;
}
/**
- * \brief Set the method to delete the argument
- * The argument is destroyed when the method is changed or when
- * the class is destroyed
- * @param method Method to call to delete the argument
+ * \brief fills the whole structure, starting from a root Directory
*/
-void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method )
+void DicomDir::ParseDirectory()
{
- EndMethodArgDelete = method;
+ CreateDicomDirChainedList( GetFileName() );
+ CreateDicomDir();
}
/**
* \brief writes on disc a DICOMDIR
* \ warning does NOT add the missing elements in the header :
* it's up to the user doing it !
- * \todo : to be re-written using the DICOMDIR tree-like structure
- * *not* the chained list
- * (does NOT exist if the DICOMDIR is user-forged !)
* @param fileName file to be written to
* @return false only when fail to open
*/
-bool DicomDir::WriteDicomDir(std::string const &fileName)
+bool DicomDir::Write(std::string const &fileName)
{
int i;
- uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff };
- uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0xffff, 0xffff };
+ uint16_t sq[6] = { 0x0004, 0x1220, 0x5153, 0x0000, 0xffff, 0xffff };
+ uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0x0000, 0x0000 };
std::ofstream *fp = new std::ofstream(fileName.c_str(),
std::ios::out | std::ios::binary);
- if( !fp )
+ if ( !fp )
{
- gdcmVerboseMacro("Failed to open(write) File: " << fileName.c_str());
+ gdcmWarningMacro("Failed to open(write) File: " << fileName.c_str());
return false;
}
char filePreamble[128];
memset(filePreamble, 0, 128);
- fp->write(filePreamble, 128); //FIXME
+ fp->write(filePreamble, 128);
binary_write( *fp, "DICM");
- DicomDirMeta *ptrMeta = GetDicomDirMeta();
+ DicomDirMeta *ptrMeta = GetMeta();
ptrMeta->WriteContent(fp, ExplicitVR);
// force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta
- for(i=0;i<4;++i)
+ for(i=0;i<6;++i)
{
binary_write(*fp, sq[i]);
}
// force writing Sequence Delimitation Item
for(i=0;i<4;++i)
{
- binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff
+ binary_write(*fp, sqt[i]); // fffe e0dd 0000 0000
}
fp->close();
return true;
}
+/**
+ * \brief Anonymize a DICOMDIR
+ * @return true
+ */
+
+bool DicomDir::Anonymize()
+{
+ DataEntry *v;
+ // Something clever to be found to forge the Patient names
+ std::ostringstream s;
+ int i = 1;
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc!= Patients.end();
+ ++cc)
+ {
+ s << i;
+ v = (*cc)->GetDataEntry(0x0010, 0x0010) ; // Patient's Name
+ if (v)
+ {
+ v->SetString(s.str());
+ }
+
+ v = (*cc)->GetDataEntry(0x0010, 0x0020) ; // Patient ID
+ if (v)
+ {
+ v->SetString(" ");
+ }
+
+ v = (*cc)->GetDataEntry(0x0010, 0x0030) ; // Patient's BirthDate
+ if (v)
+ {
+ v->SetString(" ");
+ }
+ s << "";
+ i++;
+ }
+ return true;
+}
+
+/**
+ * \brief Copies all the attributes from an other DocEntrySet
+ * @param set entry to copy from
+ * @remarks The contained DocEntries are not copied, only referenced
+ */
+void DicomDir::Copy(DocEntrySet *set)
+{
+ // Remove all previous childs
+ ClearPatient();
+
+ Document::Copy(set);
+
+ DicomDir *dd = dynamic_cast<DicomDir *>(set);
+ if( dd )
+ {
+ if(MetaElems)
+ MetaElems->Unregister();
+ MetaElems = dd->MetaElems;
+ if(MetaElems)
+ MetaElems->Register();
+
+ Patients = dd->Patients;
+ for(ItPatient = Patients.begin();ItPatient != Patients.end();++ItPatient)
+ (*ItPatient)->Register();
+ }
+}
+
//-----------------------------------------------------------------------------
// Protected
-
/**
* \brief create a Document-like chained list from a root Directory
* @param path entry point of the tree-like structure
*/
-void DicomDir::CreateDicomDirChainedList(std::string const & path)
+void DicomDir::CreateDicomDirChainedList(std::string const &path)
{
CallStartMethod();
DirList dirList(path,1); // gets recursively the file list
unsigned int count = 0;
VectDocument list;
- Header *header;
+ File *f;
DirListType fileList = dirList.GetFilenames();
-
+ unsigned int nbFile = fileList.size();
for( DirListType::iterator it = fileList.begin();
it != fileList.end();
++it )
{
- Progress = (float)(count+1)/(float)fileList.size();
+ Progress = (float)(count+1)/(float)nbFile;
CallProgressMethod();
- if( Abort )
+ if ( Abort )
{
break;
}
- header = new Header( it->c_str() );
- if( !header )
- {
- gdcmVerboseMacro( "Failure in new Header " << it->c_str() );
- continue;
- }
-
- if( header->IsReadable() )
+ f = File::New( );
+ f->SetLoadMode(LoadMode); // we allow user not to load Sequences,
+ // or Shadow groups, or ......
+ f->SetFileName( it->c_str() );
+ f->Load( );
+
+ if ( f->IsReadable() )
{
- // Add the file header to the chained list:
- list.push_back(header);
- gdcmVerboseMacro( "Readable " << it->c_str() );
+ // Add the file to the chained list:
+ list.push_back(f);
+ gdcmDebugMacro( "Readable " << it->c_str() );
}
else
{
- delete header;
+ f->Delete();
}
count++;
}
std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan );
std::string tmp = dirList.GetDirName();
- //for each Header of the chained list, add/update the Patient/Study/Serie/Image info
+ //for each File of the chained list, add/update the Patient/Study/Serie/Image info
SetElements(tmp, list);
CallEndMethod();
itDoc!=list.end();
++itDoc)
{
- delete dynamic_cast<Header *>(*itDoc);
+ dynamic_cast<File *>(*itDoc)->Delete();
}
}
+
+//-----------------------------------------------------------------------------
+// Private
/**
- * \brief adds *the* Meta to a partially created DICOMDIR
+ * \brief Sets all fields to NULL
*/
-
-DicomDirMeta * DicomDir::NewMeta()
+void DicomDir::Initialize()
{
- DicomDirMeta *m = new DicomDirMeta();
-
- if ( TagHT.begin() != TagHT.end() ) // after Document Parsing
- {
- TagDocEntryHT::iterator lastOneButSequence = TagHT.end();
- lastOneButSequence --;
- // ALL the 'out of Sequence' Tags belong to Meta Elems
- // (we skip 0004|1220 [Directory record sequence] )
- for ( TagDocEntryHT::iterator cc = TagHT.begin();
- cc != lastOneButSequence;
- ++cc)
- {
- m->AddEntry( cc->second );
- }
- }
- else // after root directory parsing
- {
- ListDicomDirMetaElem const &elemList =
- Global::GetDicomDirElements()->GetDicomDirMetaElements();
- m->FillObject(elemList);
- }
- m->SetSQItemNumber(0); // To avoid further missprinting
- return m;
+ Progress = 0.0;
+ Abort = false;
+
+ MetaElems = NULL;
}
/**
- * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR
+ * \brief create a 'gdcm::DicomDir' from a DICOMDIR Header
*/
-DicomDirPatient *DicomDir::NewPatient()
+void DicomDir::CreateDicomDir()
{
- ListDicomDirPatientElem::const_iterator it;
- uint16_t tmpGr,tmpEl;
- DictEntry *dictEntry;
- ValEntry *entry;
-
- ListDicomDirPatientElem const & elemList =
- Global::GetDicomDirElements()->GetDicomDirPatientElements();
- DicomDirPatient *p = new DicomDirPatient();
+ // The SeqEntries of "Directory Record Sequence" are parsed.
+ // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found :
+ // 1 - we save the beginning iterator
+ // 2 - we continue to parse
+ // 3 - we find an other tag
+ // + we create the object for the precedent tag
+ // + loop to 1 -
+ gdcmDebugMacro("Create DicomDir");
- // for all the DicomDirPatient Elements
- for( it = elemList.begin(); it != elemList.end(); ++it )
+ // Directory record sequence
+ DocEntry *e = GetDocEntry(0x0004, 0x1220);
+ if ( !e )
{
- tmpGr = it->Group;
- tmpEl = it->Elem;
- dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl);
- entry = new ValEntry( dictEntry );
- entry->SetOffset(0); // just to avoid further missprinting
- entry->SetValue( it->Value );
-
- p->AddEntry( entry );
+ gdcmWarningMacro( "No Directory Record Sequence (0004,1220) found");
+ return;
+ }
+
+ SeqEntry *s = dynamic_cast<SeqEntry *>(e);
+ if ( !s )
+ {
+ gdcmWarningMacro( "Element (0004,1220) is not a Sequence ?!?");
+ return;
}
- Patients.push_front( p );
-
- return p;
-}
-
-/**
- * \brief adds to the HTable
- * the Entries (Dicom Elements) corresponding to the given type
- * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE
- * @param type DicomDirObject type to create (GDCM_DICOMDIR_PATIENT,
- * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...)
- * @param header Header of the current file
- */
-void DicomDir::SetElement(std::string const &path, DicomDirType type,
- Document *header)
-{
- ListDicomDirElem elemList; //FIXME this is going to be a by copy operation
- ListDicomDirElem::const_iterator it;
- uint16_t tmpGr, tmpEl;
- DictEntry *dictEntry;
- ValEntry *entry;
- std::string val;
+ NewMeta();
+
+ DocEntry *d;
+ std::string v;
SQItem *si;
- switch( type )
+ SQItem *tmpSI=s->GetFirstSQItem();
+ while(tmpSI)
{
- case GDCM_DICOMDIR_IMAGE:
- elemList = Global::GetDicomDirElements()->GetDicomDirImageElements();
- si = new DicomDirImage();
- if( !AddDicomDirImageToEnd(static_cast<DicomDirImage *>(si)) )
- {
- gdcmVerboseMacro( "Add DicomDirImageToEnd failed");
- }
- break;
- case GDCM_DICOMDIR_SERIE:
- elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements();
- si = new DicomDirSerie();
- if( !AddDicomDirSerieToEnd(static_cast<DicomDirSerie *>(si)) )
- {
- gdcmVerboseMacro( "Add DicomDirSerieToEnd failed");
- }
- break;
- case GDCM_DICOMDIR_STUDY:
- elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements();
- si = new DicomDirStudy();
- if( !AddDicomDirStudyToEnd(static_cast<DicomDirStudy *>(si)) )
- {
- gdcmVerboseMacro( "Add DicomDirStudyToEnd failed");
- }
- break;
- case GDCM_DICOMDIR_PATIENT:
- elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements();
- si = new DicomDirPatient();
- if( !AddDicomDirPatientToEnd(static_cast<DicomDirPatient *>(si)) )
- {
- gdcmVerboseMacro( "Add DicomDirPatientToEnd failed");
- }
- break;
- case GDCM_DICOMDIR_META:
- elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
- si = new DicomDirMeta();
- if( MetaElems )
- {
- gdcmVerboseMacro( "MetaElements already exist, they will be destroyed");
- delete MetaElems;
- }
- MetaElems = static_cast<DicomDirMeta *>(si);
- break;
- default:
- return;
- }
- // removed all the seems-to-be-useless stuff about Referenced Image Sequence
- // to avoid further troubles
- // imageElem 0008 1140 "" // Referenced Image Sequence
- // imageElem fffe e000 "" // 'no length' item : length to be set to 0xffffffff later
- // imageElem 0008 1150 "" // Referenced SOP Class UID : to be set/forged later
- // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later
- // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later
- // for all the relevant elements found in their own spot of the DicomDir.dic
- // FIXME : troubles found when it's a SeqEntry
-
- for( it = elemList.begin(); it != elemList.end(); ++it)
- {
- tmpGr = it->Group;
- tmpEl = it->Elem;
- dictEntry = GetPubDict()->GetDictEntry(tmpGr, tmpEl);
-
- entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry !
-
- entry->SetOffset(0); // just to avoid further missprinting
-
- if( header )
+ d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type
+ if ( DataEntry *dataEntry = dynamic_cast<DataEntry *>(d) )
{
- // NULL when we Build Up (ex nihilo) a DICOMDIR
- // or when we add the META elems
- val = header->GetEntry(tmpGr, tmpEl);
+ v = dataEntry->GetString();
}
else
{
- val = GDCM_UNFOUND;
+ gdcmWarningMacro( "(0004,1430) not a DataEntry ?!?");
+ continue;
}
- if( val == GDCM_UNFOUND)
+ // A decent DICOMDIR has much more images than series,
+ // more series than studies, and so on.
+ // This is the right order to perform the tests
+
+ if ( v == "IMAGE " )
{
- if( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID
- {
- // force to the *end* File Name
- val = Util::GetName( path );
- }
- else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image
+ si = DicomDirImage::New(true);
+ if ( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
{
- if( header->GetFileName().substr(0, path.length()) != path )
- {
- gdcmVerboseMacro( "The base path of file name is incorrect");
- val = header->GetFileName();
- }
- else
- {
- val = &(header->GetFileName().c_str()[path.length()]);
- }
- }
- else
- {
- val = it->Value;
+ si->Delete();
+ si = NULL;
+ gdcmErrorMacro( "Add AddImageToEnd failed");
}
}
- else
- {
- if ( header->GetEntryLength(tmpGr,tmpEl) == 0 )
- val = it->Value;
- }
-
- entry->SetValue( val ); // troubles expected when vr=SQ ...
-
- if ( type == GDCM_DICOMDIR_META ) // fusible : should never print !
+ else if ( v == "SERIES" )
{
- std::cout << "GDCM_DICOMDIR_META ?!? should never print that"
- << std::endl;
- }
- si->AddEntry(entry);
- }
-}
-
-//-----------------------------------------------------------------------------
-/**
- * \brief CallStartMethod
- */
-void DicomDir::CallStartMethod()
-{
- Progress = 0.0f;
- Abort = false;
- if( StartMethod )
- {
- StartMethod( StartArg );
- }
-}
-
-//-----------------------------------------------------------------------------
-/**
- * \brief CallProgressMethod
- */
-void DicomDir::CallProgressMethod()
-{
- if( ProgressMethod )
- {
- ProgressMethod( ProgressArg );
- }
-}
-
-//-----------------------------------------------------------------------------
-/**
- * \brief CallEndMethod
- */
-void DicomDir::CallEndMethod()
-{
- Progress = 1.0f;
- if( EndMethod )
- {
- EndMethod( EndArg );
- }
-}
-
-//-----------------------------------------------------------------------------
-// Private
-/**
- * \brief create a 'DicomDir' from a DICOMDIR Header
- */
-void DicomDir::CreateDicomDir()
-{
- // The list is parsed.
- // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found :
- // 1 - we save the beginning iterator
- // 2 - we continue to parse
- // 3 - we find an other tag
- // + we create the object for the precedent tag
- // + loop to 1 -
-
- // Directory record sequence
- DocEntry *e = GetDocEntry(0x0004, 0x1220);
- if ( !e )
- {
- gdcmVerboseMacro( "NO Directory record sequence (0x0004,0x1220)");
- /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ?
- return;
- }
-
- SeqEntry *s = dynamic_cast<SeqEntry *>(e);
- if ( !s )
- {
- gdcmVerboseMacro( "No SeqEntry present");
- // useless : (0x0004,0x1220) IS a Sequence !
- return;
- }
-
- MetaElems = NewMeta();
-
- ListSQItem listItems = s->GetSQItems();
-
- DocEntry *d;
- std::string v;
- SQItem *si;
- for( ListSQItem::iterator i = listItems.begin();
- i !=listItems.end(); ++i )
- {
- d = (*i)->GetDocEntry(0x0004, 0x1430); // Directory Record Type
- if ( ValEntry* valEntry = dynamic_cast<ValEntry *>(d) )
- {
- v = valEntry->GetValue();
- }
- else
- {
- gdcmVerboseMacro( "Not a ValEntry.");
- continue;
- }
-
- if( v == "PATIENT " )
- {
- si = new DicomDirPatient();
- AddDicomDirPatientToEnd( static_cast<DicomDirPatient *>(si) );
+ si = DicomDirSerie::New(true);
+ if ( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
+ {
+ si->Delete();
+ si = NULL;
+ gdcmErrorMacro( "Add AddSerieToEnd failed");
+ }
}
- else if( v == "STUDY " )
+ else if ( v == "VISIT " )
{
- si = new DicomDirStudy();
- AddDicomDirStudyToEnd( static_cast<DicomDirStudy *>(si) );
+ si = DicomDirVisit::New(true);
+ if ( !AddVisitToEnd( static_cast<DicomDirVisit *>(si)) )
+ {
+ si->Delete();
+ si = NULL;
+ gdcmErrorMacro( "Add AddVisitToEnd failed");
+ }
}
- else if( v == "SERIES" )
+ else if ( v == "STUDY " )
{
- si = new DicomDirSerie();
- AddDicomDirSerieToEnd( static_cast<DicomDirSerie *>(si) );
+ si = DicomDirStudy::New(true);
+ if ( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
+ {
+ si->Delete();
+ si = NULL;
+ gdcmErrorMacro( "Add AddStudyToEnd failed");
+ }
}
- else if( v == "IMAGE " )
+ else if ( v == "PATIENT " )
{
- si = new DicomDirImage();
- AddDicomDirImageToEnd( static_cast<DicomDirImage *>(si) );
+ si = DicomDirPatient::New(true);
+ if ( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
+ {
+ si->Delete();
+ si = NULL;
+ gdcmErrorMacro( "Add PatientToEnd failed");
+ }
}
else
{
- // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
- // neither an 'IMAGE' SQItem. Skip to next item.
- continue;
+ // It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
+ // nor an 'IMAGE' SQItem. Skip to next item.
+ gdcmDebugMacro( " -------------------------------------------"
+ << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : "
+ << v);
+
+ // FIXME : deal with other item types !
+ tmpSI=s->GetNextSQItem(); // To avoid infinite loop
+ continue;
}
- MoveSQItem(si,*i);
- }
- TagHT.clear();
-}
+ if ( si )
+ si->Copy(tmpSI);
-/**
- * \brief Well ... there is only one occurence
- */
-bool DicomDir::AddDicomDirMeta()
-{
- if( MetaElems )
- {
- delete MetaElems;
+ tmpSI=s->GetNextSQItem();
}
- MetaElems = new DicomDirMeta();
- return true;
+ ClearEntry();
}
/**
- * \brief AddDicomDirPatientToEnd
+ * \brief AddPatientToEnd
* @param dd SQ Item to enqueue to the DicomPatient chained List
*/
-bool DicomDir::AddDicomDirPatientToEnd(DicomDirPatient *dd)
+bool DicomDir::AddPatientToEnd(DicomDirPatient *dd)
{
Patients.push_back(dd);
return true;
}
/**
- * \brief AddDicomDirStudyToEnd
+ * \brief AddStudyToEnd
* @param dd SQ Item to enqueue to the DicomDirStudy chained List
*/
-bool DicomDir::AddDicomDirStudyToEnd(DicomDirStudy *dd)
+bool DicomDir::AddStudyToEnd(DicomDirStudy *dd)
{
- if( Patients.size() > 0 )
+ if ( Patients.size() > 0 )
{
ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- (*itp)->AddDicomDirStudy(dd);
+ (*itp)->AddStudy(dd);
return true;
}
return false;
}
/**
- * \brief AddDicomDirSerieToEnd
+ * \brief AddSerieToEnd
* @param dd SQ Item to enqueue to the DicomDirSerie chained List
*/
-bool DicomDir::AddDicomDirSerieToEnd(DicomDirSerie *dd)
+bool DicomDir::AddSerieToEnd(DicomDirSerie *dd)
{
- if( Patients.size() > 0 )
+ if ( Patients.size() > 0 )
{
ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- if( (*itp)->GetDicomDirStudies().size() > 0 )
+ DicomDirStudy *study = (*itp)->GetLastStudy();
+ if ( study )
{
- ListDicomDirStudy::const_iterator itst =
- (*itp)->GetDicomDirStudies().end();
- itst--;
- (*itst)->AddDicomDirSerie(dd);
+ study->AddSerie(dd);
return true;
}
}
}
/**
- * \brief AddDicomDirImageToEnd
- * @param dd SQ Item to enqueue to the DicomDirImage chained List
+ * \brief AddVisitToEnd
+ * @param dd SQ Item to enqueue to the DicomDirVisit chained List
*/
-bool DicomDir::AddDicomDirImageToEnd(DicomDirImage *dd)
+bool DicomDir::AddVisitToEnd(DicomDirVisit *dd)
{
- if( Patients.size() > 0 )
+ if ( Patients.size() > 0 )
{
ListDicomDirPatient::iterator itp = Patients.end();
itp--;
- if( (*itp)->GetDicomDirStudies().size() > 0 )
+ DicomDirStudy *study = (*itp)->GetLastStudy();
+ if ( study )
{
- ListDicomDirStudy::const_iterator itst =
- (*itp)->GetDicomDirStudies().end();
- itst--;
+ study->AddVisit(dd);
+ return true;
+ }
+ }
+ return false;
+}
+/**
+ * \brief AddImageToEnd
+ * @param dd SQ Item to enqueue to the DicomDirImage chained List
+ */
+bool DicomDir::AddImageToEnd(DicomDirImage *dd)
+{
+ if ( Patients.size() > 0 )
+ {
+ ListDicomDirPatient::iterator itp = Patients.end();
+ itp--;
- if( (*itst)->GetDicomDirSeries().size() > 0 )
+ DicomDirStudy *study = (*itp)->GetLastStudy();
+ if ( study )
+ {
+ DicomDirSerie *serie = study->GetLastSerie();
+ if ( serie )
{
- ListDicomDirSerie::const_iterator its = (*itst)->GetDicomDirSeries().end();
- its--;
- (*its)->AddDicomDirImage(dd);
+ serie->AddImage(dd);
return true;
}
}
}
/**
- * \brief for each Header of the chained list, add/update the Patient/Study/Serie/Image info
+ * \brief for each Header of the chained list,
+ * add/update the Patient/Study/Serie/Image info
* @param path path of the root directory
* @param list chained list of Headers
*/
-void DicomDir::SetElements(std::string const & path, VectDocument const &list)
+void DicomDir::SetElements(std::string const &path, VectDocument const &list)
{
- TagHT.clear();
- Patients.clear();
+ ClearEntry();
+ ClearPatient();
std::string patPrevName = "", patPrevID = "";
std::string studPrevInstanceUID = "", studPrevID = "";
bool first = true;
for( VectDocument::const_iterator it = list.begin();
- it != list.end(); ++it )
+ it != list.end();
+ ++it )
{
// get the current file characteristics
- patCurName = (*it)->GetEntry(0x0010,0x0010);
- patCurID = (*it)->GetEntry(0x0010,0x0011);
- studCurInstanceUID = (*it)->GetEntry(0x0020,0x000d);
- studCurID = (*it)->GetEntry(0x0020,0x0010);
- serCurInstanceUID = (*it)->GetEntry(0x0020,0x000e);
- serCurID = (*it)->GetEntry(0x0020,0x0011);
-
- if( patCurName != patPrevName || patCurID != patPrevID || first )
+ patCurName = (*it)->GetEntryString(0x0010,0x0010);
+ patCurID = (*it)->GetEntryString(0x0010,0x0011);
+ studCurInstanceUID = (*it)->GetEntryString(0x0020,0x000d);
+ studCurID = (*it)->GetEntryString(0x0020,0x0010);
+ serCurInstanceUID = (*it)->GetEntryString(0x0020,0x000e);
+ serCurID = (*it)->GetEntryString(0x0020,0x0011);
+
+ if ( patCurName != patPrevName || patCurID != patPrevID || first )
{
SetElement(path, GDCM_DICOMDIR_PATIENT, *it);
first = true;
}
- // if new Study Deal with 'STUDY' Elements
- if( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID
+ // if new Study, deal with 'STUDY' Elements
+ if ( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID
|| first )
{
SetElement(path, GDCM_DICOMDIR_STUDY, *it);
first = true;
}
- // if new Serie Deal with 'SERIE' Elements
- if( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID
+ // if new Serie, deal with 'SERIE' Elements
+ if ( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID
|| first )
{
SetElement(path, GDCM_DICOMDIR_SERIE, *it);
- first = true;
}
// Always Deal with 'IMAGE' Elements
}
}
+/**
+ * \brief adds to the HTable
+ * the Entries (Dicom Elements) corresponding to the given type
+ * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE
+ * @param type DicomDirObject type to create (GDCM_DICOMDIR_PATIENT,
+ * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...)
+ * @param header Header of the current file
+ */
+void DicomDir::SetElement(std::string const &path, DicomDirType type,
+ Document *header)
+{
+ ListDicomDirElem elemList;
+ ListDicomDirElem::const_iterator it;
+ uint16_t tmpGr, tmpEl;
+ DictEntry *dictEntry;
+ DataEntry *entry;
+ std::string val;
+ SQItem *si;
+
+ switch( type )
+ {
+ case GDCM_DICOMDIR_IMAGE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirImageElements();
+ si = DicomDirImage::New(true);
+ if ( !AddImageToEnd(static_cast<DicomDirImage *>(si)) )
+ {
+ si->Delete();
+ gdcmErrorMacro( "Add ImageToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_SERIE:
+ elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements();
+ si = DicomDirSerie::New(true);
+ if ( !AddSerieToEnd(static_cast<DicomDirSerie *>(si)) )
+ {
+ si->Delete();
+ gdcmErrorMacro( "Add SerieToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_STUDY:
+ elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements();
+ si = DicomDirStudy::New(true);
+ if ( !AddStudyToEnd(static_cast<DicomDirStudy *>(si)) )
+ {
+ si->Delete();
+ gdcmErrorMacro( "Add StudyToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_PATIENT:
+ elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements();
+ si = DicomDirPatient::New(true);
+ if ( !AddPatientToEnd(static_cast<DicomDirPatient *>(si)) )
+ {
+ si->Delete();
+ gdcmErrorMacro( "Add PatientToEnd failed");
+ }
+ break;
+ case GDCM_DICOMDIR_META:
+ if ( MetaElems )
+ {
+ MetaElems->Delete();
+ gdcmErrorMacro( "MetaElements already exist, they will be destroyed");
+ }
+ elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements();
+ MetaElems = DicomDirMeta::New(true);
+ si = MetaElems;
+ break;
+ default:
+ return;
+ }
+
+ // FIXME : troubles found when it's a SeqEntry
+
+ // removed all the seems-to-be-useless stuff about Referenced Image Sequence
+ // to avoid further troubles
+ // imageElem 0008 1140 "" // Referenced Image Sequence
+ // imageElem fffe e000 "" // 'no length' item : length to be set to 0xffffffff later
+ // imageElem 0008 1150 "" // Referenced SOP Class UID : to be set/forged later
+ // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later
+ // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later
+
+ std::string referencedVal;
+ // for all the relevant elements found in their own spot of the DicomDir.dic
+ for( it = elemList.begin(); it != elemList.end(); ++it)
+ {
+ tmpGr = it->Group;
+ tmpEl = it->Elem;
+ dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl);
+
+ entry = DataEntry::New( dictEntry );
+ entry->SetOffset(0); // just to avoid further missprinting
+
+ if ( header )
+ {
+ // NULL when we Build Up (ex nihilo) a DICOMDIR
+ // or when we add the META elems
+
+ val = header->GetEntryString(tmpGr, tmpEl);
+ }
+ else
+ {
+ val = GDCM_UNFOUND;
+ }
+
+ if ( val == GDCM_UNFOUND)
+ {
+ if ( tmpGr == 0x0004 ) // never present in File !
+ {
+ switch (tmpEl)
+ {
+ case 0x1130: // File-set ID
+ // force to the *end* File Name
+ val = Util::GetName( path );
+ break;
+
+ case 0x1500: // Only used for image
+ if ( header->GetFileName().substr(0, path.length()) != path )
+ {
+ gdcmWarningMacro( "The base path of file name is incorrect");
+ val = header->GetFileName();
+ }
+ else
+ {
+ // avoid the first '/' in File name !
+ if ( header->GetFileName().c_str()[path.length()]
+ == GDCM_FILESEPARATOR )
+ val = &(header->GetFileName().c_str()[path.length()+1]);
+ else
+ val = &(header->GetFileName().c_str()[path.length()]);
+ }
+ break;
+
+ case 0x1510: // Referenced SOP Class UID in File
+ referencedVal = header->GetEntryString(0x0008, 0x0016);
+ // FIXME : probabely something to check
+ val = referencedVal;
+ break;
+
+ case 0x1511: // Referenced SOP Instance UID in File
+ referencedVal = header->GetEntryString(0x0008, 0x0018);
+ // FIXME : probabely something to check
+ val = referencedVal;
+ break;
+
+ case 0x1512: // Referenced Transfer Syntax UID in File
+ referencedVal = header->GetEntryString(0x0002, 0x0010);
+ // FIXME : probabely something to check
+ val = referencedVal;
+ break;
+
+ default :
+ val = it->Value;
+ }
+ }
+ else
+ {
+ // If the entry is not found in the Header, don't write its 'value' in the DICOMDIR !
+ entry->Delete();
+ continue;
+ }
+ }
+ else
+ {
+ if ( header->GetEntryLength(tmpGr,tmpEl) == 0 )
+ {
+ val = it->Value;
+ // Don't polute the DICOMDIR with empty fields
+ if (val == "")
+ {
+ entry->Delete();
+ continue;
+ }
+ }
+ }
+
+/* FIX later the pb of creating the 'Implementation Version Name'!
+
+ if (val == GDCM_UNFOUND)
+ val = "";
+
+ if ( tmpGr == 0x0002 && tmpEl == 0x0013)
+ {
+ // 'Implementation Version Name'
+ std::string val = "GDCM ";
+ val += Util::GetVersion();
+ }
+*/
+
+ entry->SetString( val ); // troubles expected when vr=SQ ...
+
+ if ( type == GDCM_DICOMDIR_META ) // fusible : should never print !
+ {
+ gdcmDebugMacro("GDCM_DICOMDIR_META ?!? should never print that");
+ }
+
+ si->AddEntry(entry);
+ entry->Delete();
+ }
+}
+
/**
* \brief Move the content of the source SQItem to the destination SQItem
* Only DocEntry's are moved
* @param dst destination SQItem
* @param src source SQItem
*/
-void DicomDir::MoveSQItem(SQItem *dst,SQItem *src)
-{
+void DicomDir::MoveSQItem(DocEntrySet *dst, DocEntrySet *src)
+{
DocEntry *entry;
-
+// todo : rewrite the whole stuff, without using RemoveEntry an AddEntry,
+// to save time
entry = src->GetFirstEntry();
while(entry)
{
- src->RemoveEntryNoDestroy(entry);
- dst->AddEntry(entry);
+ dst->AddEntry(entry); // use it, *before* removing it!
+ src->RemoveEntry(entry);
// we destroyed -> the current iterator is not longer valid
entry = src->GetFirstEntry();
}
}
/**
- * \brief compares two dgcmHeaders
+ * \brief compares two files
*/
bool DicomDir::HeaderLessThan(Document *header1, Document *header2)
{
return *header1 < *header2;
}
-
-/**
- * \brief Get the first entry while visiting the DicomDirPatients
- * \return The first DicomDirPatient if found, otherwhise NULL
- */
-DicomDirPatient *DicomDir::GetFirstEntry()
-{
- ItDicomDirPatient = Patients.begin();
- if ( ItDicomDirPatient != Patients.end() )
- return *ItDicomDirPatient;
- return NULL;
-}
-
+//-----------------------------------------------------------------------------
+// Print
/**
- * \brief Get the next entry while visiting the DicomDirPatients
- * \note : meaningfull only if GetFirstEntry already called
- * \return The next DicomDirPatient if found, otherwhise NULL
+ * \brief Canonical Printer
+ * @param os ostream we want to print in
+ * @param indent Indentation string to be prepended during printing
*/
-DicomDirPatient *DicomDir::GetNextEntry()
+void DicomDir::Print(std::ostream &os, std::string const & )
{
- gdcmAssertMacro (ItDicomDirPatient != Patients.end());
+ if ( MetaElems )
+ {
+ MetaElems->SetPrintLevel(PrintLevel);
+ MetaElems->Print(os);
+ }
+ for(ListDicomDirPatient::iterator cc = Patients.begin();
+ cc != Patients.end();
+ ++cc)
{
- ++ItDicomDirPatient;
- if ( ItDicomDirPatient != Patients.end() )
- return *ItDicomDirPatient;
+ (*cc)->SetPrintLevel(PrintLevel);
+ (*cc)->Print(os);
}
- return NULL;
}
-
-} // end namespace gdcm
-
//-----------------------------------------------------------------------------
+} // end namespace gdcm