X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=7a18df16f7d28230eda48d4c2e06238e89678b5a;hb=0d8ca63a1a2c1a61c2e2b92526ba81c9885702ba;hp=bbd9374a46b32afa09937ca80f46281152fb205d;hpb=cf66ed219aec63038f62f96f5fbdc4e37868bb0d;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index bbd9374a..7a18df16 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -1,5 +1,21 @@ -// 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 @@ -28,9 +44,26 @@ // 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; +} -// Constructor / Destructor /** * \brief Constructor Parses recursively the directory and creates the DicomDir @@ -49,24 +82,10 @@ gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir, bool exception_on_error): 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 gdcmDocument - - startMethod= NULL; - progressMethod= NULL; - endMethod= NULL; - startMethodArgDelete= NULL; - progressMethodArgDelete=NULL; - endMethodArgDelete= NULL; - startArg= NULL; - progressArg= NULL; - endArg= NULL; - - progress=0.0; - abort=false; - - metaElems=NULL; + // que l'on ai passe un root directory ou un DICOMDIR + // et quelle que soit la valeur de parseDir, + // on a lance gdcmDocument + Initialize(); // gdcmDocument already executed // if user passed a root directory, sure we didn't get anything @@ -114,25 +133,15 @@ gdcmDicomDir::gdcmDicomDir(const char *FileName, bool parseDir, gdcmDicomDir::gdcmDicomDir(bool 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; + + Initialize(); + std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ... SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements AddDicomDirMeta(); } - /** - * \ingroup gdcmDicomDir * \brief Canonical destructor */ gdcmDicomDir::~gdcmDicomDir() @@ -144,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; } @@ -153,7 +164,6 @@ gdcmDicomDir::~gdcmDicomDir() //----------------------------------------------------------------------------- // Print /** - * \ingroup gdcmDicomDir * \brief Canonical Printer */ void gdcmDicomDir::Print(std::ostream &os) @@ -163,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); @@ -173,7 +185,6 @@ 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 @@ -332,7 +343,7 @@ bool gdcmDicomDir::Write(std::string fileName) * @param _fp already open file pointer */ -void gdcmDicomDir::WriteEntries(FILE *_fp) +void gdcmDicomDir::WriteEntries(FILE *) //_fp { /// \todo (?) tester les echecs en ecriture /// (apres chaque fwrite, dans le WriteEntry) @@ -357,8 +368,8 @@ void gdcmDicomDir::WriteEntries(FILE *_fp) for(i=(*itPatient)->debut();i!=(*itPatient)->fin();++i) { 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, gdcmExplicitVR); } @@ -372,11 +383,11 @@ void gdcmDicomDir::WriteEntries(FILE *_fp) for(i=(*itImage)->debut();i!=(*itImage)->fin();++i) { WriteEntry(*i,_fp, gdcmExplicitVR); } - ++itImage; - } - ++itSerie; + ++itImage; + } + ++itSerie; } - ++itStudy; + ++itStudy; } ++itPatient; } @@ -394,7 +405,6 @@ void gdcmDicomDir::WriteEntries(FILE *_fp) void gdcmDicomDir::CreateDicomDirChainedList(std::string path) { CallStartMethod(); - gdcmDirList fileList(path,1); // gets recursively the file list unsigned int count=0; VectDocument list; @@ -407,18 +417,26 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string path) 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()) + 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); @@ -524,8 +542,7 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, gdcmValEntry *entry; std::string val; - switch(type) - { + switch(type){ case GDCM_DICOMDIR_PATIENT: elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); break; @@ -545,12 +562,12 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, return; } - for(it=elemList.begin();it!=elemList.end();++it) - { + for(it=elemList.begin();it!=elemList.end();++it) { tmpGr=it->group; tmpEl=it->elem; dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl); - entry=new gdcmValEntry(dictEntry); + entry=new gdcmValEntry(dictEntry); // Be sure it's never a BinEntry ! + entry->SetOffset(0); // just to avoid further missprinting if(header) @@ -593,23 +610,22 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, if(dictEntry) { - if(dictEntry->GetGroup()==0xfffe) - { + if(dictEntry->GetGroup()==0xfffe) { entry->SetLength(entry->GetValue().length()); - } - else if( (dictEntry->GetVR()=="UL") || (dictEntry->GetVR()=="SL") ) + } + else if( (dictEntry->GetVR()=="UL") || (dictEntry->GetVR()=="SL") ) { entry->SetLength(4); } - else if( (dictEntry->GetVR()=="US") || (dictEntry->GetVR()=="SS") ) + else if( (dictEntry->GetVR()=="US") || (dictEntry->GetVR()=="SS") ) { entry->SetLength(2); } - else if(dictEntry->GetVR()=="SQ") + else if(dictEntry->GetVR()=="SQ") { entry->SetLength(0xffffffff); } - else + else { entry->SetLength(entry->GetValue().length()); } @@ -686,6 +702,7 @@ void gdcmDicomDir::CreateDicomDir() ListSQItem listItems = s->GetSQItems(); gdcmDicomDirMeta *m = new gdcmDicomDirMeta(&tagHT); + (void)m; //?? gdcmDocEntry * d; std::string v; @@ -769,7 +786,7 @@ void gdcmDicomDir::CreateDicomDir() AddDicomDirImageToEnd(s); break; case gdcmDicomDir::GDCM_DICOMDIR_NONE: - AddDicomDirImageToEnd(s); //FIXME + AddDicomDirImageToEnd(s); //FIXME break; } } @@ -948,7 +965,7 @@ void gdcmDicomDir::UpdateDirectoryRecordSequenceLength() { } } //bool res=SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. - SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. + SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. return; */ }