X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=7eb67e4af159aed227c28cecbc381c59cf50bde5;hb=1dd2c40c0da9098b444ad53b0e3c23da808997fa;hp=d9f71b67e87674bc768b0146f74039a2e3f0440f;hpb=28d134e7a6dcc11f3703bb8ec85334636f57f56e;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index d9f71b67..7eb67e4a 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2004/10/09 03:21:55 $ - Version: $Revision: 1.71 $ + Date: $Date: 2005/01/29 11:43:05 $ + Version: $Revision: 1.122 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,25 +20,36 @@ #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" #include "gdcmDicomDirImage.h" +#include "gdcmDicomDirPatient.h" +#include "gdcmDicomDirMeta.h" +#include "gdcmDicomDirElement.h" #include "gdcmDirList.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 #include #include #include -#ifdef _MSC_VER - #include +#ifdef _MSC_VER +# define getcwd _getcwd +#endif + +#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 @@ -46,15 +57,13 @@ // Constructor / Destructor /** - * \ingroup gdcmDicomDir - * \brief Constructor : creates an empty gdcmDicomDir + * \brief Constructor : creates an empty DicomDir */ -gdcmDicomDir::gdcmDicomDir() - :gdcmDocument( ) -{ +DicomDir::DicomDir() + :Document( ) +{ Initialize(); // sets all private fields to NULL - std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ... - MetaElems = NewMeta(); + NewMeta(); } /** @@ -69,21 +78,26 @@ gdcmDicomDir::gdcmDicomDir() * - false if user passed an already built DICOMDIR file * and wants to use it */ -gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir ): - gdcmDocument( fileName ) +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, - // gdcmDocument 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, "gdcmDicomDir::gdcmDicomDir : entry HT empty"); + if (!parseDir) + gdcmVerboseMacro( "Entry HT empty for file: "<SetPrintLevel( PrintLevel ); - (*cc)->Print( os ); + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); } } @@ -167,24 +180,27 @@ void gdcmDicomDir::Print(std::ostream &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 gdcmDocument is the one of a reasonable DicomDir, + * @return true when Document is the one of a reasonable DicomDir, * false otherwise. */ -bool gdcmDicomDir::IsReadable() +bool DicomDir::IsReadable() { - if( !gdcmDocument::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; } @@ -192,48 +208,24 @@ bool gdcmDicomDir::IsReadable() } /** - * \brief Sets all fields to NULL - */ - -void gdcmDicomDir::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 = 0; -} - - -/** - * \ingroup gdcmDicomDir * \brief fills the whole structure, starting from a root Directory */ -void gdcmDicomDir::ParseDirectory() +void DicomDir::ParseDirectory() { CreateDicomDirChainedList( GetFileName() ); CreateDicomDir(); } /** - * \ingroup gdcmDicomDir - * \brief Set the start method to call when the parsing of the directory starts + * \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 gdcmDicomDir::SetStartMethod(gdcmMethod* method, void* arg, - gdcmMethod* argDelete ) +void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { if( StartArg && StartMethodArgDelete ) { @@ -246,27 +238,26 @@ void gdcmDicomDir::SetStartMethod(gdcmMethod* method, void* arg, } /** - * \ingroup gdcmDicomDir * \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 gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod* method) +void DicomDir::SetStartMethodArgDelete( DicomDir::Method *method ) { StartMethodArgDelete = method; } /** - * \ingroup gdcmDicomDir - * \brief Set the progress method to call when the parsing of the directory progress + * \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 */ -void gdcmDicomDir::SetProgressMethod(gdcmMethod* method, void* arg, - gdcmMethod* argDelete ) +void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { if( ProgressArg && ProgressMethodArgDelete ) { @@ -279,27 +270,25 @@ void gdcmDicomDir::SetProgressMethod(gdcmMethod* method, void* arg, } /** - * \ingroup gdcmDicomDir * \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 gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod* method) +void DicomDir::SetProgressMethodArgDelete( DicomDir::Method *method ) { ProgressMethodArgDelete = method; } /** - * \ingroup gdcmDicomDir * \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 gdcmDicomDir::SetEndMethod(gdcmMethod* method, void* arg, - gdcmMethod* argDelete ) +void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { if( EndArg && EndMethodArgDelete ) { @@ -312,20 +301,45 @@ void gdcmDicomDir::SetEndMethod(gdcmMethod* method, void* arg, } /** - * \ingroup gdcmDicomDir * \brief Set the method to delete the argument - * The argument is destroyed when the method is changed or when the class - * is destroyed + * 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 gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod* method) +void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) { EndMethodArgDelete = method; } /** - * \ingroup gdcmDicomDir - * \brief writes on disc a 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 ! * \todo : to be re-written using the DICOMDIR tree-like structure @@ -335,40 +349,50 @@ void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod* method) * @return false only when fail to open */ -bool gdcmDicomDir::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 }; - FILE* fp = fopen(fileName.c_str(), "wb"); + std::ofstream *fp = new std::ofstream(fileName.c_str(), + std::ios::out | std::ios::binary); if( !fp ) { - printf("Failed to open(write) File [%s] \n", fileName.c_str()); + gdcmVerboseMacro("Failed to open(write) File: " << fileName.c_str()); return false; } - uint8_t filePreamble[128]; + char filePreamble[128]; memset(filePreamble, 0, 128); - fwrite(filePreamble,128,1,fp); - fwrite("DICM",4,1,fp); + fp->write(filePreamble, 128); //FIXME + binary_write( *fp, "DICM"); - gdcmDicomDirMeta *ptrMeta = GetDicomDirMeta(); - ptrMeta->Write(fp, gdcmExplicitVR); + DicomDirMeta *ptrMeta = GetMeta(); + ptrMeta->WriteContent(fp, ExplicitVR); - // force writing 0004|1220 [SQ ], that CANNOT exist within gdcmDicomDirMeta - fwrite(&sq[0],8,1,fp); // 0004 1220 ffff ffff + // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta + for(i=0;i<4;++i) + { + binary_write(*fp, sq[i]); + } for(ListDicomDirPatient::iterator cc = Patients.begin(); cc != Patients.end(); ++cc ) { - (*cc)->Write( fp, gdcmExplicitVR ); + (*cc)->WriteContent( fp, ExplicitVR ); } // force writing Sequence Delimitation Item - fwrite(&sqt[0],8,1,fp); // fffe e0dd ffff ffff + for(i=0;i<4;++i) + { + binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff + } + + fp->close(); + delete fp; - fclose( fp ); return true; } @@ -376,22 +400,20 @@ bool gdcmDicomDir::WriteDicomDir(std::string const& fileName) // Protected /** - * \ingroup gdcmDicomDir - * \brief create a gdcmDocument-like chained list from a root Directory + * \brief create a Document-like chained list from a root Directory * @param path entry point of the tree-like structure */ -void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) +void DicomDir::CreateDicomDirChainedList(std::string const & path) { CallStartMethod(); - gdcmDirList fileList(path,1); // gets recursively the file list + DirList dirList(path,1); // gets recursively the file list unsigned int count = 0; VectDocument list; - gdcmHeader *header; + File *header; - TagHT.clear(); - Patients.clear(); + DirListType fileList = dirList.GetFilenames(); - for( gdcmDirList::iterator it = fileList.begin(); + for( DirListType::iterator it = fileList.begin(); it != fileList.end(); ++it ) { @@ -402,23 +424,18 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) break; } - header = new gdcmHeader( it->c_str() ); + header = new File( it->c_str() ); if( !header ) { - dbg.Verbose( 1, - "gdcmDicomDir::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, - "gdcmDicomDir::CreateDicomDirChainedList: readable ", - it->c_str() ); - + gdcmVerboseMacro( "Readable " << it->c_str() ); } else { @@ -427,141 +444,146 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) count++; } // sorts Patient/Study/Serie/ - std::sort(list.begin(), list.end(), gdcmDicomDir::HeaderLessThan ); + 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(); + + for(VectDocument::iterator itDoc=list.begin(); + itDoc!=list.end(); + ++itDoc) + { + delete dynamic_cast(*itDoc); + } } /** - * \ingroup gdcmDicomDir * \brief adds *the* Meta to a partially created DICOMDIR - */ - -gdcmDicomDirMeta * gdcmDicomDir::NewMeta() + */ +DicomDirMeta *DicomDir::NewMeta() { - gdcmDicomDirMeta *m = new gdcmDicomDirMeta( &TagHT ); - - 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->AddDocEntry( cc->second ); + if( dynamic_cast(entry) ) + break; + + RemoveEntryNoDestroy(entry); + MetaElems->AddEntry(entry); + + entry = GetFirstEntry(); } } else // after root directory parsing { - std::list elemList; - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements(); - m->FillObject(elemList); - } - m->SetSQItemNumber(0); // To avoid further missprinting - return m; + MetaElems = new DicomDirMeta(false); + } + 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 */ -gdcmDicomDirPatient * gdcmDicomDir::NewPatient() +DicomDirPatient *DicomDir::NewPatient() { - std::list::iterator it; - uint16_t tmpGr,tmpEl; - gdcmDictEntry *dictEntry; - gdcmValEntry *entry; - - std::list elemList; - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); - gdcmSQItem *s = new gdcmSQItem(0); + 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 gdcmValEntry( dictEntry ); - 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() ); - } - s->AddDocEntry( entry ); + delete *cc; } - - gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &TagHT); - Patients.push_front( p ); - - return p; + Patients.clear(); } /** * \brief adds to the HTable - * the gdcmEntries (Dicom Elements) corresponding to the given type + * the Entries (Dicom Elements) corresponding to the given type * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE - * @param type gdcmDicomDirObject type to create (GDCM_DICOMDIR_PATIENT, + * @param type DicomDirObject type to create (GDCM_DICOMDIR_PATIENT, * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) - * @param header gdcmHeader of the current file + * @param header Header of the current file */ -void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, - gdcmDocument *header) +void DicomDir::SetElement(std::string const &path, DicomDirType type, + Document *header) { - std::list elemList; - std::list::iterator it; + ListDicomDirElem elemList; //FIXME this is going to be a by copy operation + ListDicomDirElem::const_iterator it; uint16_t tmpGr, tmpEl; - gdcmDictEntry *dictEntry; - gdcmValEntry *entry; + DictEntry *dictEntry; + ValEntry *entry; std::string val; - gdcmSQItem *si = new gdcmSQItem(0); // all the items will be at level 1 + SQItem *si; + switch( type ) { case GDCM_DICOMDIR_IMAGE: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); + si = new DicomDirImage(true); + if( !AddImageToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add ImageToEnd failed"); + } break; - case GDCM_DICOMDIR_SERIE: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); + si = new DicomDirSerie(true); + if( !AddSerieToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add SerieToEnd failed"); + } break; - case GDCM_DICOMDIR_STUDY: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); + si = new DicomDirStudy(true); + if( !AddStudyToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add StudyToEnd failed"); + } break; - case GDCM_DICOMDIR_PATIENT: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); + si = new DicomDirPatient(true); + if( !AddPatientToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add PatientToEnd failed"); + } break; - case GDCM_DICOMDIR_META: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); + si = new DicomDirMeta(true); + if( MetaElems ) + { + delete MetaElems; + gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); + } + MetaElems = static_cast(si); break; - default: return; } @@ -579,18 +601,17 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, { tmpGr = it->Group; tmpEl = it->Elem; - dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl); + dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); - entry = new gdcmValEntry( dictEntry ); // Be sure it's never a BinEntry ! + 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 ) { // 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 { @@ -602,14 +623,13 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, if( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID { // force to the *end* File Name - val = GetName( path ); + val = Util::GetName( path ); } else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image { if( header->GetFileName().substr(0, path.length()) != path ) { - dbg.Verbose(0, "gdcmDicomDir::SetElement : the base path" - " of file name is incorrect"); + gdcmVerboseMacro( "The base path of file name is incorrect"); val = header->GetFileName(); } else @@ -624,75 +644,25 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, } else { - if ( header->GetEntryLengthByNumber(tmpGr,tmpEl) == 0 ) + if ( header->GetEntryLength(tmpGr,tmpEl) == 0 ) 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" - << std::endl; + gdcmVerboseMacro("GDCM_DICOMDIR_META ?!? should never print that"); } si->AddEntry(entry); } - switch( type ) - { - case GDCM_DICOMDIR_IMAGE: - AddDicomDirImageToEnd(si); - break; - - case GDCM_DICOMDIR_SERIE: - AddDicomDirSerieToEnd(si); - break; - - case GDCM_DICOMDIR_STUDY: - AddDicomDirStudyToEnd(si); - break; - - case GDCM_DICOMDIR_PATIENT: - AddDicomDirPatientToEnd(si); - break; - - default: - return; - } - //int count=1; // find a trick to increment - //s->AddEntry(si, count); // Seg Faults - } +//----------------------------------------------------------------------------- /** * \brief CallStartMethod */ -void gdcmDicomDir::CallStartMethod() +void DicomDir::CallStartMethod() { Progress = 0.0f; Abort = false; @@ -702,11 +672,11 @@ void gdcmDicomDir::CallStartMethod() } } +//----------------------------------------------------------------------------- /** - * \ingroup gdcmDicomDir * \brief CallProgressMethod */ -void gdcmDicomDir::CallProgressMethod() +void DicomDir::CallProgressMethod() { if( ProgressMethod ) { @@ -714,11 +684,11 @@ void gdcmDicomDir::CallProgressMethod() } } +//----------------------------------------------------------------------------- /** - * \ingroup gdcmDicomDir * \brief CallEndMethod */ -void gdcmDicomDir::CallEndMethod() +void DicomDir::CallEndMethod() { Progress = 1.0f; if( EndMethod ) @@ -730,12 +700,32 @@ void gdcmDicomDir::CallEndMethod() //----------------------------------------------------------------------------- // Private /** - * \ingroup gdcmDicomDir - * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader + * \brief Sets all fields to NULL */ -void gdcmDicomDir::CreateDicomDir() +void DicomDir::Initialize() { - // The list is parsed. + 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 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 @@ -744,63 +734,80 @@ void gdcmDicomDir::CreateDicomDir() // + loop to 1 - // Directory record sequence - gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + DocEntry *e = GetDocEntry(0x0004, 0x1220); if ( !e ) { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : 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; } - gdcmSeqEntry* s = dynamic_cast(e); + SeqEntry *s = dynamic_cast(e); if ( !s ) { - dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: no SeqEntry present"); - // useless : (0x0004,0x1220) IS a Sequence ! + gdcmVerboseMacro( "Element (0004,1220) is not a Sequence ?!?"); return; } - gdcmDicomDirType type = gdcmDicomDir::GDCM_DICOMDIR_META; - MetaElems = NewMeta(); - - ListSQItem listItems = s->GetSQItems(); + NewMeta(); - gdcmDocEntry * d; + DocEntry *d; std::string v; - 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 ( gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(d) ) + d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type + if ( ValEntry* valEntry = dynamic_cast(d) ) { - v = ValEntry->GetValue(); + v = valEntry->GetValue(); } else { - dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: not a ValEntry."); + gdcmVerboseMacro( "Not a ValEntry."); continue; } if( v == "PATIENT " ) { - AddDicomDirPatientToEnd( *i ); - type = gdcmDicomDir::GDCM_DICOMDIR_PATIENT; + si = new DicomDirPatient(true); + if( !AddPatientToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add PatientToEnd failed"); + } } else if( v == "STUDY " ) { - AddDicomDirStudyToEnd( *i ); - type = gdcmDicomDir::GDCM_DICOMDIR_STUDY; + si = new DicomDirStudy(true); + if( !AddStudyToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddStudyToEnd failed"); + } } else if( v == "SERIES" ) { - AddDicomDirSerieToEnd( *i ); - type = gdcmDicomDir::GDCM_DICOMDIR_SERIE; + si = new DicomDirSerie(true); + if( !AddSerieToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddSerieToEnd failed"); + } } else if( v == "IMAGE " ) { - AddDicomDirImageToEnd( *i ); - type = gdcmDicomDir::GDCM_DICOMDIR_IMAGE; + si = new DicomDirImage(true); + if( !AddImageToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddImageToEnd failed"); + } } else { @@ -808,103 +815,96 @@ void gdcmDicomDir::CreateDicomDir() // neither an 'IMAGE' SQItem. Skip to next item. continue; } - } -} + if( si ) + MoveSQItem(si,tmpSI); -/** - * \ingroup gdcmDicomDir - * \brief Well ... there is only one occurence - */ -void gdcmDicomDir::AddDicomDirMeta() -{ - if( MetaElems ) - { - delete MetaElems; + tmpSI=s->GetNextSQItem(); } - MetaElems = new gdcmDicomDirMeta( &TagHT ); + ClearEntry(); } /** - * \ingroup gdcmDicomDir - * \brief AddDicomDirPatientToEnd - * @param s SQ Item to enqueue to the DicomPatient chained List + * \brief AddPatientToEnd + * @param dd SQ Item to enqueue to the DicomPatient chained List */ -void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s) +bool DicomDir::AddPatientToEnd(DicomDirPatient *dd) { - Patients.push_back(new gdcmDicomDirPatient(s, &TagHT)); + Patients.push_back(dd); + return true; } /** - * \ingroup gdcmDicomDir - * \brief AddDicomDirStudyToEnd - * @param s SQ Item to enqueue to the DicomDirStudy chained List + * \brief AddStudyToEnd + * @param dd SQ Item to enqueue to the DicomDirStudy chained List */ - void gdcmDicomDir::AddDicomDirStudyToEnd(gdcmSQItem *s) +bool DicomDir::AddStudyToEnd(DicomDirStudy *dd) { if( Patients.size() > 0 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; - (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(s, &TagHT)); + (*itp)->AddStudy(dd); + return true; } + return false; } /** - * \ingroup gdcmDicomDir - * \brief AddDicomDirSerieToEnd - * @param s SQ Item to enqueue to the DicomDirSerie chained List + * \brief AddSerieToEnd + * @param dd SQ Item to enqueue to the DicomDirSerie chained List */ -void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *s) +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::iterator itst=(*itp)->GetDicomDirStudies().end(); - itst--; - (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(s, &TagHT)); + study->AddSerie(dd); + return true; } } + return false; } /** - * \ingroup gdcmDicomDir - * \brief AddDicomDirImageToEnd - * @param s SQ Item to enqueue to the DicomDirImage chained List + * \brief AddImageToEnd + * @param dd SQ Item to enqueue to the DicomDirImage chained List */ - void gdcmDicomDir::AddDicomDirImageToEnd(gdcmSQItem *s) +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::iterator itst = (*itp)->GetDicomDirStudies().end(); - itst--; - - if( (*itst)->GetDicomDirSeries().size() > 0 ) + DicomDirSerie *serie = study->GetLastSerie(); + if( serie ) { - ListDicomDirSerie::iterator its = (*itst)->GetDicomDirSeries().end(); - its--; - (*its)->AddDicomDirImage(new gdcmDicomDirImage(s, &TagHT)); + serie->AddImage(dd); + return true; } } } + return false; } /** - * \ingroup gdcmDicomDir * \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 gdcmDicomDir::SetElements(std::string &path, VectDocument &list) +void DicomDir::SetElements(std::string const & path, VectDocument const &list) { + ClearEntry(); + ClearPatient(); + std::string patPrevName = "", patPrevID = ""; std::string studPrevInstanceUID = "", studPrevID = ""; std::string serPrevInstanceUID = "", serPrevID = ""; @@ -913,32 +913,38 @@ void gdcmDicomDir::SetElements(std::string &path, VectDocument &list) std::string studCurInstanceUID, studCurID; std::string serCurInstanceUID, serCurID; - for( VectDocument::iterator it = list.begin(); - it != list.end(); ++it ) + bool first = true; + for( VectDocument::const_iterator it = list.begin(); + 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); - - if( patCurName != patPrevName || patCurID != patPrevID) + 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 ) { SetElement(path, GDCM_DICOMDIR_PATIENT, *it); + first = true; } // if new Study Deal with 'STUDY' Elements - if( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID ) + 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( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID + || first ) { SetElement(path, GDCM_DICOMDIR_SERIE, *it); + first = true; } // Always Deal with 'IMAGE' Elements @@ -950,16 +956,38 @@ void gdcmDicomDir::SetElements(std::string &path, VectDocument &list) studPrevID = studCurID; serPrevInstanceUID = serCurInstanceUID; serPrevID = serCurID; + first = false; + } +} + +/** + * \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(DocEntrySet *dst,DocEntrySet *src) +{ + DocEntry *entry; + + entry = src->GetFirstEntry(); + while(entry) + { + src->RemoveEntryNoDestroy(entry); + dst->AddEntry(entry); + // we destroyed -> the current iterator is not longer valid + entry = src->GetFirstEntry(); } } /** - * \ingroup gdcmDicomDir - * \brief compares two dgcmHeaders + * \brief compares two files */ -bool gdcmDicomDir::HeaderLessThan(gdcmDocument *header1, gdcmDocument *header2) +bool DicomDir::HeaderLessThan(Document *header1, Document *header2) { return *header1 < *header2; } +} // end namespace gdcm + //-----------------------------------------------------------------------------