X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=18bce3cf67b7b6a172fc7ea712b1a06c60c29bf1;hb=6b0359d3c073112a5d6a23114d6adb0fff949e7b;hp=edda84f75da3e456d54322b4a16d68daa8d48526;hpb=59f82f69b2058add41553637396b880a92ca999b;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index edda84f7..18bce3cf 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -1,535 +1,1041 @@ -// gdcmDicomDir.cxx +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDir.cxx,v $ + Language: C++ + Date: $Date: 2005/02/07 14:48:34 $ + Version: $Revision: 1.130 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + +//----------------------------------------------------------------------------- +// For full DICOMDIR description, see: +// PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- #include "gdcmDicomDir.h" -#include "gdcmStudy.h" -#include "gdcmSerie.h" -#include "gdcmImage.h" +#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 "gdcmFile.h" +#include "gdcmSeqEntry.h" +#include "gdcmSQItem.h" +#include "gdcmValEntry.h" +#include #include #include - #include -#include -//----------------------------------------------------------------------------- -// For full DICOMDIR description, see: -// PS 3.3-2003, pages 731-750 + +#ifdef _MSC_VER +# define getcwd _getcwd +#endif + +#if defined(_MSC_VER) || defined(__BORLANDC__) +# include +#else +# include +#endif +// ---------------------------------------------------------------------------- +// Note for future developpers +// ---------------------------------------------------------------------------- +// +// Dicom PS 3.3 describes the relationship between Directory Records, as follow +// +// Directory Record Type Directory Record Types which may be included +// in the next lower-èlevel directory Entity +// +// (Root directory Entity) PATIENT +// +// PATIENT STUDY +// +// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT +// +// 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 +// 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 +// +// ---------------------- +// The current gdcm version only deals with : +// +// (Root directory Entity) PATIENT +// PATIENT STUDY +// STUDY SERIES +// SERIES IMAGE +// IMAGE / +// +// DicomDir::CreateDicomDir will have to be completed +// Treelike structure management will have to be upgraded +// ---------------------------------------------------------------------------- + +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor -/* - * \ingroup gdcmDicomDir - * \brief Constructor - * @param Filename - * @param exception_on_error +/** + * \brief Constructor : creates an empty DicomDir */ -gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir, - bool exception_on_error): - gdcmParser(FileName,exception_on_error,true) +DicomDir::DicomDir() + :Document( ) { - if( GetListEntry().begin()==GetListEntry().end() ) + Initialize(); // sets all private fields to NULL + 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 + */ +DicomDir::DicomDir(std::string const &fileName, bool parseDir ): + Document( fileName ) +{ + // 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 ( GetFirstEntry() == 0 ) // when user passed a Directory to parse { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry list empty"); + if (!parseDir) + gdcmWarningMacro( "Entry HT empty for file: "<SetPrintLevel(printLevel); - (*cc)->Print(os); + gdcmWarningMacro( "Wrong filetype"); + return false; + } + if( !MetaElems ) + { + gdcmWarningMacro( "Meta Elements missing in DicomDir"); + return false; } + if( Patients.size() <= 0 ) + { + gdcmWarningMacro( "NO Patient in DicomDir"); + return false; + } + + return true; } -//----------------------------------------------------------------------------- -// Public /** - * \ingroup gdcmDicomDir - * \brief writes on disc a DICOMDIR - * \ warning does NOT add the missing elements in the header : - * it's up to the user doing it ! - * @param fileName file to be written to - * @return false only when fail to open - */ -bool gdcmDicomDir::Write(std::string fileName) + * \brief adds *the* Meta to a partially created DICOMDIR + */ +DicomDirMeta *DicomDir::NewMeta() { - FILE * fp1; + if( MetaElems ) + delete MetaElems; + + DocEntry *entry = GetFirstEntry(); + if( entry ) + { + MetaElems = new DicomDirMeta(true); + + entry = GetFirstEntry(); + while( entry ) + { + if( dynamic_cast(entry) ) + break; - fp1=fopen(fileName.c_str(),"wb"); - if(fp1==NULL) + RemoveEntryNoDestroy(entry); + MetaElems->AddEntry(entry); + + entry = GetFirstEntry(); + } + } + else // after root directory parsing { - printf("Failed to open(write) File [%s] \n",fileName.c_str()); - return(false); + MetaElems = new DicomDirMeta(false); } + MetaElems->SetSQItemNumber(0); // To avoid further missprinting + return MetaElems; +} - char * filePreamble; - filePreamble=(char*)calloc(128,1); - fwrite(filePreamble,128,1,fp1); - fwrite("DICM",4,1,fp1); - free(filePreamble); +/** + * \brief adds a new Patient (with the basic elements) to a partially created + * DICOMDIR + */ +DicomDirPatient *DicomDir::NewPatient() +{ + DicomDirPatient *p = new DicomDirPatient(); + AddPatientToEnd( p ); + return p; +} + +/** + * \brief Remove all Patients + */ +void DicomDir::ClearPatient() +{ + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); + ++cc) + { + delete *cc; + } + Patients.clear(); +} - WriteEntries(fp1,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; +} - fclose(fp1); +/** + * \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()); - return true; + ++ItPatient; + if ( ItPatient != Patients.end() ) + return *ItPatient; + return NULL; } -/* - * \ingroup gdcmDicomDir - * \brief fills whole the structure +/** + * \brief fills the whole structure, starting from a root Directory */ -void gdcmDicomDir::ParseDirectory(void) +void DicomDir::ParseDirectory() { - NewDicomDir(GetPath()); + CreateDicomDirChainedList( GetFileName() ); CreateDicomDir(); } -//----------------------------------------------------------------------------- -// Protected -/* - * \ingroup gdcmDicomDir - * \brief create a gdcmDicomDir from a root Directory - * @param path entry point of the stree-like structure +/** + * \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::NewDicomDir(std::string path) +void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { - gdcmDirList fileList(path,1); - ListHeader list; - gdcmHeader *header; + if( StartArg && StartMethodArgDelete ) + { + StartMethodArgDelete( StartArg ); + } - listEntries.clear(); - patients.clear(); + StartMethod = method; + StartArg = arg; + StartMethodArgDelete = argDelete; +} - for(gdcmDirList::iterator it=fileList.begin(); - it!=fileList.end(); ++it) +/** + * \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 DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) +{ + if( ProgressArg && ProgressMethodArgDelete ) { - header=new gdcmHeader(it->c_str()); - if(header->IsReadable()) - list.push_back(header); - else - delete header; + ProgressMethodArgDelete( ProgressArg ); } - std::sort(list.begin(),list.end(),gdcmDicomDir::HeaderLessThan); - - std::string tmp=fileList.GetDirName(); - SetElements(tmp,list); + ProgressMethod = method; + ProgressArg = arg; + ProgressMethodArgDelete = argDelete; } -/* - * \ingroup gdcmDicomDir - * \brief Get the DicomDir path - * @param +/** + * \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 */ -std::string gdcmDicomDir::GetPath(void) +void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg, + DicomDir::Method *argDelete ) { - std::string path=GetFileName(); + if( EndArg && EndMethodArgDelete ) + { + EndMethodArgDelete( EndArg ); + } - int pos1=path.rfind("/"); - int pos2=path.rfind("\\"); - if(pos1>pos2) - path.resize(pos1); - else - path.resize(pos2); + EndMethod = method; + EndArg = arg; + EndMethodArgDelete = argDelete; +} - return(path); +/** + * \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 ) +{ + StartMethodArgDelete = method; } -//----------------------------------------------------------------------------- -// Private -/* - * \ingroup gdcmDicomDir - * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader +/** + * \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::CreateDicomDir() +void DicomDir::SetProgressMethodArgDelete( DicomDir::Method *method ) { - // The list is parsed. When a tag 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 - + ProgressMethodArgDelete = method; +} - gdcmDicomDirType type=gdcmDicomDir::GDCM_NONE; - ListTag::iterator begin; - ListTag::iterator end; - ListTag::iterator k; +/** + * \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 ) +{ + EndMethodArgDelete = method; +} - begin=listEntries.begin(); - end=begin; +/** + * \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) +{ + 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::ios::out | std::ios::binary); + if( !fp ) + { + gdcmWarningMacro("Failed to open(write) File: " << fileName.c_str()); + return false; + } + + char filePreamble[128]; + memset(filePreamble, 0, 128); + fp->write(filePreamble, 128); //FIXME + binary_write( *fp, "DICM"); + + DicomDirMeta *ptrMeta = GetMeta(); + ptrMeta->WriteContent(fp, ExplicitVR); - for(ListTag::iterator j=begin;j !=listEntries.end();++j) + // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta + for(i=0;i<4;++i) { - if((*j)->GetValue()=="PATIENT ") { - k = j; - break; - } - } - AddObjectToEnd(gdcmDicomDir::GDCM_META,begin,k); - - for(ListTag::iterator i=k;i !=listEntries.end();++i) + binary_write(*fp, sq[i]); + } + + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); + ++cc ) { - std::string v=(*i)->GetValue(); - if(v=="PATIENT ") - { - end=i; - AddObjectToEnd(type,begin,end); + (*cc)->WriteContent( fp, ExplicitVR ); + } + + // force writing Sequence Delimitation Item + for(i=0;i<4;++i) + { + binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff + } - type=gdcmDicomDir::GDCM_PATIENT; - begin=end; - } + fp->close(); + delete fp; - if(v=="STUDY ") - { - end=i; - AddObjectToEnd(type,begin,end); + return true; +} - type=gdcmDicomDir::GDCM_STUDY; - begin=end; - } +//----------------------------------------------------------------------------- +// 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) +{ + CallStartMethod(); + DirList dirList(path,1); // gets recursively the file list + unsigned int count = 0; + VectDocument list; + File *header; - if(v=="SERIES") - { - end=i; - AddObjectToEnd(type,begin,end); + DirListType fileList = dirList.GetFilenames(); - type=gdcmDicomDir::GDCM_SERIE; - begin=end; + for( DirListType::iterator it = fileList.begin(); + it != fileList.end(); + ++it ) + { + Progress = (float)(count+1)/(float)fileList.size(); + CallProgressMethod(); + if( Abort ) + { + break; } - if(v=="IMAGE ") + header = new File( it->c_str() ); + if( !header ) { - end=i; - AddObjectToEnd(type,begin,end); - - type=gdcmDicomDir::GDCM_IMAGE; - begin=end; + gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() ); + continue; } + + if( header->IsReadable() ) + { + // Add the file to the chained list: + list.push_back(header); + gdcmWarningMacro( "Readable " << it->c_str() ); + } + else + { + delete header; + } + count++; } + // sorts Patient/Study/Serie/ + std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan ); + + std::string tmp = dirList.GetDirName(); + //for each File of the chained list, add/update the Patient/Study/Serie/Image info + SetElements(tmp, list); + CallEndMethod(); - end=GetListEntry().end(); - AddObjectToEnd(type,begin,end); + for(VectDocument::iterator itDoc=list.begin(); + itDoc!=list.end(); + ++itDoc) + { + delete dynamic_cast(*itDoc); + } } -/* - * \ingroup gdcmDicomDir - * \brief - * @param type - * @param begin - * @param end + +/** + * \brief CallStartMethod */ -void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,ListTag::iterator begin,ListTag::iterator end) +void DicomDir::CallStartMethod() { - if(begin==end) - return; + Progress = 0.0f; + Abort = false; + if( StartMethod ) + { + StartMethod( StartArg ); + } +} - switch(type) +/** + * \brief CallProgressMethod + */ +void DicomDir::CallProgressMethod() +{ + if( ProgressMethod ) { - case gdcmDicomDir::GDCM_META: - AddMetaToEnd(begin,end); - break; - case gdcmDicomDir::GDCM_PATIENT: - AddPatientToEnd(begin,end); - break; - case gdcmDicomDir::GDCM_STUDY: - AddStudyToEnd(begin,end); - break; - case gdcmDicomDir::GDCM_SERIE: - AddSerieToEnd(begin,end); - break; - case gdcmDicomDir::GDCM_IMAGE: - AddImageToEnd(begin,end); - break; + ProgressMethod( ProgressArg ); } } +/** + * \brief CallEndMethod + */ +void DicomDir::CallEndMethod() +{ + Progress = 1.0f; + if( EndMethod ) + { + EndMethod( EndArg ); + } +} -/* - * \ingroup gdcmDicomDir - * \brief Well ... Not realy to end, there is only one occurence - * @param begin - * @param end -*/ -void gdcmDicomDir::AddMetaToEnd(ListTag::iterator begin,ListTag::iterator end) +//----------------------------------------------------------------------------- +// Private +/** + * \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() { - metaelems = new gdcmMeta(begin,end); + // 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 - + + // Directory record sequence + DocEntry *e = GetDocEntry(0x0004, 0x1220); + if ( !e ) + { + gdcmWarningMacro( "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); + if ( !s ) + { + gdcmWarningMacro( "Element (0004,1220) is not a Sequence ?!?"); + return; + } + + NewMeta(); + + DocEntry *d; + std::string v; + SQItem *si; + + SQItem *tmpSI=s->GetFirstSQItem(); + while(tmpSI) + { + d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type + if ( ValEntry* valEntry = dynamic_cast(d) ) + { + v = valEntry->GetValue(); + } + else + { + gdcmWarningMacro( "Not a ValEntry."); + continue; + } + + if( v == "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(true); + if( !AddStudyToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddStudyToEnd failed"); + } + } + else if( v == "SERIES" ) + { + si = new DicomDirSerie(true); + if( !AddSerieToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddSerieToEnd failed"); + } + } + else if( v == "IMAGE " ) + { + si = new DicomDirImage(true); + if( !AddImageToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + gdcmErrorMacro( "Add AddImageToEnd failed"); + } + } + else + { + // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE', + // neither an 'IMAGE' SQItem. Skip to next item. + continue; + } + if( si ) + MoveSQItem(si,tmpSI); + + tmpSI=s->GetNextSQItem(); + } + ClearEntry(); } -/* - * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end -*/ -void gdcmDicomDir::AddPatientToEnd(ListTag::iterator begin,ListTag::iterator end) +/** + * \brief AddPatientToEnd + * @param dd SQ Item to enqueue to the DicomPatient chained List + */ +bool DicomDir::AddPatientToEnd(DicomDirPatient *dd) { - patients.push_back(new gdcmPatient(begin,end)); + Patients.push_back(dd); + return true; } -/* - * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end +/** + * \brief AddStudyToEnd + * @param dd SQ Item to enqueue to the DicomDirStudy chained List */ - void gdcmDicomDir::AddStudyToEnd(ListTag::iterator begin,ListTag::iterator end) +bool DicomDir::AddStudyToEnd(DicomDirStudy *dd) { - if(patients.size()>0) + if( Patients.size() > 0 ) { - ListPatient::iterator itp=patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; - (*itp)->AddStudy(new gdcmStudy(begin,end)); + (*itp)->AddStudy(dd); + return true; } + return false; } -/* - * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end + +/** + * \brief AddSerieToEnd + * @param dd SQ Item to enqueue to the DicomDirSerie chained List */ -void gdcmDicomDir::AddSerieToEnd(ListTag::iterator begin,ListTag::iterator end) +bool DicomDir::AddSerieToEnd(DicomDirSerie *dd) { - if(patients.size()>0) + if( Patients.size() > 0 ) { - ListPatient::iterator itp=patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; - if((*itp)->GetStudies().size()>0) + DicomDirStudy *study = (*itp)->GetLastStudy(); + if( study ) { - ListStudy::iterator itst=(*itp)->GetStudies().end(); - itst--; - (*itst)->AddSerie(new gdcmSerie(begin,end)); + study->AddSerie(dd); + return true; } } + return false; } -/* - * \ingroup gdcmDicomDir - * @param begin - * @param end - * @param +/** + * \brief AddImageToEnd + * @param dd SQ Item to enqueue to the DicomDirImage chained List */ - void gdcmDicomDir::AddImageToEnd(ListTag::iterator begin,ListTag::iterator end) +bool DicomDir::AddImageToEnd(DicomDirImage *dd) { - if(patients.size()>0) + if( Patients.size() > 0 ) { - ListPatient::iterator itp=patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; - if((*itp)->GetStudies().size()>0) + DicomDirStudy *study = (*itp)->GetLastStudy(); + if( study ) { - ListStudy::iterator itst=(*itp)->GetStudies().end(); - itst--; - - if((*itst)->GetSeries().size()>0) + DicomDirSerie *serie = study->GetLastSerie(); + if( serie ) { - ListSerie::iterator its=(*itst)->GetSeries().end(); - its--; - (*its)->AddImage(new gdcmImage(begin,end)); + serie->AddImage(dd); + return true; } } } + return false; } -/* - * \ingroup gdcmDicomDir - * \brief - * @param path - * @param list +/** + * \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,ListHeader &list) +void DicomDir::SetElements(std::string const &path, VectDocument const &list) { - std::string patPrevName="", patPrevID=""; - std::string studPrevInstanceUID="", studPrevID=""; - std::string serPrevInstanceUID="", serPrevID=""; + ClearEntry(); + ClearPatient(); - std::string patCurName, patCurID; - std::string studCurInstanceUID, studCurID; - std::string serCurInstanceUID, serCurID; + std::string patPrevName = "", patPrevID = ""; + std::string studPrevInstanceUID = "", studPrevID = ""; + std::string serPrevInstanceUID = "", serPrevID = ""; - SetElement(path,GDCM_NONE,NULL); + std::string patCurName, patCurID; + std::string studCurInstanceUID, studCurID; + std::string serCurInstanceUID, serCurID; - ListTag::iterator debPat=listEntries.begin(); - for(ListHeader::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); + 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) - SetElement(path,GDCM_PATIENT,*it); + 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) - SetElement(path,GDCM_STUDY,*it); + 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) - SetElement(path,GDCM_SERIE,*it); + if( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID + || first ) + { + SetElement(path, GDCM_DICOMDIR_SERIE, *it); + first = true; + } // Always Deal with 'IMAGE' Elements - SetElement(path,GDCM_IMAGE,*it); + SetElement(path, GDCM_DICOMDIR_IMAGE, *it); - patPrevName=patCurName; - patPrevID=patCurID; - studPrevInstanceUID=studCurInstanceUID; - studPrevID=studCurID; - serPrevInstanceUID=serCurInstanceUID; - serPrevID=serCurID; + patPrevName = patCurName; + patPrevID = patCurID; + studPrevInstanceUID = studCurInstanceUID; + studPrevID = studCurID; + serPrevInstanceUID = serCurInstanceUID; + serPrevID = serCurID; + first = false; } } -/* - * \ingroup gdcmDicomDir - * \brief - * @param path - * @param type - * @param header +/** + * \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 gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,gdcmHeader *header) +void DicomDir::SetElement(std::string const &path, DicomDirType type, + Document *header) { - std::list elemList; - std::list::iterator it; - guint16 tmpGr, tmpEl; - gdcmDictEntry *dictEntry; - gdcmHeaderEntry *entry; + 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; + SQItem *si; - switch(type) + switch( type ) { - case GDCM_PATIENT: - elemList=gdcmGlobal::GetDicomDirElements()->GetPatientElements(); + case GDCM_DICOMDIR_IMAGE: + elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); + si = new DicomDirImage(true); + if( !AddImageToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add ImageToEnd failed"); + } break; - case GDCM_STUDY: - elemList=gdcmGlobal::GetDicomDirElements()->GetStudyElements(); + case GDCM_DICOMDIR_SERIE: + elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); + si = new DicomDirSerie(true); + if( !AddSerieToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add SerieToEnd failed"); + } break; - case GDCM_SERIE: - elemList=gdcmGlobal::GetDicomDirElements()->GetSerieElements(); + case GDCM_DICOMDIR_STUDY: + elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); + si = new DicomDirStudy(true); + if( !AddStudyToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add StudyToEnd failed"); + } break; - case GDCM_IMAGE: - elemList=gdcmGlobal::GetDicomDirElements()->GetImageElements(); + case GDCM_DICOMDIR_PATIENT: + elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); + si = new DicomDirPatient(true); + if( !AddPatientToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add PatientToEnd failed"); + } break; - case GDCM_NONE: - elemList=gdcmGlobal::GetDicomDirElements()->GetMetaElements(); + case GDCM_DICOMDIR_META: + 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; } + // 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 + + // FIXME : troubles found when it's a SeqEntry - for(it=elemList.begin();it!=elemList.end();++it) + // 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; + tmpGr = it->Group; + tmpEl = it->Elem; + dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); - dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl); - entry=new gdcmHeaderEntry(dictEntry); - entry->SetOffset(0); // just to avoid missprinting + entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! - if(header) - val=header->GetEntryByNumber(tmpGr,tmpEl); + 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->GetEntryValue(tmpGr, tmpEl); + } else - val=GDCM_UNFOUND; + { + val = GDCM_UNFOUND; + } - if(val==GDCM_UNFOUND) + if( val == GDCM_UNFOUND) { - if((tmpGr==0x0004) &&(tmpEl==0x1130) ) + if( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID { - // TODO force the *end* File Name(remove path) - val=path; + // force to the *end* File Name + val = Util::GetName( path ); } - else if( (tmpGr==0x0004) && (tmpEl==0x1500) ) // Only used for image + else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image { - if(header->GetFileName().substr(0,path.length())!=path) + if( header->GetFileName().substr(0, path.length()) != path ) { - dbg.Verbose(0, "gdcmDicomDir::SetElement : the base path of file name is incorrect"); - val=header->GetFileName(); + gdcmWarningMacro( "The base path of file name is incorrect"); + val = header->GetFileName(); } else - val=&(header->GetFileName()[path.length()]); + { + val = &(header->GetFileName().c_str()[path.length()]); + } } else { - val=it->value; + val = it->Value; } } - entry->SetValue(val); + else + { + if ( header->GetEntryLength(tmpGr,tmpEl) == 0 ) + val = it->Value; + } + + entry->SetValue( val ); // troubles expected when vr=SQ ... - if(dictEntry) + if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { - 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()); - } + gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that"); } + si->AddEntry(entry); + } +} - listEntries.push_back(entry); - } +/** + * \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(); + } } -bool gdcmDicomDir::HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2) +/** + * \brief compares two files + */ +bool DicomDir::HeaderLessThan(Document *header1, Document *header2) +{ + return *header1 < *header2; +} + +//----------------------------------------------------------------------------- +// 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 & ) { - return(*header1<*header2); + 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