X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=b7f4cb00d04bfa18f3376856c1c2f893daaad918;hb=559c3639fc5b255b36a951f352db1addead9f78f;hp=edda84f75da3e456d54322b4a16d68daa8d48526;hpb=59f82f69b2058add41553637396b880a92ca999b;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index edda84f7..b7f4cb00 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -1,535 +1,982 @@ -// gdcmDicomDir.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDir.cxx,v $ + Language: C++ + Date: $Date: 2004/11/03 20:52:13 $ + Version: $Revision: 1.77 $ + + 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. + +=========================================================================*/ + #include "gdcmDicomDir.h" -#include "gdcmStudy.h" -#include "gdcmSerie.h" -#include "gdcmImage.h" +#include "gdcmDicomDirStudy.h" +#include "gdcmDicomDirSerie.h" +#include "gdcmDicomDirImage.h" #include "gdcmDirList.h" #include "gdcmUtil.h" - +#include "gdcmDebug.h" +#include "gdcmGlobal.h" +#include "gdcmHeader.h" +#include "gdcmSeqEntry.h" +#include "gdcmSQItem.h" +#include "gdcmValEntry.h" + +#include #include #include - #include -#include + +#ifdef _MSC_VER + #include +#else + #include +#endif +namespace gdcm +{ + //----------------------------------------------------------------------------- // For full DICOMDIR description, see: // PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- // Constructor / Destructor -/* - * \ingroup gdcmDicomDir - * \brief Constructor - * @param Filename - * @param exception_on_error + +/** + * \ingroup DicomDir + * \brief Constructor : creates an empty DicomDir + */ +DicomDir::DicomDir() + :Document( ) +{ + Initialize(); // sets all private fields to NULL + std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ... + MetaElems = 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 */ -gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir, - bool exception_on_error): - gdcmParser(FileName,exception_on_error,true) +DicomDir::DicomDir(std::string const & fileName, bool parseDir ): + Document( fileName ) { - if( GetListEntry().begin()==GetListEntry().end() ) + // Whatever user passed (a root directory or a DICOMDIR) + // and whatever the value of parseDir was, + // Document is already executed + 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 { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry list empty"); + dbg.Verbose(0, "DicomDir::DicomDir : entry HT empty"); - if(parseDir) + if ( fileName.size() == 1 && fileName[0] == '.' ) { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory and create the DicomDir"); + // user passed '.' as Name + // we get current directory name + char dummy[1000]; + getcwd(dummy, (size_t)1000); + SetFileName( dummy ); // will be converted into a string + } + + if ( parseDir ) // user asked for a recursive parsing of a root directory + { + MetaElems = NewMeta(); + + dbg.Verbose(0, "DicomDir::DicomDir : Parse directory" + " and create the DicomDir"); ParseDirectory(); } + else + { + /// \todo if parseDir == false, it should be tagged as an error + // NON ! il suffit d'appeler ParseDirectory() + // apres le constructeur + } } - else + else // Only if user passed a DICOMDIR + { + // Directory record sequence + DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + if ( !e ) + { + dbg.Verbose(0, "DicomDir::DicomDir : NO Directory record" + " sequence (0x0004,0x1220)"); + /// \todo FIXME : what do we do when the parsed file IS NOT a + /// DICOMDIR file ? + } CreateDicomDir(); + } } -/* - * \ingroup gdcmDicomDir - * \brief - * @param exception_on_error - */ -/*gdcmDicomDir::gdcmDicomDir(ListTag *l, - bool exception_on_error): - gdcmParser(exception_on_error ) -{ - listEntries=*l; - CreateDicomDir(); -}*/ - -/* - * \ingroup gdcmDicomDir +/** * \brief Canonical destructor */ -gdcmDicomDir::~gdcmDicomDir() +DicomDir::~DicomDir() { - delete metaelems; - - for(ListPatient::iterator cc=patients.begin();cc!=patients.end();++cc) + SetStartMethod(NULL); + SetProgressMethod(NULL); + SetEndMethod(NULL); + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); + ++cc) { delete *cc; } + if ( MetaElems ) + { + delete MetaElems; + } } //----------------------------------------------------------------------------- // Print -/* - * \ingroup gdcmDicomDir +/** * \brief Canonical Printer */ -void gdcmDicomDir::Print(std::ostream &os) +void DicomDir::Print(std::ostream &os) { - (*metaelems).SetPrintLevel(printLevel); - (*metaelems).Print(os); - - for(ListPatient::iterator cc=patients.begin();cc!=patients.end();++cc) + if( MetaElems ) + { + MetaElems->SetPrintLevel(PrintLevel); + MetaElems->Print(os); + } + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); + ++cc) { - (*cc)->SetPrintLevel(printLevel); - (*cc)->Print(os); + (*cc)->SetPrintLevel( PrintLevel ); + (*cc)->Print( os ); } } //----------------------------------------------------------------------------- // Public /** - * \ingroup gdcmDicomDir + * \brief This predicate, based on hopefully reasonable heuristics, + * decides whether or not the current header 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, + * false otherwise. + */ +bool DicomDir::IsReadable() +{ + if( !Document::IsReadable() ) + { + return false; + } + if( !MetaElems ) + { + return false; + } + if( Patients.size() <= 0 ) + { + return false; + } + + return true; +} + +/** + * \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 = 0; +} + + +/** + * \ingroup DicomDir + * \brief fills the whole structure, starting from a root Directory + */ +void DicomDir::ParseDirectory() +{ + CreateDicomDirChainedList( GetFileName() ); + CreateDicomDir(); +} + +/** + * \ingroup DicomDir + * \brief Set the start method to call when the parsing of the directory starts + * @param method Method to call + * @param arg Argument to pass to the method + * @param argDelete Argument + * \warning In python : the arg parameter isn't considered + */ +void DicomDir::SetStartMethod(Method* method, void* arg, + Method* argDelete ) +{ + if( StartArg && StartMethodArgDelete ) + { + StartMethodArgDelete( StartArg ); + } + + StartMethod = method; + StartArg = arg; + StartMethodArgDelete = argDelete; +} + +/** + * \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(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 + * @param arg Argument to pass to the method + * @param argDelete Argument + * \warning In python : the arg parameter isn't considered + */ +void DicomDir::SetProgressMethod(Method* method, void* arg, + Method* argDelete ) +{ + if( ProgressArg && ProgressMethodArgDelete ) + { + ProgressMethodArgDelete( ProgressArg ); + } + + ProgressMethod = method; + ProgressArg = arg; + ProgressMethodArgDelete = argDelete; +} + +/** + * \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(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(Method* method, void* arg, + Method* argDelete ) +{ + if( EndArg && EndMethodArgDelete ) + { + EndMethodArgDelete( EndArg ); + } + + EndMethod = method; + EndArg = arg; + EndMethodArgDelete = argDelete; +} + +/** + * \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(Method* method) +{ + EndMethodArgDelete = method; +} + +/** + * \ingroup DicomDir * \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 gdcmDicomDir::Write(std::string fileName) -{ - FILE * fp1; + +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 ) + { + dbg.Verbose(2, "Failed to open(write) File: ", fileName.c_str()); + return false; + } - fp1=fopen(fileName.c_str(),"wb"); - if(fp1==NULL) + char filePreamble[128]; + memset(filePreamble, 0, 128); + fp->write(filePreamble, 128); //FIXME + binary_write( *fp, "DICM"); + + DicomDirMeta *ptrMeta = GetDicomDirMeta(); + ptrMeta->Write(fp, ExplicitVR); + + // 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, ExplicitVR ); + } + + // force writing Sequence Delimitation Item + for(i=0;i<4;++i) { - printf("Failed to open(write) File [%s] \n",fileName.c_str()); - return(false); + binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff } - char * filePreamble; - filePreamble=(char*)calloc(128,1); - fwrite(filePreamble,128,1,fp1); - fwrite("DICM",4,1,fp1); - free(filePreamble); + fp->close(); + return true; +} - WriteEntries(fp1,DICOMDIR); +//----------------------------------------------------------------------------- +// Protected - fclose(fp1); +/** + * \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) +{ + CallStartMethod(); + DirList fileList(path,1); // gets recursively the file list + unsigned int count = 0; + VectDocument list; + Header *header; + + TagHT.clear(); + Patients.clear(); + + for( DirList::iterator it = fileList.begin(); + it != fileList.end(); + ++it ) + { + Progress = (float)(count+1)/(float)fileList.size(); + CallProgressMethod(); + if( Abort ) + { + break; + } - return true; + header = new Header( it->c_str() ); + if( !header ) + { + dbg.Verbose( 1, + "DicomDir::CreateDicomDirChainedList: " + "failure in new Header ", + it->c_str() ); + } + + if( header->IsReadable() ) + { + // Add the file header to the chained list: + list.push_back(header); + dbg.Verbose( 1, + "DicomDir::CreateDicomDirChainedList: readable ", + it->c_str() ); + + } + else + { + delete header; + } + count++; + } + // 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 + SetElements(tmp, list); + CallEndMethod(); } -/* - * \ingroup gdcmDicomDir - * \brief fills whole the structure +/** + * \ingroup DicomDir + * \brief adds *the* Meta to a partially created DICOMDIR */ -void gdcmDicomDir::ParseDirectory(void) + +DicomDirMeta * DicomDir::NewMeta() { - NewDicomDir(GetPath()); - CreateDicomDir(); + DicomDirMeta *m = new DicomDirMeta( &TagHT ); + + if ( TagHT.begin() != TagHT.end() ) // after Document Parsing + { + TagDocEntryHT::iterator lastOneButSequence = TagHT.end(); + lastOneButSequence --; + // ALL the 'out of Sequence' Tags belong to Meta Elems + // (we skip 0004|1220 [Directory record sequence] ) + for ( TagDocEntryHT::iterator cc = TagHT.begin(); + cc != lastOneButSequence; + ++cc) + { + m->AddDocEntry( cc->second ); + } + } + else // after root directory parsing + { + ListDicomDirMetaElem const & elemList = + Global::GetDicomDirElements()->GetDicomDirMetaElements(); + m->FillObject(elemList); + } + m->SetSQItemNumber(0); // To avoid further missprinting + return m; } -//----------------------------------------------------------------------------- -// Protected -/* - * \ingroup gdcmDicomDir - * \brief create a gdcmDicomDir from a root Directory - * @param path entry point of the stree-like structure +/** + * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR */ -void gdcmDicomDir::NewDicomDir(std::string path) +DicomDirPatient * DicomDir::NewPatient() { - gdcmDirList fileList(path,1); - ListHeader list; - gdcmHeader *header; + ListDicomDirPatientElem::const_iterator it; + uint16_t tmpGr,tmpEl; + DictEntry *dictEntry; + ValEntry *entry; - listEntries.clear(); - patients.clear(); + ListDicomDirPatientElem const & elemList = + Global::GetDicomDirElements()->GetDicomDirPatientElements(); + SQItem *s = new SQItem(0); - for(gdcmDirList::iterator it=fileList.begin(); - it!=fileList.end(); ++it) + // for all the DicomDirPatient Elements + for( it = elemList.begin(); it != elemList.end(); ++it ) { - header=new gdcmHeader(it->c_str()); - if(header->IsReadable()) - list.push_back(header); + 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 ); + + // 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 - delete header; + { + entry->SetLength( entry->GetValue().length() ); + } + s->AddDocEntry( entry ); } - std::sort(list.begin(),list.end(),gdcmDicomDir::HeaderLessThan); + DicomDirPatient *p = new DicomDirPatient(s, &TagHT); + Patients.push_front( p ); - std::string tmp=fileList.GetDirName(); - SetElements(tmp,list); + return p; } -/* - * \ingroup gdcmDicomDir - * \brief Get the DicomDir path - * @param +/** + * \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 */ -std::string gdcmDicomDir::GetPath(void) +void DicomDir::SetElement(std::string const & path, DicomDirType type, + Document *header) { - std::string path=GetFileName(); + 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 = new SQItem(0); // all the items will be at level 1 + switch( type ) + { + case GDCM_DICOMDIR_IMAGE: + elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); + break; - int pos1=path.rfind("/"); - int pos2=path.rfind("\\"); - if(pos1>pos2) - path.resize(pos1); - else - path.resize(pos2); + case GDCM_DICOMDIR_SERIE: + elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); + break; + + case GDCM_DICOMDIR_STUDY: + elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); + break; + + case GDCM_DICOMDIR_PATIENT: + elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); + break; + + case GDCM_DICOMDIR_META: + elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); + break; + + default: + return; + } + // removed all the seems-to-be-useless stuff about Referenced Image Sequence + // to avoid further troubles + // imageElem 0008 1140 "" // Referenced Image Sequence + // imageElem fffe e000 "" // 'no length' item : length to be set to 0xffffffff later + // imageElem 0008 1150 "" // Referenced SOP Class UID : to be set/forged later + // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later + // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later + // for all the relevant elements found in their own spot of the DicomDir.dic + // FIXME : troubles found when it's a SeqEntry + + for( it = elemList.begin(); it != elemList.end(); ++it) + { + tmpGr = it->Group; + tmpEl = it->Elem; + dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl); - return(path); + 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); + } + else + { + val = GDCM_UNFOUND; + } + + if( val == GDCM_UNFOUND) + { + if( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID + { + // force to the *end* File Name + val = Util::GetName( path ); + } + else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image + { + if( header->GetFileName().substr(0, path.length()) != path ) + { + dbg.Verbose(0, "DicomDir::SetElement : the base path" + " of file name is incorrect"); + val = header->GetFileName(); + } + else + { + val = &(header->GetFileName().c_str()[path.length()]); + } + } + else + { + val = it->Value; + } + } + else + { + if ( header->GetEntryLengthByNumber(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; + } + 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 DicomDir::CallStartMethod() +{ + Progress = 0.0f; + Abort = false; + if( StartMethod ) + { + StartMethod( StartArg ); + } +} + +//----------------------------------------------------------------------------- +/** + * \ingroup DicomDir + * \brief CallProgressMethod + */ +void DicomDir::CallProgressMethod() +{ + if( ProgressMethod ) + { + ProgressMethod( ProgressArg ); + } +} + +//----------------------------------------------------------------------------- +/** + * \ingroup DicomDir + * \brief CallEndMethod + */ +void DicomDir::CallEndMethod() +{ + Progress = 1.0f; + if( EndMethod ) + { + EndMethod( EndArg ); + } } //----------------------------------------------------------------------------- // Private -/* - * \ingroup gdcmDicomDir - * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader +/** + * \ingroup DicomDir + * \brief create a 'DicomDir' from a DICOMDIR Header */ -void gdcmDicomDir::CreateDicomDir() +void DicomDir::CreateDicomDir() { - // The list is parsed. When a tag is found : + // The list is parsed. + // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found : // 1 - we save the beginning iterator // 2 - we continue to parse // 3 - we find an other tag // + we create the object for the precedent tag // + loop to 1 - - gdcmDicomDirType type=gdcmDicomDir::GDCM_NONE; - ListTag::iterator begin; - ListTag::iterator end; - ListTag::iterator k; + // Directory record sequence + DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + if ( !e ) + { + dbg.Verbose(0, "DicomDir::DicomDir : NO Directory record" + " sequence (0x0004,0x1220)"); + /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? + return; + } + + SeqEntry* s = dynamic_cast(e); + if ( !s ) + { + dbg.Verbose(0, "DicomDir::CreateDicomDir: no SeqEntry present"); + // useless : (0x0004,0x1220) IS a Sequence ! + return; + } + + DicomDirType type = DicomDir::GDCM_DICOMDIR_META; + MetaElems = NewMeta(); - begin=listEntries.begin(); - end=begin; + ListSQItem listItems = s->GetSQItems(); - for(ListTag::iterator j=begin;j !=listEntries.end();++j) + DocEntry * d; + std::string v; + for( ListSQItem::iterator i = listItems.begin(); + i !=listItems.end(); ++i ) { - if((*j)->GetValue()=="PATIENT ") { - k = j; - break; + d = (*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type + if ( ValEntry* valEntry = dynamic_cast< ValEntry* >(d) ) + { + v = valEntry->GetValue(); } - } - AddObjectToEnd(gdcmDicomDir::GDCM_META,begin,k); - - for(ListTag::iterator i=k;i !=listEntries.end();++i) - { - std::string v=(*i)->GetValue(); - if(v=="PATIENT ") + else { - end=i; - AddObjectToEnd(type,begin,end); - - type=gdcmDicomDir::GDCM_PATIENT; - begin=end; - } + dbg.Verbose(0, "DicomDir::CreateDicomDir: not a ValEntry."); + continue; + } - if(v=="STUDY ") + if( v == "PATIENT " ) { - end=i; - AddObjectToEnd(type,begin,end); - - type=gdcmDicomDir::GDCM_STUDY; - begin=end; + AddDicomDirPatientToEnd( *i ); + type = DicomDir::GDCM_DICOMDIR_PATIENT; } - - if(v=="SERIES") + else if( v == "STUDY " ) { - end=i; - AddObjectToEnd(type,begin,end); - - type=gdcmDicomDir::GDCM_SERIE; - begin=end; + AddDicomDirStudyToEnd( *i ); + type = DicomDir::GDCM_DICOMDIR_STUDY; } - - if(v=="IMAGE ") + else if( v == "SERIES" ) { - end=i; - AddObjectToEnd(type,begin,end); - - type=gdcmDicomDir::GDCM_IMAGE; - begin=end; + AddDicomDirSerieToEnd( *i ); + type = DicomDir::GDCM_DICOMDIR_SERIE; + } + else if( v == "IMAGE " ) + { + AddDicomDirImageToEnd( *i ); + type = DicomDir::GDCM_DICOMDIR_IMAGE; + } + else + { + // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE', + // neither an 'IMAGE' SQItem. Skip to next item. + continue; } } - - end=GetListEntry().end(); - AddObjectToEnd(type,begin,end); } -/* - * \ingroup gdcmDicomDir - * \brief - * @param type - * @param begin - * @param end + +/** + * \ingroup DicomDir + * \brief Well ... there is only one occurence */ -void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,ListTag::iterator begin,ListTag::iterator end) +void DicomDir::AddDicomDirMeta() { - if(begin==end) - return; - - switch(type) + if( MetaElems ) { - 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; + delete MetaElems; } + MetaElems = new DicomDirMeta( &TagHT ); } - -/* - * \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) -{ - metaelems = new gdcmMeta(begin,end); -} - -/* - * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end -*/ -void gdcmDicomDir::AddPatientToEnd(ListTag::iterator begin,ListTag::iterator end) +/** + * \ingroup DicomDir + * \brief AddDicomDirPatientToEnd + * @param s SQ Item to enqueue to the DicomPatient chained List + */ +void DicomDir::AddDicomDirPatientToEnd(SQItem *s) { - patients.push_back(new gdcmPatient(begin,end)); + Patients.push_back(new DicomDirPatient(s, &TagHT)); } -/* - * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end +/** + * \ingroup DicomDir + * \brief AddDicomDirStudyToEnd + * @param s SQ Item to enqueue to the DicomDirStudy chained List */ - void gdcmDicomDir::AddStudyToEnd(ListTag::iterator begin,ListTag::iterator end) + void DicomDir::AddDicomDirStudyToEnd(SQItem *s) { - 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)->AddDicomDirStudy(new DicomDirStudy(s, &TagHT)); } } -/* - * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end + +/** + * \ingroup DicomDir + * \brief AddDicomDirSerieToEnd + * @param s SQ Item to enqueue to the DicomDirSerie chained List */ -void gdcmDicomDir::AddSerieToEnd(ListTag::iterator begin,ListTag::iterator end) +void DicomDir::AddDicomDirSerieToEnd(SQItem *s) { - if(patients.size()>0) + if( Patients.size() > 0 ) { - ListPatient::iterator itp=patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; - if((*itp)->GetStudies().size()>0) + if( (*itp)->GetDicomDirStudies().size() > 0 ) { - ListStudy::iterator itst=(*itp)->GetStudies().end(); + ListDicomDirStudy::const_iterator itst = + (*itp)->GetDicomDirStudies().end(); itst--; - (*itst)->AddSerie(new gdcmSerie(begin,end)); + (*itst)->AddDicomDirSerie(new DicomDirSerie(s, &TagHT)); } } } -/* - * \ingroup gdcmDicomDir - * @param begin - * @param end - * @param +/** + * \ingroup DicomDir + * \brief AddDicomDirImageToEnd + * @param s SQ Item to enqueue to the DicomDirImage chained List */ - void gdcmDicomDir::AddImageToEnd(ListTag::iterator begin,ListTag::iterator end) + void DicomDir::AddDicomDirImageToEnd(SQItem *s) { - if(patients.size()>0) + if( Patients.size() > 0 ) { - ListPatient::iterator itp=patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; - if((*itp)->GetStudies().size()>0) + if( (*itp)->GetDicomDirStudies().size() > 0 ) { - ListStudy::iterator itst=(*itp)->GetStudies().end(); + ListDicomDirStudy::const_iterator itst = + (*itp)->GetDicomDirStudies().end(); itst--; - if((*itst)->GetSeries().size()>0) + if( (*itst)->GetDicomDirSeries().size() > 0 ) { - ListSerie::iterator its=(*itst)->GetSeries().end(); + ListDicomDirSerie::const_iterator its = (*itst)->GetDicomDirSeries().end(); its--; - (*its)->AddImage(new gdcmImage(begin,end)); + (*its)->AddDicomDirImage(new DicomDirImage(s, &TagHT)); } } } } -/* - * \ingroup gdcmDicomDir - * \brief - * @param path - * @param list +/** + * \ingroup DicomDir + * \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=""; + std::string patPrevName = "", patPrevID = ""; + std::string studPrevInstanceUID = "", studPrevID = ""; + std::string serPrevInstanceUID = "", serPrevID = ""; - std::string patCurName, patCurID; + std::string patCurName, patCurID; std::string studCurInstanceUID, studCurID; - std::string serCurInstanceUID, serCurID; - - SetElement(path,GDCM_NONE,NULL); + std::string serCurInstanceUID, serCurID; - ListTag::iterator debPat=listEntries.begin(); - for(ListHeader::iterator it=list.begin();it!=list.end();++it) + 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) - SetElement(path,GDCM_PATIENT,*it); + 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) + { + SetElement(path, GDCM_DICOMDIR_PATIENT, *it); + } // if new Study Deal with 'STUDY' Elements - if(studCurInstanceUID!=studPrevInstanceUID || studCurID!=studPrevID) - SetElement(path,GDCM_STUDY,*it); + if( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID ) + { + SetElement(path, GDCM_DICOMDIR_STUDY, *it); + } // if new Serie Deal with 'SERIE' Elements - if(serCurInstanceUID!=serPrevInstanceUID || serCurID!=serPrevID) - SetElement(path,GDCM_SERIE,*it); + if( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID ) + { + SetElement(path, GDCM_DICOMDIR_SERIE, *it); + } // Always Deal with 'IMAGE' Elements - SetElement(path,GDCM_IMAGE,*it); - - patPrevName=patCurName; - patPrevID=patCurID; - studPrevInstanceUID=studCurInstanceUID; - studPrevID=studCurID; - serPrevInstanceUID=serCurInstanceUID; - serPrevID=serCurID; + SetElement(path, GDCM_DICOMDIR_IMAGE, *it); + + patPrevName = patCurName; + patPrevID = patCurID; + studPrevInstanceUID = studCurInstanceUID; + studPrevID = studCurID; + serPrevInstanceUID = serCurInstanceUID; + serPrevID = serCurID; } } -/* - * \ingroup gdcmDicomDir - * \brief - * @param path - * @param type - * @param header +/** + * \ingroup DicomDir + * \brief compares two dgcmHeaders */ -void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,gdcmHeader *header) -{ - std::list elemList; - std::list::iterator it; - guint16 tmpGr, tmpEl; - gdcmDictEntry *dictEntry; - gdcmHeaderEntry *entry; - std::string val; - - switch(type) - { - case GDCM_PATIENT: - elemList=gdcmGlobal::GetDicomDirElements()->GetPatientElements(); - break; - case GDCM_STUDY: - elemList=gdcmGlobal::GetDicomDirElements()->GetStudyElements(); - break; - case GDCM_SERIE: - elemList=gdcmGlobal::GetDicomDirElements()->GetSerieElements(); - break; - case GDCM_IMAGE: - elemList=gdcmGlobal::GetDicomDirElements()->GetImageElements(); - break; - case GDCM_NONE: - elemList=gdcmGlobal::GetDicomDirElements()->GetMetaElements(); - break; - default: - return; - } - - for(it=elemList.begin();it!=elemList.end();++it) - { - tmpGr=it->group; - tmpEl=it->elem; - - dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl); - entry=new gdcmHeaderEntry(dictEntry); - entry->SetOffset(0); // just to avoid missprinting - - if(header) - val=header->GetEntryByNumber(tmpGr,tmpEl); - else - val=GDCM_UNFOUND; - - if(val==GDCM_UNFOUND) - { - if((tmpGr==0x0004) &&(tmpEl==0x1130) ) - { - // TODO force the *end* File Name(remove path) - val=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"); - val=header->GetFileName(); - } - else - val=&(header->GetFileName()[path.length()]); - } - else - { - val=it->value; - } - } - entry->SetValue(val); - - if(dictEntry) - { - 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()); - } - } - - listEntries.push_back(entry); - } -} - -bool gdcmDicomDir::HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2) +bool DicomDir::HeaderLessThan(Document *header1, Document *header2) { - return(*header1<*header2); + return *header1 < *header2; } +} // end namespace gdcm //-----------------------------------------------------------------------------