X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=1c205cb948b077e5556ed7f7147b6b8caa18273b;hb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;hp=57401965e5d54f2820062f0b95c6556e3464b35f;hpb=17f558a37c559463d2a47c728f8554b1c953421f;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 57401965..1c205cb9 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 15:41:28 $ - Version: $Revision: 1.91 $ + Date: $Date: 2005/02/02 10:02:16 $ + Version: $Revision: 1.126 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,6 +16,10 @@ =========================================================================*/ +//----------------------------------------------------------------------------- +// For full DICOMDIR description, see: +// PS 3.3-2003, pages 731-750 +//----------------------------------------------------------------------------- #include "gdcmDicomDir.h" #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" @@ -27,7 +31,7 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" #include "gdcmGlobal.h" -#include "gdcmHeader.h" +#include "gdcmFile.h" #include "gdcmSeqEntry.h" #include "gdcmSQItem.h" #include "gdcmValEntry.h" @@ -38,39 +42,33 @@ #include #ifdef _MSC_VER -#define getcwd _getcwd +# define getcwd _getcwd #endif -#if defined( _MSC_VER) || defined(__BORLANDC__) - #include +#if defined(_MSC_VER) || defined(__BORLANDC__) +# include #else - #include +# include #endif namespace gdcm { - -//----------------------------------------------------------------------------- -// For full DICOMDIR description, see: -// PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- // Constructor / Destructor - /** - * \ingroup DicomDir * \brief Constructor : creates an empty DicomDir */ DicomDir::DicomDir() - :Document( ) -{ + :Document( ) +{ Initialize(); // sets all private fields to NULL - MetaElems = NewMeta(); + NewMeta(); } /** * \brief Constructor Parses recursively the directory and creates the DicomDir * or uses an already built DICOMDIR, depending on 'parseDir' value. - * @param fileName name + * @param fileName name * - of the root directory (parseDir = true) * - of the DICOMDIR (parseDir = false) * @param parseDir boolean @@ -79,20 +77,26 @@ DicomDir::DicomDir() * - false if user passed an already built DICOMDIR file * and wants to use it */ -DicomDir::DicomDir(std::string const & fileName, bool parseDir ): +DicomDir::DicomDir(std::string const &fileName, bool parseDir ): Document( fileName ) { - // Whatever user passed (a root directory or a DICOMDIR) - // and whatever the value of parseDir was, - // Document is already executed + // 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) + Initialize(); // sets all private fields to NULL // if user passed a root directory, sure we didn't get anything - if ( TagHT.begin() == TagHT.end() ) // when user passed a Directory to parse + + if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse { - dbg.Verbose(0, "DicomDir::DicomDir : entry HT empty"); + if (!parseDir) + gdcmVerboseMacro( "Entry HT empty for file: "<SetPrintLevel(PrintLevel); - MetaElems->Print(os); - } - for(ListDicomDirPatient::iterator cc = Patients.begin(); - cc != Patients.end(); - ++cc) - { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); - } -} - //----------------------------------------------------------------------------- // 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, @@ -186,16 +164,19 @@ void DicomDir::Print(std::ostream &os) */ bool DicomDir::IsReadable() { - if( !Document::IsReadable() ) + if( Filetype == Unknown) { + gdcmVerboseMacro( "Wrong filetype"); return false; } if( !MetaElems ) { + gdcmVerboseMacro( "Meta Elements missing in DicomDir"); return false; } if( Patients.size() <= 0 ) { + gdcmVerboseMacro( "NO Patient in DicomDir"); return false; } @@ -203,30 +184,6 @@ bool DicomDir::IsReadable() } /** - * \brief Sets all fields to NULL - */ - -void DicomDir::Initialize() -{ - StartMethod = NULL; - ProgressMethod = NULL; - EndMethod = NULL; - StartMethodArgDelete = NULL; - ProgressMethodArgDelete = NULL; - EndMethodArgDelete = NULL; - StartArg = NULL; - ProgressArg = NULL; - EndArg = NULL; - - Progress = 0.0; - Abort = false; - - MetaElems = NULL; -} - - -/** - * \ingroup DicomDir * \brief fills the whole structure, starting from a root Directory */ void DicomDir::ParseDirectory() @@ -236,7 +193,6 @@ void DicomDir::ParseDirectory() } /** - * \ingroup DicomDir * \brief Set the start method to call when the parsing of the * directory starts. * @param method Method to call @@ -244,8 +200,8 @@ void DicomDir::ParseDirectory() * @param argDelete Argument * \warning In python : the arg parameter isn't considered */ -void DicomDir::SetStartMethod( DicomDir::Method* method, void* arg, - DicomDir::Method* argDelete ) +void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { if( StartArg && StartMethodArgDelete ) { @@ -258,19 +214,17 @@ void DicomDir::SetStartMethod( DicomDir::Method* method, void* arg, } /** - * \ingroup DicomDir * \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::SetStartMethodArgDelete( DicomDir::Method* method ) +void DicomDir::SetStartMethodArgDelete( DicomDir::Method *method ) { StartMethodArgDelete = method; } /** - * \ingroup DicomDir * \brief Set the progress method to call when the parsing of the * directory progress * @param method Method to call @@ -278,8 +232,8 @@ void DicomDir::SetStartMethodArgDelete( DicomDir::Method* method ) * @param argDelete Argument * \warning In python : the arg parameter isn't considered */ -void DicomDir::SetProgressMethod( DicomDir::Method* method, void* arg, - DicomDir::Method* argDelete ) +void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { if( ProgressArg && ProgressMethodArgDelete ) { @@ -292,27 +246,25 @@ void DicomDir::SetProgressMethod( DicomDir::Method* method, void* arg, } /** - * \ingroup DicomDir * \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 ) +void DicomDir::SetProgressMethodArgDelete( DicomDir::Method *method ) { ProgressMethodArgDelete = method; } /** - * \ingroup DicomDir * \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 */ -void DicomDir::SetEndMethod( DicomDir::Method* method, void* arg, - DicomDir::Method* argDelete ) +void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { if( EndArg && EndMethodArgDelete ) { @@ -325,19 +277,44 @@ void DicomDir::SetEndMethod( DicomDir::Method* method, void* arg, } /** - * \ingroup DicomDir * \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::SetEndMethodArgDelete( DicomDir::Method* method ) +void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) { EndMethodArgDelete = method; } /** - * \ingroup DicomDir + * \brief Get the first entry while visiting the DicomDirPatients + * \return The first DicomDirPatient if found, otherwhise NULL + */ +DicomDirPatient *DicomDir::GetFirstPatient() +{ + ItPatient = Patients.begin(); + if ( ItPatient != Patients.end() ) + return *ItPatient; + return NULL; +} + +/** + * \brief Get the next entry while visiting the DicomDirPatients + * \note : meaningfull only if GetFirstEntry already called + * \return The next DicomDirPatient if found, otherwhise NULL + */ +DicomDirPatient *DicomDir::GetNextPatient() +{ + gdcmAssertMacro (ItPatient != Patients.end()); + + ++ItPatient; + if ( ItPatient != Patients.end() ) + return *ItPatient; + return NULL; +} + +/** * \brief writes on disc a DICOMDIR * \ warning does NOT add the missing elements in the header : * it's up to the user doing it ! @@ -348,17 +325,17 @@ void DicomDir::SetEndMethodArgDelete( DicomDir::Method* method ) * @return false only when fail to open */ -bool DicomDir::WriteDicomDir(std::string const& fileName) +bool DicomDir::WriteDicomDir(std::string const &fileName) { int i; uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff }; uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0xffff, 0xffff }; - std::ofstream* fp = new std::ofstream(fileName.c_str(), + std::ofstream *fp = new std::ofstream(fileName.c_str(), std::ios::out | std::ios::binary); if( !fp ) { - dbg.Verbose(2, "Failed to open(write) File: ", fileName.c_str()); + gdcmVerboseMacro("Failed to open(write) File: " << fileName.c_str()); return false; } @@ -367,7 +344,7 @@ bool DicomDir::WriteDicomDir(std::string const& fileName) fp->write(filePreamble, 128); //FIXME binary_write( *fp, "DICM"); - DicomDirMeta *ptrMeta = GetDicomDirMeta(); + DicomDirMeta *ptrMeta = GetMeta(); ptrMeta->WriteContent(fp, ExplicitVR); // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta @@ -397,21 +374,21 @@ bool DicomDir::WriteDicomDir(std::string const& fileName) //----------------------------------------------------------------------------- // Protected - /** - * \ingroup DicomDir * \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 fileList(path,1); // gets recursively the file list + DirList dirList(path,1); // gets recursively the file list unsigned int count = 0; VectDocument list; - Header *header; + File *header; - for( DirList::iterator it = fileList.begin(); + DirListType fileList = dirList.GetFilenames(); + + for( DirListType::iterator it = fileList.begin(); it != fileList.end(); ++it ) { @@ -422,23 +399,18 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) break; } - header = new Header( it->c_str() ); + header = new File( it->c_str() ); if( !header ) { - dbg.Verbose( 1, - "DicomDir::CreateDicomDirChainedList: " - "failure in new Header ", - it->c_str() ); + gdcmVerboseMacro( "Failure in new gdcm::File " << it->c_str() ); continue; } if( header->IsReadable() ) { - // Add the file header to the chained list: + // Add the file to the chained list: list.push_back(header); - dbg.Verbose( 1, - "DicomDir::CreateDicomDirChainedList: readable ", - it->c_str() ); + gdcmVerboseMacro( "Readable " << it->c_str() ); } else { @@ -449,8 +421,8 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) // sorts Patient/Study/Serie/ std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan ); - std::string tmp = fileList.GetDirName(); - //for each Header of the chained list, add/update the Patient/Study/Serie/Image info + std::string tmp = dirList.GetDirName(); + //for each File of the chained list, add/update the Patient/Study/Serie/Image info SetElements(tmp, list); CallEndMethod(); @@ -458,72 +430,66 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) itDoc!=list.end(); ++itDoc) { - delete dynamic_cast
(*itDoc); + delete dynamic_cast(*itDoc); } } /** - * \ingroup DicomDir * \brief adds *the* Meta to a partially created DICOMDIR - */ - -DicomDirMeta * DicomDir::NewMeta() + */ +DicomDirMeta *DicomDir::NewMeta() { - DicomDirMeta *m = new DicomDirMeta(); - - if ( TagHT.begin() != TagHT.end() ) // after Document Parsing + if( MetaElems ) + delete MetaElems; + + DocEntry *entry = GetFirstEntry(); + if( entry ) { - 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) + MetaElems = new DicomDirMeta(true); + + entry = GetFirstEntry(); + while( entry ) { - m->AddEntry( cc->second ); + if( dynamic_cast(entry) ) + break; + + RemoveEntryNoDestroy(entry); + MetaElems->AddEntry(entry); + + entry = GetFirstEntry(); } } else // after root directory parsing { - ListDicomDirMetaElem const & elemList = - Global::GetDicomDirElements()->GetDicomDirMetaElements(); - m->FillObject(elemList); + MetaElems = new DicomDirMeta(false); } - m->SetSQItemNumber(0); // To avoid further missprinting - return m; + MetaElems->SetSQItemNumber(0); // To avoid further missprinting + return MetaElems; } /** - * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR + * \brief adds a new Patient (with the basic elements) to a partially created + * DICOMDIR */ -DicomDirPatient * DicomDir::NewPatient() +DicomDirPatient *DicomDir::NewPatient() { - ListDicomDirPatientElem::const_iterator it; - uint16_t tmpGr,tmpEl; - DictEntry *dictEntry; - ValEntry *entry; - - ListDicomDirPatientElem const & elemList = - Global::GetDicomDirElements()->GetDicomDirPatientElements(); DicomDirPatient *p = new DicomDirPatient(); + AddPatientToEnd( p ); + return p; +} - // for all the DicomDirPatient Elements - for( it = elemList.begin(); it != elemList.end(); ++it ) +/** + * \brief Remove all Patients + */ +void DicomDir::ClearPatient() +{ + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); + ++cc) { - tmpGr = it->Group; - tmpEl = it->Elem; - dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl); - entry = new ValEntry( dictEntry ); - entry->SetOffset(0); // just to avoid further missprinting - entry->SetValue( it->Value ); - - p->AddEntry( entry ); + delete *cc; } - - Patients.push_front( p ); - - return p; + Patients.clear(); } /** @@ -534,7 +500,7 @@ DicomDirPatient * DicomDir::NewPatient() * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) * @param header Header of the current file */ -void DicomDir::SetElement(std::string const & path, DicomDirType type, +void DicomDir::SetElement(std::string const &path, DicomDirType type, Document *header) { ListDicomDirElem elemList; //FIXME this is going to be a by copy operation @@ -549,48 +515,47 @@ void DicomDir::SetElement(std::string const & path, DicomDirType type, { case GDCM_DICOMDIR_IMAGE: elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); - si = new DicomDirImage(); - if( !AddDicomDirImageToEnd(static_cast(si)) ) + si = new DicomDirImage(true); + if( !AddImageToEnd(static_cast(si)) ) { - dbg.Verbose(0,"DicomDir::SetElement:", - "Add DicomDirImageToEnd failed"); + delete si; + gdcmErrorMacro( "Add ImageToEnd failed"); } break; case GDCM_DICOMDIR_SERIE: elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); - si = new DicomDirSerie(); - if( !AddDicomDirSerieToEnd(static_cast(si)) ) + si = new DicomDirSerie(true); + if( !AddSerieToEnd(static_cast(si)) ) { - dbg.Verbose(0,"DicomDir::SetElement:", - "Add DicomDirSerieToEnd failed"); + delete si; + gdcmErrorMacro( "Add SerieToEnd failed"); } break; case GDCM_DICOMDIR_STUDY: elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); - si = new DicomDirStudy(); - if( !AddDicomDirStudyToEnd(static_cast(si)) ) + si = new DicomDirStudy(true); + if( !AddStudyToEnd(static_cast(si)) ) { - dbg.Verbose(0,"DicomDir::SetElement:", - "Add DicomDirStudyToEnd failed"); + delete si; + gdcmErrorMacro( "Add StudyToEnd failed"); } break; case GDCM_DICOMDIR_PATIENT: elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); - si = new DicomDirPatient(); - if( !AddDicomDirPatientToEnd(static_cast(si)) ) + si = new DicomDirPatient(true); + if( !AddPatientToEnd(static_cast(si)) ) { - dbg.Verbose(0,"DicomDir::SetElement:", - "Add DicomDirPatientToEnd failed"); + delete si; + gdcmErrorMacro( "Add PatientToEnd failed"); } break; case GDCM_DICOMDIR_META: elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); - si = new DicomDirMeta(); + si = new DicomDirMeta(true); if( MetaElems ) { - dbg.Verbose(0,"DicomDir::SetElement:", - "MetaElements already exist, they will be destroyed"); delete MetaElems; + gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); } MetaElems = static_cast(si); break; @@ -605,13 +570,14 @@ void DicomDir::SetElement(std::string const & path, DicomDirType type, // 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()->GetDictEntryByNumber(tmpGr, tmpEl); + dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! @@ -621,7 +587,7 @@ void DicomDir::SetElement(std::string const & path, DicomDirType type, { // NULL when we Build Up (ex nihilo) a DICOMDIR // or when we add the META elems - val = header->GetEntryByNumber(tmpGr, tmpEl); + val = header->GetEntryValue(tmpGr, tmpEl); } else { @@ -639,8 +605,7 @@ void DicomDir::SetElement(std::string const & path, DicomDirType type, { if( header->GetFileName().substr(0, path.length()) != path ) { - dbg.Verbose(0, "DicomDir::SetElement : the base path" - " of file name is incorrect"); + gdcmVerboseMacro( "The base path of file name is incorrect"); val = header->GetFileName(); } else @@ -655,7 +620,7 @@ void DicomDir::SetElement(std::string const & path, DicomDirType type, } else { - if ( header->GetEntryLengthByNumber(tmpGr,tmpEl) == 0 ) + if ( header->GetEntryLength(tmpGr,tmpEl) == 0 ) val = it->Value; } @@ -663,14 +628,12 @@ void DicomDir::SetElement(std::string const & path, DicomDirType type, if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { - std::cout << "GDCM_DICOMDIR_META ?!? should never print that" - << std::endl; + gdcmVerboseMacro("GDCM_DICOMDIR_META ?!? should never print that"); } si->AddEntry(entry); } } -//----------------------------------------------------------------------------- /** * \brief CallStartMethod */ @@ -684,9 +647,7 @@ void DicomDir::CallStartMethod() } } -//----------------------------------------------------------------------------- /** - * \ingroup DicomDir * \brief CallProgressMethod */ void DicomDir::CallProgressMethod() @@ -697,9 +658,7 @@ void DicomDir::CallProgressMethod() } } -//----------------------------------------------------------------------------- /** - * \ingroup DicomDir * \brief CallEndMethod */ void DicomDir::CallEndMethod() @@ -714,12 +673,32 @@ void DicomDir::CallEndMethod() //----------------------------------------------------------------------------- // Private /** - * \ingroup DicomDir + * \brief Sets all fields to NULL + */ +void DicomDir::Initialize() +{ + StartMethod = NULL; + ProgressMethod = NULL; + EndMethod = NULL; + StartMethodArgDelete = NULL; + ProgressMethodArgDelete = NULL; + EndMethodArgDelete = NULL; + StartArg = NULL; + ProgressArg = NULL; + EndArg = NULL; + + Progress = 0.0; + Abort = false; + + MetaElems = NULL; +} + +/** * \brief create a 'DicomDir' from a DICOMDIR Header */ void DicomDir::CreateDicomDir() { - // The list is parsed. + // 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 @@ -728,68 +707,80 @@ void DicomDir::CreateDicomDir() // + loop to 1 - // Directory record sequence - DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + DocEntry *e = GetDocEntry(0x0004, 0x1220); if ( !e ) { - dbg.Verbose(0, "DicomDir::DicomDir : NO Directory record" - " sequence (0x0004,0x1220)"); + gdcmVerboseMacro( "No Directory Record Sequence (0004,1220) found"); /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? return; } - SeqEntry* s = dynamic_cast(e); + SeqEntry *s = dynamic_cast(e); if ( !s ) { - dbg.Verbose(0, "DicomDir::CreateDicomDir: no SeqEntry present"); - // useless : (0x0004,0x1220) IS a Sequence ! + gdcmVerboseMacro( "Element (0004,1220) is not a Sequence ?!?"); return; } - DicomDirType type; // = DicomDir::GDCM_DICOMDIR_META; - MetaElems = NewMeta(); - - ListSQItem listItems = s->GetSQItems(); + NewMeta(); - DocEntry * d; + DocEntry *d; std::string v; - SQItem * si; - for( ListSQItem::iterator i = listItems.begin(); - i !=listItems.end(); ++i ) + SQItem *si; + + SQItem *tmpSI=s->GetFirstSQItem(); + while(tmpSI) { - d = (*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type - if ( ValEntry* valEntry = dynamic_cast< ValEntry* >(d) ) + d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type + if ( ValEntry* valEntry = dynamic_cast(d) ) { v = valEntry->GetValue(); } else { - dbg.Verbose(0, "DicomDir::CreateDicomDir: not a ValEntry."); + gdcmVerboseMacro( "Not a ValEntry."); continue; } if( v == "PATIENT " ) { - si = new DicomDirPatient(); - AddDicomDirPatientToEnd( static_cast(si) ); - type = DicomDir::GDCM_DICOMDIR_PATIENT; + si = new DicomDirPatient(true); + if( !AddPatientToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add PatientToEnd failed"); + } } else if( v == "STUDY " ) { - si = new DicomDirStudy(); - AddDicomDirStudyToEnd( static_cast(si) ); - type = DicomDir::GDCM_DICOMDIR_STUDY; + si = new DicomDirStudy(true); + if( !AddStudyToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddStudyToEnd failed"); + } } else if( v == "SERIES" ) { - si = new DicomDirSerie(); - AddDicomDirSerieToEnd( static_cast(si) ); - type = DicomDir::GDCM_DICOMDIR_SERIE; + si = new DicomDirSerie(true); + if( !AddSerieToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddSerieToEnd failed"); + } } else if( v == "IMAGE " ) { - si = new DicomDirImage(); - AddDicomDirImageToEnd( static_cast(si) ); - type = DicomDir::GDCM_DICOMDIR_IMAGE; + si = new DicomDirImage(true); + if( !AddImageToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddImageToEnd failed"); + } } else { @@ -797,71 +788,55 @@ void DicomDir::CreateDicomDir() // neither an 'IMAGE' SQItem. Skip to next item. continue; } - MoveSQItem(si,*i); - } - TagHT.clear(); -} + if( si ) + MoveSQItem(si,tmpSI); -/** - * \ingroup DicomDir - * \brief Well ... there is only one occurence - */ -bool DicomDir::AddDicomDirMeta() -{ - if( MetaElems ) - { - delete MetaElems; + tmpSI=s->GetNextSQItem(); } - MetaElems = new DicomDirMeta(); - return true; + ClearEntry(); } /** - * \ingroup DicomDir - * \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; } /** - * \ingroup DicomDir - * \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 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; - (*itp)->AddDicomDirStudy(dd); + (*itp)->AddStudy(dd); return true; } return false; } /** - * \ingroup DicomDir - * \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 ) { 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; } } @@ -869,28 +844,23 @@ bool DicomDir::AddDicomDirSerieToEnd(DicomDirSerie *dd) } /** - * \ingroup DicomDir - * \brief AddDicomDirImageToEnd + * \brief AddImageToEnd * @param dd SQ Item to enqueue to the DicomDirImage chained List */ -bool DicomDir::AddDicomDirImageToEnd(DicomDirImage *dd) +bool DicomDir::AddImageToEnd(DicomDirImage *dd) { 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--; - - if( (*itst)->GetDicomDirSeries().size() > 0 ) + DicomDirSerie *serie = study->GetLastSerie(); + if( serie ) { - ListDicomDirSerie::const_iterator its = (*itst)->GetDicomDirSeries().end(); - its--; - (*its)->AddDicomDirImage(dd); + serie->AddImage(dd); return true; } } @@ -899,15 +869,15 @@ bool DicomDir::AddDicomDirImageToEnd(DicomDirImage *dd) } /** - * \ingroup DicomDir - * \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) { - TagHT.clear(); - Patients.clear(); + ClearEntry(); + ClearPatient(); std::string patPrevName = "", patPrevID = ""; std::string studPrevInstanceUID = "", studPrevID = ""; @@ -922,12 +892,12 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) it != list.end(); ++it ) { // get the current file characteristics - patCurName = (*it)->GetEntryByNumber(0x0010,0x0010); - patCurID = (*it)->GetEntryByNumber(0x0010,0x0011); - studCurInstanceUID = (*it)->GetEntryByNumber(0x0020,0x000d); - studCurID = (*it)->GetEntryByNumber(0x0020,0x0010); - serCurInstanceUID = (*it)->GetEntryByNumber(0x0020,0x000e); - serCurID = (*it)->GetEntryByNumber(0x0020,0x0011); + patCurName = (*it)->GetEntryValue(0x0010,0x0010); + patCurID = (*it)->GetEntryValue(0x0010,0x0011); + studCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000d); + studCurID = (*it)->GetEntryValue(0x0020,0x0010); + serCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000e); + serCurID = (*it)->GetEntryValue(0x0020,0x0011); if( patCurName != patPrevName || patCurID != patPrevID || first ) { @@ -965,35 +935,55 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) } /** - * \ingroup DicomDir - * \brief Move the content of the src SQItem to the dst SQItem + * \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; - src->Initialize(); - entry = src->GetNextEntry(); + entry = src->GetFirstEntry(); while(entry) { src->RemoveEntryNoDestroy(entry); dst->AddEntry(entry); - - src->Initialize(); - entry = src->GetNextEntry(); + // we destroyed -> the current iterator is not longer valid + entry = src->GetFirstEntry(); } } /** - * \ingroup DicomDir - * \brief compares two dgcmHeaders + * \brief compares two files */ bool DicomDir::HeaderLessThan(Document *header1, Document *header2) { return *header1 < *header2; } -} // end namespace gdcm //----------------------------------------------------------------------------- +// Print +/** + * \brief Canonical Printer + * @param os ostream we want to print in + * @param indent Indentation string to be prepended during printing + */ +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) + { + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); + } +} + +//----------------------------------------------------------------------------- +} // end namespace gdcm