X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=5c5082920fb97cbac14ac95a5eb62644e894bde9;hb=19c54f9be7d29dcdd8fbb56b6308e55ed230441d;hp=e6a3d042d78bba5dcd72c1535b3e151386959c37;hpb=eb835becc89cc1b8a1dc1f122f54b7659a6127be;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index e6a3d042..5c508292 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -1,43 +1,58 @@ // gdcmDicomDir.cxx //----------------------------------------------------------------------------- +#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 "gdcmDebug.h" +#include "gdcmGlobal.h" +#include "gdcmHeader.h" -#include -#include - -#include -#include -#include +#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 passed an entry point + +/** + * \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 + * - 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 + * @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) // true : enable SeQuences + gdcmDocument(FileName,exception_on_error,true) // true : enable SeQuences { // que l'on ai passe un root directory ou un DICOMDIR // et quelle que soit la valeur de parseDir, - // on a lance gdcmParser + // on a lance gdcmDocument startMethod= NULL; progressMethod= NULL; @@ -52,45 +67,49 @@ gdcmDicomDir::gdcmDicomDir(const char *Name, bool parseDir, progress=0.0; abort=false; - metaElems=NULL; + metaElems=NULL; -// gdcmParser already executed +// 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() ) { // if parseDir == false, it should be tagged as an error - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry list empty"); + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry HT empty"); - if(strlen(Name)==1 && Name[0]=='.') { // user passed '.' as Name + if(strlen(FileName)==1 && FileName[0]=='.') { // user passed '.' as Name // we get current directory name - char*dummy=(char*) malloc(1000); // TODO : check with Windoze // JPR - getcwd(dummy,(size_t)1000); + char* dummy= new char[1000]; + getcwd(dummy, (size_t)1000); SetFileName(dummy); // will be converted into a string - free(dummy); // no longer needed + delete[] dummy; // no longer needed } if(parseDir) { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory and create the DicomDir"); - ParseDirectory(); + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory" + " and create the DicomDir"); + ParseDirectory(); } } else { + gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); // Directory record sequence + if (e==NULL) { + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record sequence (0x0004,0x1220)" + ); + // FIXME : what to do when the parsed file IS NOT a DICOMDIR file ? + } CreateDicomDir(); - CheckBoundaries(); // to maintain consistency between - // home-made gdcmDicomDir - // and the ones comming from a DICOMDIR file } } -/* +/** * \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): - gdcmParser(exception_on_error) + gdcmDocument(exception_on_error) { startMethod= NULL; progressMethod= NULL; @@ -101,17 +120,15 @@ gdcmDicomDir::gdcmDicomDir(bool exception_on_error): startArg= NULL; progressArg= NULL; endArg= NULL; - progress=0.0; abort=false; std::string pathBidon = ""; // Sorry, NULL not allowed ... SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements - - AddDicomDirMetaToEnd(listEntries.begin(),--listEntries.end()); + AddDicomDirMeta(); } -/* +/** * \ingroup gdcmDicomDir * \brief Canonical destructor */ @@ -132,7 +149,7 @@ gdcmDicomDir::~gdcmDicomDir() //----------------------------------------------------------------------------- // Print -/* +/** * \ingroup gdcmDicomDir * \brief Canonical Printer */ @@ -152,18 +169,18 @@ void gdcmDicomDir::Print(std::ostream &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 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); @@ -173,7 +190,7 @@ bool gdcmDicomDir::IsReadable(void) return(true); } -/* +/** * \ingroup gdcmDicomDir * \brief fills the whole structure, starting from a root Directory */ @@ -183,11 +200,12 @@ void gdcmDicomDir::ParseDirectory(void) 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) @@ -200,7 +218,7 @@ 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 @@ -212,11 +230,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) @@ -229,7 +248,7 @@ 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 @@ -241,14 +260,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); @@ -258,7 +278,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 @@ -293,30 +313,29 @@ 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); - //UpdateDirectoryRecordSequenceLength(); // a reecrire en utilisant JPR - // la structure arborescente JPR - WriteDicomDirEntries(fp1); + delete[] filePreamble; + UpdateDirectoryRecordSequenceLength(); + WriteEntries(fp1); fclose(fp1); return true; } /** - * \ingroup gdcmParser - * \brief writes on disc according to the DICOMDIR format - * using the tree-like structure + * \brief Writes in a file using the tree-like structure. * @param _fp already open file pointer */ -void gdcmDicomDir::WriteDicomDirEntries(FILE *_fp) +void gdcmDicomDir::WriteEntries(FILE *_fp) { - // TODO (?) tester les echecs en ecriture - // (apres chaque fwrite, dans le WriteEntry) + /// \todo (?) tester les echecs en ecriture + /// (apres chaque fwrite, dans le WriteEntry) + + +/* TODO : to go on compiling gdcmDicomDirMeta *ptrMeta; ListDicomDirPatient::iterator itPatient; @@ -327,28 +346,28 @@ void gdcmDicomDir::WriteDicomDirEntries(FILE *_fp) ptrMeta= GetDicomDirMeta(); for(i=ptrMeta->debut();i!=ptrMeta->fin();++i) { - WriteEntry(*i,_fp,DICOMDIR); + WriteEntry(*i,_fp, gdcmExplicitVR); } itPatient = GetDicomDirPatients().begin(); while ( itPatient != GetDicomDirPatients().end() ) { for(i=(*itPatient)->debut();i!=(*itPatient)->fin();++i) { - WriteEntry(*i,_fp,DICOMDIR); + WriteEntry(*i,_fp, gdcmExplicitVR); } itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { for(i=(*itStudy)->debut();i!=(*itStudy)->fin();++i) { - WriteEntry(*i,_fp,DICOMDIR); + WriteEntry(*i,_fp, gdcmExplicitVR); } itSerie = ((*itStudy)->GetDicomDirSeries()).begin(); while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { for(i=(*itSerie)->debut();i!=(*itSerie)->fin();++i) { - WriteEntry(*i,_fp,DICOMDIR); + WriteEntry(*i,_fp, gdcmExplicitVR); } itImage = ((*itSerie)->GetDicomDirImages()).begin(); while (itImage != (*itSerie)->GetDicomDirImages().end() ) { for(i=(*itImage)->debut();i!=(*itImage)->fin();++i) { - WriteEntry(*i,_fp,DICOMDIR); + WriteEntry(*i,_fp, gdcmExplicitVR); } ++itImage; } @@ -358,14 +377,15 @@ void gdcmDicomDir::WriteDicomDirEntries(FILE *_fp) } ++itPatient; } + */ } //----------------------------------------------------------------------------- // Protected -/* +/** * \ingroup gdcmDicomDir - * \brief create a gdcmHeader-like chained list from a root Directory + * \brief create a gdcmDocument-like chained list from a root Directory * @param path entry point of the tree-like structure */ void gdcmDicomDir::CreateDicomDirChainedList(std::string path) @@ -374,10 +394,10 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string path) 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(); @@ -408,75 +428,57 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string path) CallEndMethod(); } - - -void gdcmDicomDir::CheckBoundaries() -{ - -cout <<"entree ds CheckBoundaries " <ResetBoundaries(0); - - itPatient = GetDicomDirPatients().begin(); - while ( itPatient != GetDicomDirPatients().end() ) { - (*itPatient)->ResetBoundaries(1); - itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); - while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { - (*itStudy)->ResetBoundaries(1); - itSerie = ((*itStudy)->GetDicomDirSeries()).begin(); - while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { - (*itSerie)->ResetBoundaries(1); - itImage = ((*itSerie)->GetDicomDirImages()).begin(); - while (itImage != (*itSerie)->GetDicomDirImages().end() ) { - (*itImage)->ResetBoundaries(1); - ++itImage; - } - ++itSerie; - } - ++itStudy; - } - ++itPatient; +/** + * \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 adds a new Patient to a partially created DICOMDIR + * \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; - gdcmHeaderEntry *entry; + gdcmValEntry *entry; + + gdcmSQItem *s = new gdcmSQItem(0); elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); - std::list::iterator debInsertion, finInsertion, i,j; - - debInsertion = metaElems->fin(); - ++debInsertion; - finInsertion=debInsertion; + + // TODO : use FillObject !!! - // for all the DicomDirPatient Elements + // 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 gdcmHeaderEntry(dictEntry); - entry->SetOffset(0); // just to avoid missprinting - entry->SetValue(it->value); + 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()); - } + { + entry->SetLength(entry->GetValue().length()); + } else if( (dictEntry->GetVR()=="UL") || (dictEntry->GetVR()=="SL") ) { entry->SetLength(4); @@ -493,22 +495,126 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient(void) { { entry->SetLength(entry->GetValue().length()); } - - tagHT.insert( PairHT(entry->GetKey(),entry) ); // add in the (multimap) H Table - listEntries.insert(debInsertion ,entry); // en tete de liste des Patients - ++finInsertion; + s->AddDocEntry(entry); } - i=metaElems->fin(); - i++; - - gdcmDicomDirPatient *p = new gdcmDicomDirPatient(i, --debInsertion, - &tagHT, &listEntries); + gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &tagHT); patients.push_front(p); return p; } -/* + +/** + * \ingroup gdcmDicomDir + * \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 + */ +void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, + gdcmDocument *header) +{ + std::list elemList; + std::list::iterator it; + guint16 tmpGr, tmpEl; + gdcmDictEntry *dictEntry; + gdcmDocEntry *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_META: + 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 gdcmDocEntry(dictEntry); + 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; + } + + ((gdcmValEntry *)entry)->SetValue(val); + + if(dictEntry) + { + if(dictEntry->GetGroup()==0xfffe) + { + entry->SetLength(((gdcmValEntry *)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(((gdcmValEntry *)entry)->GetValue().length()); + } + } + //AddDocEntry(entry); // both in H Table and in chained list + tagHT[entry->GetKey()] = entry; // FIXME : use a SEQUENCE ! + } +} +/** * \ingroup gdcmDicomDir * \brief CallStartMethod */ @@ -519,7 +625,7 @@ void gdcmDicomDir::CallStartMethod(void) if(startMethod) startMethod(startArg); } -/* +/** * \ingroup gdcmDicomDir * \brief CallProgressMethod */ @@ -528,7 +634,7 @@ void gdcmDicomDir::CallProgressMethod(void) if(progressMethod) progressMethod(progressArg); } -/* +/** * \ingroup gdcmDicomDir * \brief CallEndMethod */ @@ -541,7 +647,7 @@ void gdcmDicomDir::CallEndMethod(void) //----------------------------------------------------------------------------- // Private -/* +/** * \ingroup gdcmDicomDir * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader */ @@ -556,129 +662,139 @@ void gdcmDicomDir::CreateDicomDir() // + loop to 1 - gdcmDicomDirType type=gdcmDicomDir::GDCM_DICOMDIR_META; - ListTag::iterator begin; - ListTag::iterator end, end2; - - begin=listEntries.begin(); - end=begin; - for(ListTag::iterator i=end;i !=listEntries.end();++i) - { - std::string v=(*i)->GetValue(); + + gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); // Directory record sequence + if (e==NULL) { + dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record sequence (0x0004,0x1220)" + ); + // FIXME : what to do when the parsed file IS NOT a DICOMDIR file ? + return; + } + + gdcmDicomDirMeta *m = new gdcmDicomDirMeta(&tagHT); + + gdcmSeqEntry *s = (gdcmSeqEntry *)e; // FIXME : It is allowed ??? + ListSQItem listItems = s->GetSQItems(); + + gdcmDocEntry * d; + for(ListSQItem::iterator i=listItems.begin(); i !=listItems.end();++i) + { + d=(*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type + std::string v=((gdcmValEntry *)d)->GetValue(); + if(v=="PATIENT ") - { - end=end2=i; - AddObjectToEnd(type,begin,--end2); + { + AddDicomDirPatientToEnd(*i); + //AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_PATIENT; - begin=end; } - if(v=="STUDY ") + else if(v=="STUDY ") { - end=end2=i; - AddObjectToEnd(type,begin,--end2); + AddDicomDirStudyToEnd(*i); + // AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_STUDY; - begin=end; } - if(v=="SERIES") + else if(v=="SERIES") { - end=end2=i; - AddObjectToEnd(type,begin,--end2); + AddDicomDirSerieToEnd(*i); + // AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_SERIE; - begin=end; } - if(v=="IMAGE ") + else if(v=="IMAGE ") { - end=end2=i; - AddObjectToEnd(type,begin,--end2); + AddDicomDirImageToEnd(*i); + // AddObjectToEnd(type,*i); type=gdcmDicomDir::GDCM_DICOMDIR_IMAGE; - begin=end; } + + else + continue ; // It was 'non PATIENT', 'non STUDY', 'non SERIE', 'non IMAGE' SQItem } - - end=end2=listEntries.end(); - if(begin!=end) - AddObjectToEnd(type,begin,--end2); } -/* +/** * \ingroup gdcmDicomDir * \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,&tagHT,&listEntries); + metaElems = new gdcmDicomDirMeta(&tagHT); } -/* +/** * \ingroup gdcmDicomDir * \brief AddDicomDirPatientToEnd - * @param begin - * @param end + * @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,&tagHT, &listEntries)); + patients.push_back(new gdcmDicomDirPatient(s, &tagHT)); } -/* +/** * \ingroup gdcmDicomDir * \brief AddDicomDirStudyToEnd - * @param begin - * @param end + * @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,&tagHT, &listEntries)); + (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(s, &tagHT)); } } -/* +/** * \ingroup gdcmDicomDir * \brief AddDicomDirSerieToEnd - * @param begin - * @param end + * @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) { @@ -689,18 +805,17 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterat { ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end(); itst--; - (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(begin,end,&tagHT, &listEntries)); + (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(s, &tagHT)); } } } -/* +/** * \ingroup gdcmDicomDir * \brief AddDicomDirImageToEnd - * @param begin - * @param end + * @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) { @@ -716,19 +831,19 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterat { ListDicomDirSerie::iterator its=(*itst)->GetDicomDirSeries().end(); its--; - (*its)->AddDicomDirImage(new gdcmDicomDirImage(begin,end,&tagHT, &listEntries)); + (*its)->AddDicomDirImage(new gdcmDicomDirImage(s, &tagHT)); } } } } -/* +/** * \ingroup gdcmDicomDir * \brief for each Header of the chained list, add/update the Patient/Study/Serie/Image info * @param path path of the root directory * @param list chained list of Headers */ -void gdcmDicomDir::SetElements(std::string &path, ListHeader &list) +void gdcmDicomDir::SetElements(std::string &path, VectDocument &list) { std::string patPrevName="", patPrevID=""; std::string studPrevInstanceUID="", studPrevID=""; @@ -740,8 +855,7 @@ void gdcmDicomDir::SetElements(std::string &path, ListHeader &list) 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); @@ -774,126 +888,26 @@ void gdcmDicomDir::SetElements(std::string &path, ListHeader &list) } } -/* +/** * \ingroup gdcmDicomDir - * \brief adds to the HTable and at the end of the Chained List - * 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 + * \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_META: - 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) ) // 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()); - } - } - //AddHeaderEntry(entry); // both in H Table and in chained list - tagHT.insert( PairHT( entry->GetKey(),entry) ); - listEntries.push_back(entry); - //wasUpdated = 1; // is private - } -} - -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; @@ -911,8 +925,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; + */ } //-----------------------------------------------------------------------------