X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=11550d2df0971a255151008a3258d3c7be0507e8;hb=5f059c9a5febdd08bc360421311319fd9a806b75;hp=b5fba6876c1786d6912fc3e070ea8913d68a6b73;hpb=1a11accd11061d63d3c09db7b1445637207e81e4;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index b5fba687..11550d2d 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -1,15 +1,23 @@ -// gdcmDicomDir.cxx -//----------------------------------------------------------------------------- -#include "gdcmDicomDir.h" -#include "gdcmDicomDirStudy.h" -#include "gdcmDicomDirSerie.h" -#include "gdcmDicomDirImage.h" -#include "gdcmDirList.h" -#include "gdcmUtil.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDir.cxx,v $ + Language: C++ + Date: $Date: 2004/06/22 14:03:30 $ + Version: $Revision: 1.50 $ + + 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 @@ -19,19 +27,49 @@ #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 "gdcmSeqEntry.h" +#include "gdcmSQItem.h" +#include "gdcmValEntry.h" + //----------------------------------------------------------------------------- // For full DICOMDIR description, see: // PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- - // Constructor / Destructor +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; +} + + /** - * \ingroup gdcmDicomDir * \brief Constructor Parses recursively the directory and creates the DicomDir - * or uses an already built DICOMDIR, depending on 'parseDir' value + * or uses an already built DICOMDIR, depending on 'parseDir' value. * @param FileName name - - of the root directory (parseDir = true) + * - of the root directory (parseDir = true) * - of the DICOMDIR (parseDir = false) * @param parseDir boolean * - true if user passed an entry point @@ -42,58 +80,48 @@ */ gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir, bool exception_on_error): - gdcmParser(FileName,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 - - 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 -// gdcmParser 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(FileName)==1 && FileName[0]=='.') { // user passed '.' as Name // we get current directory name - char*dummy=(char*) malloc(1000); -#ifdef _MSC_VER - _getcwd(dummy,(size_t)1000); -#else - getcwd(dummy,(size_t)1000); -#endif + 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 { + /// \todo if parseDir == false, it should be tagged as an error } } - else { + 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(); - CheckBoundaries(); // to maintain consistency between - // home-made gdcmDicomDir - // and the ones comming from a DICOMDIR file } } @@ -103,29 +131,17 @@ gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir, * @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; - endMethod= NULL; - startMethodArgDelete= NULL; - progressMethodArgDelete=NULL; - endMethodArgDelete= NULL; - startArg= NULL; - progressArg= NULL; - endArg= NULL; - - progress=0.0; - abort=false; - std::string pathBidon = ""; // Sorry, NULL not allowed ... + + Initialize(); + + std::string pathBidon = "Bidon"; // 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 */ gdcmDicomDir::~gdcmDicomDir() @@ -137,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; } @@ -146,7 +164,6 @@ gdcmDicomDir::~gdcmDicomDir() //----------------------------------------------------------------------------- // Print /** - * \ingroup gdcmDicomDir * \brief Canonical Printer */ void gdcmDicomDir::Print(std::ostream &os) @@ -156,7 +173,9 @@ 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); @@ -166,17 +185,16 @@ 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); @@ -309,29 +327,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); + delete[] filePreamble; UpdateDirectoryRecordSequenceLength(); - WriteDicomDirEntries(fp1); + 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; @@ -342,37 +360,38 @@ 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() ) { + 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; - } - ++itSerie; + ++itImage; + } + ++itSerie; } - ++itStudy; + ++itStudy; } ++itPatient; } + */ } //----------------------------------------------------------------------------- @@ -380,7 +399,7 @@ void gdcmDicomDir::WriteDicomDirEntries(FILE *_fp) /** * \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) @@ -389,10 +408,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(); @@ -425,74 +444,55 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string path) /** * \ingroup gdcmDicomDir - * \brief modifies the limits of a gdcmObject, created from a DICOMDIR file + * \brief adds *the* Meta to a partially created DICOMDIR */ - -void gdcmDicomDir::CheckBoundaries() -{ - ListDicomDirPatient::iterator itPatient; - ListDicomDirStudy::iterator itStudy; - ListDicomDirSerie::iterator itSerie; - ListDicomDirImage::iterator itImage; - ListTag::iterator i,j; - - GetDicomDirMeta()->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; + + // 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); @@ -507,25 +507,129 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient(void) { } else { - entry->SetLength(entry->GetValue().length()); + 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; + gdcmValEntry *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) { + std::cout << "it " << std::endl; + 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) @@ -572,129 +676,157 @@ 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) + + // 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); + + 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=end2=i; - AddObjectToEnd(type,begin,--end2); + 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=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 + // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE', + // neither an 'IMAGE' SQItem. Skip to next item. + continue; } - - end=end2=listEntries.end(); - if(begin!=end) - AddObjectToEnd(type,begin,--end2); } /** * \ingroup gdcmDicomDir * \brief AddObjectToEnd * @param type - * @param begin iterator on the first HeaderEntry within the chained List - * @param end iterator on the last HeaderEntry within the chained List + * @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 iterator on the first HeaderEntry within the chained List - * @param end iterator on the last HeaderEntry within the chained List + * \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 iterator on the first HeaderEntry within the chained List - * @param end iterator on the last HeaderEntry within the chained List + * @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 iterator on the first HeaderEntry within the chained List - * @param end iterator on the last HeaderEntry within the chained List + * @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 iterator on the first HeaderEntry within the chained List - * @param end iterator on the last HeaderEntry within the chained List + * @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) { @@ -705,7 +837,7 @@ 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)); } } } @@ -713,10 +845,9 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterat /** * \ingroup gdcmDicomDir * \brief AddDicomDirImageToEnd - * @param begin iterator on the first HeaderEntry within the chained List - * @param end iterator on the last HeaderEntry within the chained List + * @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) { @@ -732,7 +863,7 @@ 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)); } } } @@ -744,7 +875,7 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(ListTag::iterator begin,ListTag::iterat * @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=""; @@ -756,8 +887,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); @@ -790,122 +920,11 @@ 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 - */ -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 - } -} /** * \ingroup gdcmDicomDir * \brief compares two dgcmHeaders */ -bool gdcmDicomDir::HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2) +bool gdcmDicomDir::HeaderLessThan(gdcmDocument *header1,gdcmDocument *header2) { return(*header1<*header2); } @@ -916,6 +935,11 @@ bool gdcmDicomDir::HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2) */ void gdcmDicomDir::UpdateDirectoryRecordSequenceLength() { + +// FIXME : to go on compiling + +// to be re written ! +/* int offset = 0; ListTag::iterator it; guint16 gr, el; @@ -933,8 +957,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; + */ } //-----------------------------------------------------------------------------