X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=7a18df16f7d28230eda48d4c2e06238e89678b5a;hb=0d8ca63a1a2c1a61c2e2b92526ba81c9885702ba;hp=145ce1e8e9eca39607c99680a26a1616323bef69;hpb=22f785a2627d1e7823701193bd7624739a3e033b;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 145ce1e8..7a18df16 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -1,67 +1,147 @@ -// gdcmDicomDir.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDir.cxx,v $ + Language: C++ + Date: $Date: 2004/06/28 09:30:58 $ + Version: $Revision: 1.53 $ + + 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.htm 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 +#include +#include +#include + +#ifdef _MSC_VER + #include +#else + #include +#endif + #include "gdcmDicomDir.h" #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" #include "gdcmDicomDirImage.h" #include "gdcmDirList.h" #include "gdcmUtil.h" - -#include -#include - -#include -#include +#include "gdcmDebug.h" +#include "gdcmGlobal.h" +#include "gdcmHeader.h" +#include "gdcmSeqEntry.h" +#include "gdcmSQItem.h" +#include "gdcmValEntry.h" //----------------------------------------------------------------------------- // For full DICOMDIR description, see: // PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- // Constructor / Destructor -/* - * \ingroup gdcmDicomDir - * \brief Constructor : Parses recursively the directory and creates the DicomDir - * \ or uses an already built DICOMDIR, depending on 'parseDir' value - * @param Name name of the root directory (parseDir = true) - * name of the DICOMDIR (parseDir = false) - * @param parseDir true if user wants to explore the directories - * @param exception_on_error + +void gdcmDicomDir::Initialize(void) +{ + startMethod = NULL; + progressMethod = NULL; + endMethod = NULL; + startMethodArgDelete = NULL; + progressMethodArgDelete = NULL; + endMethodArgDelete = NULL; + startArg = NULL; + progressArg = NULL; + endArg = NULL; + + progress = 0.0; + abort = false; + + metaElems = (gdcmDicomDirMeta *)0; +} + + +/** + * \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 + * @param exception_on_error whether we want to throw an exception or not */ -gdcmDicomDir::gdcmDicomDir(const char *Name, bool parseDir, +gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir, bool exception_on_error): - gdcmParser(Name,exception_on_error,true) + gdcmDocument(FileName,exception_on_error,true) // true : enable SeQuences { - startMethod= NULL; - progressMethod= NULL; - endMethod= NULL; - startMethodArgDelete= NULL; - progressMethodArgDelete=NULL; - endMethodArgDelete= NULL; - startArg= NULL; - progressArg= NULL; - endArg= NULL; - - progress=0.0; - abort=false; + // que l'on ai passe un root directory ou un DICOMDIR + // et quelle que soit la valeur de parseDir, + // on a lance gdcmDocument + Initialize(); - metaElems=NULL; + // gdcmDocument already executed + // if user passed a root directory, sure we didn't get anything - if( GetListEntry().begin()==GetListEntry().end() ) + if( GetEntry().begin() == GetEntry().end() ) { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry list empty"); + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry HT empty"); + + if(strlen(FileName)==1 && FileName[0]=='.') { // user passed '.' as Name + // we get current directory name + char* dummy= new char[1000]; + getcwd(dummy, (size_t)1000); + SetFileName(dummy); // will be converted into a string + delete[] dummy; // no longer needed + } if(parseDir) { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory and create the DicomDir"); + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory" + " and create the DicomDir"); ParseDirectory(); + } else { + /// \todo if parseDir == false, it should be tagged as an error } } else + { + // Directory record sequence + gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + if (e==NULL) { + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record" + " sequence (0x0004,0x1220)"); + /// \todo FIXME : what to do when the parsed file IS NOT a + /// DICOMDIR file ? + } CreateDicomDir(); + } } -/* +/** * \ingroup gdcmDicomDir + * \brief Constructor : creates an empty gdcmDicomDir + * @param exception_on_error whether we want to throw an exception or not + */ +gdcmDicomDir::gdcmDicomDir(bool exception_on_error): + gdcmDocument(exception_on_error) +{ + + Initialize(); + + std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ... + SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements + AddDicomDirMeta(); +} + +/** * \brief Canonical destructor */ gdcmDicomDir::~gdcmDicomDir() @@ -73,7 +153,9 @@ gdcmDicomDir::~gdcmDicomDir() if(metaElems) delete metaElems; - for(ListDicomDirPatient::iterator cc=patients.begin();cc!=patients.end();++cc) + for(ListDicomDirPatient::iterator cc = patients.begin(); + cc!= patients.end(); + ++cc) { delete *cc; } @@ -81,8 +163,7 @@ gdcmDicomDir::~gdcmDicomDir() //----------------------------------------------------------------------------- // Print -/* - * \ingroup gdcmDicomDir +/** * \brief Canonical Printer */ void gdcmDicomDir::Print(std::ostream &os) @@ -91,29 +172,29 @@ void gdcmDicomDir::Print(std::ostream &os) { metaElems->SetPrintLevel(printLevel); metaElems->Print(os); - } - - for(ListDicomDirPatient::iterator cc=patients.begin();cc!=patients.end();++cc) + } + for(ListDicomDirPatient::iterator cc = patients.begin(); + cc != patients.end(); + ++cc) { (*cc)->SetPrintLevel(printLevel); - (*cc)->Print(os); + (*cc)->Print(os); } } //----------------------------------------------------------------------------- // Public -/* - * \ingroup gdcmDicomDir +/** * \brief This predicate, based on hopefully reasonable heuristics, - * decides whether or not the current gdcmParser was properly parsed + * 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 gdcmParser is the one of a reasonable DicomDir, + * @return true when gdcmDocument is the one of a reasonable DicomDir, * false otherwise. */ bool gdcmDicomDir::IsReadable(void) { - if(!gdcmParser::IsReadable()) + if(!gdcmDocument::IsReadable()) return(false); if(!metaElems) return(false); @@ -123,21 +204,22 @@ bool gdcmDicomDir::IsReadable(void) return(true); } -/* +/** * \ingroup gdcmDicomDir - * \brief fills whole the structure + * \brief fills the whole structure, starting from a root Directory */ void gdcmDicomDir::ParseDirectory(void) { - NewDicomDir(GetPath()); + CreateDicomDirChainedList(GetFileName()); CreateDicomDir(); } -/* +/** * \ingroup gdcmDicomDir * \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) @@ -150,11 +232,11 @@ void gdcmDicomDir::SetStartMethod(gdcmMethod *method,void *arg,gdcmMethod *argDe startMethodArgDelete=argDelete; } -/* +/** * \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::SetStartMethodArgDelete(gdcmMethod *method) @@ -162,11 +244,12 @@ void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod *method) startMethodArgDelete=method; } -/* +/** * \ingroup gdcmDicomDir * \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) @@ -179,11 +262,11 @@ void gdcmDicomDir::SetProgressMethod(gdcmMethod *method,void *arg,gdcmMethod *ar progressMethodArgDelete=argDelete; } -/* +/** * \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::SetProgressMethodArgDelete(gdcmMethod *method) @@ -191,14 +274,15 @@ void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod *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 gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg, gdcmMethod *argDelete) { if((endArg)&&(endMethodArgDelete)) endMethodArgDelete(endArg); @@ -208,7 +292,7 @@ void gdcmDicomDir::SetEndMethod(gdcmMethod *method,void *arg,gdcmMethod *argDele endMethodArgDelete=argDelete; } -/* +/** * \ingroup gdcmDicomDir * \brief Set the method to delete the argument * The argument is destroyed when the method is changed or when the class @@ -225,9 +309,13 @@ void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method) * \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; @@ -239,82 +327,317 @@ bool gdcmDicomDir::Write(std::string fileName) return(false); } - char * filePreamble; - filePreamble=(char*)calloc(128,1); + char * filePreamble = new char[128]; fwrite(filePreamble,128,1,fp1); fwrite("DICM",4,1,fp1); - free(filePreamble); + delete[] filePreamble; UpdateDirectoryRecordSequenceLength(); - WriteEntries(fp1,DICOMDIR); + WriteEntries(fp1); fclose(fp1); - return true; } +/** + * \brief Writes in a file using the tree-like structure. + * @param _fp already open file pointer + */ + +void gdcmDicomDir::WriteEntries(FILE *) //_fp +{ + /// \todo (?) tester les echecs en ecriture + /// (apres chaque fwrite, dans le WriteEntry) + + +/* TODO : to go on compiling + + gdcmDicomDirMeta *ptrMeta; + ListDicomDirPatient::iterator itPatient; + ListDicomDirStudy::iterator itStudy; + ListDicomDirSerie::iterator itSerie; + ListDicomDirImage::iterator itImage; + ListTag::iterator i; + + ptrMeta= GetDicomDirMeta(); + for(i=ptrMeta->debut();i!=ptrMeta->fin();++i) { + WriteEntry(*i,_fp, gdcmExplicitVR); + } + + itPatient = GetDicomDirPatients().begin(); + while ( itPatient != GetDicomDirPatients().end() ) { + for(i=(*itPatient)->debut();i!=(*itPatient)->fin();++i) { + WriteEntry(*i,_fp, gdcmExplicitVR); + } + itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); + while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { + for(i=(*itStudy)->debut();i!=(*itStudy)->fin();++i) { + WriteEntry(*i,_fp, gdcmExplicitVR); + } + itSerie = ((*itStudy)->GetDicomDirSeries()).begin(); + while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { + for(i=(*itSerie)->debut();i!=(*itSerie)->fin();++i) { + WriteEntry(*i,_fp, gdcmExplicitVR); + } + itImage = ((*itSerie)->GetDicomDirImages()).begin(); + while (itImage != (*itSerie)->GetDicomDirImages().end() ) { + for(i=(*itImage)->debut();i!=(*itImage)->fin();++i) { + WriteEntry(*i,_fp, gdcmExplicitVR); + } + ++itImage; + } + ++itSerie; + } + ++itStudy; + } + ++itPatient; + } + */ +} + //----------------------------------------------------------------------------- // Protected -/* + +/** * \ingroup gdcmDicomDir - * \brief create a gdcmDicomDir from a root Directory - * @param path entry point of the stree-like structure + * \brief create a gdcmDocument-like chained list from a root Directory + * @param path entry point of the tree-like structure */ -void gdcmDicomDir::NewDicomDir(std::string path) +void gdcmDicomDir::CreateDicomDirChainedList(std::string path) { CallStartMethod(); - - gdcmDirList fileList(path,1); + gdcmDirList fileList(path,1); // gets recursively the file list unsigned int count=0; - ListHeader list; + VectDocument list; gdcmHeader *header; - listEntries.clear(); + tagHT.clear(); patients.clear(); for(gdcmDirList::iterator it=fileList.begin(); - it!=fileList.end(); ++it) + it!=fileList.end(); + ++it) { + std::cout << "nom fichier " << it->c_str() << std::endl; //JPR + progress=(float)(count+1)/(float)fileList.size(); CallProgressMethod(); if(abort) - break; + break; header=new gdcmHeader(it->c_str()); - if(header->IsReadable()) - list.push_back(header); + if(!header) { + std::cout << "echec new Header " << it->c_str() << std::endl; // JPR + } + if(header->IsReadable()) { + list.push_back(header); // adds the file header to the chained list + std::cout << "readable : " <c_str() << std::endl; + } else delete header; count++; - } + } + // sorts Patient/Study/Serie/ std::sort(list.begin(),list.end(),gdcmDicomDir::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 adds *the* Meta to a partially created DICOMDIR + */ + + // FIXME : Heuuuuu ! Il prend les Entries du Document deja parse, + // il ne fabrique rien ! + +gdcmDicomDirMeta * gdcmDicomDir::NewMeta(void) { + gdcmDicomDirMeta *m = new gdcmDicomDirMeta(&tagHT); + for (TagDocEntryHT::iterator cc = tagHT.begin();cc != tagHT.end();++cc) { + m->AddDocEntry(cc->second); + } + return m; +} + + +/** * \ingroup gdcmDicomDir - * \brief Get the DicomDir path - * @param + * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR + */ +gdcmDicomDirPatient * gdcmDicomDir::NewPatient(void) { + std::list elemList; + std::list::iterator it; + guint16 tmpGr,tmpEl; + gdcmDictEntry *dictEntry; + gdcmValEntry *entry; + + gdcmSQItem *s = new gdcmSQItem(0); + + elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); + + // TODO : use FillObject !!! + + // for all the DicomDirPatient Elements + + for(it=elemList.begin();it!=elemList.end();++it) + { + 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); + } + + gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &tagHT); + patients.push_front(p); + return p; +} + +/** + * \brief adds to the HTable + * the gdcmEntries (Dicom Elements) corresponding to the given type + * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE + * @param type gdcmObject type to create (GDCM_DICOMDIR_PATIENT, + * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) + * @param header gdcmHeader of the current file */ -std::string gdcmDicomDir::GetPath(void) +void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, + gdcmDocument *header) { - std::string path=GetFileName(); + std::list elemList; + std::list::iterator it; + guint16 tmpGr, tmpEl; + gdcmDictEntry *dictEntry; + gdcmValEntry *entry; + std::string val; - int pos1=path.rfind("/"); - int pos2=path.rfind("\\"); - if(pos1>pos2) - path.resize(pos1); - else - path.resize(pos2); + switch(type){ + case GDCM_DICOMDIR_PATIENT: + elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); + break; + case GDCM_DICOMDIR_STUDY: + elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements(); + break; + case GDCM_DICOMDIR_SERIE: + elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements(); + break; + case GDCM_DICOMDIR_IMAGE: + elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements(); + break; + case GDCM_DICOMDIR_META: + elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements(); + break; + default: + return; + } - return(path); + for(it=elemList.begin();it!=elemList.end();++it) { + tmpGr=it->group; + tmpEl=it->elem; + dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl); + entry=new gdcmValEntry(dictEntry); // Be sure it's never a BinEntry ! + + entry->SetOffset(0); // just to avoid further missprinting + + if(header) + 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=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"); + 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; + } + + entry->SetValue(val); + + if(dictEntry) + { + 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()); + } + } + //AddDocEntry(entry); // both in H Table and in chained list + tagHT[entry->GetKey()] = entry; // FIXME : use a SEQUENCE ! + } } +/** + * \brief CallStartMethod + */ void gdcmDicomDir::CallStartMethod(void) { progress=0.0f; @@ -322,13 +645,19 @@ void gdcmDicomDir::CallStartMethod(void) if(startMethod) startMethod(startArg); } - +/** + * \ingroup gdcmDicomDir + * \brief CallProgressMethod + */ void gdcmDicomDir::CallProgressMethod(void) { if(progressMethod) progressMethod(progressArg); } - +/** + * \ingroup gdcmDicomDir + * \brief CallEndMethod + */ void gdcmDicomDir::CallEndMethod(void) { progress=1.0f; @@ -338,13 +667,14 @@ void gdcmDicomDir::CallEndMethod(void) //----------------------------------------------------------------------------- // Private -/* +/** * \ingroup gdcmDicomDir * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader */ void gdcmDicomDir::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 @@ -352,133 +682,158 @@ void gdcmDicomDir::CreateDicomDir() // + loop to 1 - gdcmDicomDirType type=gdcmDicomDir::GDCM_DICOMDIR_META; - ListTag::iterator begin; - ListTag::iterator end; - - begin=listEntries.begin(); - end=begin; - for(ListTag::iterator i=end;i !=listEntries.end();++i) + + // Directory record sequence + gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + if (e==NULL) { - std::string v=(*i)->GetValue(); - if(v=="PATIENT ") + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record" + " sequence (0x0004,0x1220)"); + /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? + return; + } + + gdcmSeqEntry* s = dynamic_cast(e); + if (!s) + { + dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: no SeqEntry present"); + return; + } + + ListSQItem listItems = s->GetSQItems(); + gdcmDicomDirMeta *m = new gdcmDicomDirMeta(&tagHT); + (void)m; //?? + + gdcmDocEntry * d; + std::string v; + for(ListSQItem::iterator i=listItems.begin(); i !=listItems.end();++i) + { + d=(*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type + if (gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(d) ) + { + v = ValEntry->GetValue(); + } + else { - end=i; - AddObjectToEnd(type,begin,end); + dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: not a ValEntry."); + continue; + } + if(v=="PATIENT ") + { + AddDicomDirPatientToEnd(*i); + //AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_PATIENT; - begin=end; - } + } - if(v=="STUDY ") + else if(v=="STUDY ") { - end=i; - AddObjectToEnd(type,begin,end); - + AddDicomDirStudyToEnd(*i); + // AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_STUDY; - begin=end; } - if(v=="SERIES") + else if(v=="SERIES") { - end=i; - AddObjectToEnd(type,begin,end); - + AddDicomDirSerieToEnd(*i); + // AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_SERIE; - begin=end; } - if(v=="IMAGE ") + else if(v=="IMAGE ") { - end=i; - AddObjectToEnd(type,begin,end); - + AddDicomDirImageToEnd(*i); + // AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_IMAGE; - begin=end; } + + else + // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE', + // neither an 'IMAGE' SQItem. Skip to next item. + continue; } - - end=GetListEntry().end(); - if(begin!=end) - AddObjectToEnd(type,begin,end); } -/* +/** * \ingroup gdcmDicomDir - * \brief + * \brief AddObjectToEnd * @param type - * @param begin - * @param end + * @param begin iterator on the first DocEntry within the chained List + * @param end iterator on the last DocEntry within the chained List */ -void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,ListTag::iterator begin,ListTag::iterator end) + +// now useless ? + +/*void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,gdcmSQItem *s) { - if(begin==end) + if(s==NULL) // ?? return; switch(type) { case gdcmDicomDir::GDCM_DICOMDIR_META: - AddDicomDirMetaToEnd(begin,end); + AddDicomDirMeta(); break; case gdcmDicomDir::GDCM_DICOMDIR_PATIENT: - AddDicomDirPatientToEnd(begin,end); + AddDicomDirPatientToEnd(s); break; case gdcmDicomDir::GDCM_DICOMDIR_STUDY: - AddDicomDirStudyToEnd(begin,end); + AddDicomDirStudyToEnd(s); break; case gdcmDicomDir::GDCM_DICOMDIR_SERIE: - AddDicomDirSerieToEnd(begin,end); + AddDicomDirSerieToEnd(s); break; case gdcmDicomDir::GDCM_DICOMDIR_IMAGE: - AddDicomDirImageToEnd(begin,end); + AddDicomDirImageToEnd(s); + break; + case gdcmDicomDir::GDCM_DICOMDIR_NONE: + AddDicomDirImageToEnd(s); //FIXME break; } } -/* +*/ + +/** * \ingroup gdcmDicomDir - * \brief Well ... Not realy to end, there is only one occurence - * @param begin - * @param end + * \brief Well ... there is only one occurence */ -void gdcmDicomDir::AddDicomDirMetaToEnd(ListTag::iterator begin,ListTag::iterator end) +void gdcmDicomDir::AddDicomDirMeta() { if(metaElems) delete metaElems; - metaElems = new gdcmDicomDirMeta(begin,end); + metaElems = new gdcmDicomDirMeta(&tagHT); } -/* +/** * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end + * \brief AddDicomDirPatientToEnd + * @param s SQ Item to enqueue to the DicomPatient chained List */ -void gdcmDicomDir::AddDicomDirPatientToEnd(ListTag::iterator begin,ListTag::iterator end) +void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s) { - patients.push_back(new gdcmDicomDirPatient(begin,end)); + patients.push_back(new gdcmDicomDirPatient(s, &tagHT)); } -/* +/** * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end + * \brief AddDicomDirStudyToEnd + * @param s SQ Item to enqueue to the DicomDirStudy chained List */ - void gdcmDicomDir::AddDicomDirStudyToEnd(ListTag::iterator begin,ListTag::iterator end) + void gdcmDicomDir::AddDicomDirStudyToEnd(gdcmSQItem *s) { if(patients.size()>0) { ListDicomDirPatient::iterator itp=patients.end(); itp--; - (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(begin,end)); + (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(s, &tagHT)); } } -/* +/** * \ingroup gdcmDicomDir - * \brief - * @param begin - * @param end + * \brief AddDicomDirSerieToEnd + * @param s SQ Item to enqueue to the DicomDirSerie chained List */ -void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterator end) +void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *s) { if(patients.size()>0) { @@ -489,18 +844,17 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterat { ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end(); itst--; - (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(begin,end)); + (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(s, &tagHT)); } } } -/* +/** * \ingroup gdcmDicomDir - * @param begin - * @param end - * @param + * \brief AddDicomDirImageToEnd + * @param s SQ Item to enqueue to the DicomDirImage chained List */ - void gdcmDicomDir::AddDicomDirImageToEnd(ListTag::iterator begin,ListTag::iterator end) + void gdcmDicomDir::AddDicomDirImageToEnd(gdcmSQItem *s) { if(patients.size()>0) { @@ -516,19 +870,19 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterat { ListDicomDirSerie::iterator its=(*itst)->GetDicomDirSeries().end(); its--; - (*its)->AddDicomDirImage(new gdcmDicomDirImage(begin,end)); + (*its)->AddDicomDirImage(new gdcmDicomDirImage(s, &tagHT)); } } } } -/* +/** * \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 gdcmDicomDir::SetElements(std::string &path, VectDocument &list) { std::string patPrevName="", patPrevID=""; std::string studPrevInstanceUID="", studPrevID=""; @@ -538,10 +892,9 @@ void gdcmDicomDir::SetElements(std::string &path,ListHeader &list) std::string studCurInstanceUID, studCurID; std::string serCurInstanceUID, serCurID; - SetElement(path,GDCM_DICOMDIR_NONE,NULL); + SetElement(path,GDCM_DICOMDIR_META,NULL); - ListTag::iterator debPat=listEntries.begin(); - for(ListHeader::iterator it=list.begin();it!=list.end();++it) + for(VectDocument::iterator it=list.begin();it!=list.end();++it) { // get the current file characteristics patCurName= (*it)->GetEntryByNumber(0x0010,0x0010); @@ -574,127 +927,30 @@ void gdcmDicomDir::SetElements(std::string &path,ListHeader &list) } } -/* +/** * \ingroup gdcmDicomDir - * \brief - * @param path - * @param type - * @param header + * \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_DICOMDIR_PATIENT: - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); - break; - case GDCM_DICOMDIR_STUDY: - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements(); - break; - case GDCM_DICOMDIR_SERIE: - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements(); - break; - case GDCM_DICOMDIR_IMAGE: - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements(); - break; - case GDCM_DICOMDIR_NONE: - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements(); - 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; - } - } - else - { - if (header->GetEntryLengthByNumber(tmpGr,tmpEl)== 0) - val=val=it->value; - } - - entry->SetValue(val); - - if(dictEntry) - { - if(dictEntry->GetGroup()==0xfffe) - { - entry->SetLength(entry->GetValue().length()); //JPR - } - 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()); - } - } - //listEntries.push_back(entry); - AddHeaderEntry(entry); - } -} - -bool gdcmDicomDir::HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2) +bool gdcmDicomDir::HeaderLessThan(gdcmDocument *header1,gdcmDocument *header2) { return(*header1<*header2); } - +/** + * \ingroup gdcmDicomDir + * \brief Sets the accurate value for the (0x0004,0x1220) element of a DICOMDIR + */ void gdcmDicomDir::UpdateDirectoryRecordSequenceLength() { + +// FIXME : to go on compiling + +// to be re written ! +/* int offset = 0; ListTag::iterator it; guint16 gr, el; - string vr; + std::string vr; for(it=listEntries.begin();it!=listEntries.end();++it) { gr = (*it)->GetGroup(); el = (*it)->GetElement(); @@ -708,8 +964,10 @@ void gdcmDicomDir::UpdateDirectoryRecordSequenceLength() { offset += 4; // delimiters don't have a value. } } - bool res=SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. + //bool res=SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. + SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. return; + */ } //-----------------------------------------------------------------------------