X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=05981583d5024377644d51c73a35125e6bc54fe2;hb=6383e4f567672c46fefb1c67c0bb821dee5b8bff;hp=27b840f24c2b20d3bcabb7935ba0f3812827fafb;hpb=7ab309d561964c2ab5f9cd5d51d2fb212cd5dfcb;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 27b840f2..05981583 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/04/14 14:26:19 $ - Version: $Revision: 1.137 $ + Date: $Date: 2005/07/03 12:45:53 $ + Version: $Revision: 1.143 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -60,17 +60,18 @@ // Directory Record Type Directory Record Types which may be included // in the next lower-level directory Entity // -// (Root directory Entity) PATIENT +// (Root directory Entity) PATIENT, TOPIC, PRIVATE // -// PATIENT STUDY +// PATIENT STUDY, PRIVATE // -// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT +// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT, PRIVATE // // SERIES IMAGE, OVERLAYS, MODALITY LUT, VOI LUT, // CURVE, STORED PRINT, RT DOSE, RT STRUCTURE SET // RT PLAN, RT TREAT RECORD, PRESENTATION, WAVEFORM, // SR DOCUMENT, KEY OBJECT DOC, SPECTROSCOPY, -// RAW DATA, REGISTRATION, FIDUCIAL +// RAW DATA, REGISTRATION, FIDUCIAL, PRIVATE, +// ENCAP DOC // IMAGE // OVERLAY // MODALITY LUT @@ -89,6 +90,8 @@ // RAW DATA // REGISTRATION // FIDUCIAL +// PRIVATE +// ENCAP DOC // // ---------------------- // The current gdcm version only deals with : @@ -133,7 +136,7 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): Document( ) { // At this step, Document constructor is already executed, - // whatever user passed (a root directory or a DICOMDIR) + // whatever user passed (either a root directory or a DICOMDIR) // and whatever the value of parseDir was. // (nothing is cheked in Document constructor, to avoid overhead) @@ -161,7 +164,7 @@ DicomDir::~DicomDir() //----------------------------------------------------------------------------- // Public -void DicomDir::Load(std::string const &fileName ) +bool DicomDir::Load(std::string const &fileName ) { Filename = fileName; // We should clean out anything that already exists. @@ -175,13 +178,13 @@ void DicomDir::Load(std::string const &fileName ) Fp = 0; if ( !OpenFile() ) { - return; + return false; } Document::Load(fileName); if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse { gdcmWarningMacro( "Entry HT empty for file: "<< fileName); - return; + return false; } // Directory record sequence DocEntry *e = GetDocEntry(0x0004, 0x1220); @@ -189,6 +192,7 @@ void DicomDir::Load(std::string const &fileName ) { gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)" << " in file " << fileName); + return false; } else CreateDicomDir(); @@ -207,8 +211,10 @@ void DicomDir::Load(std::string const &fileName ) } NewMeta(); gdcmWarningMacro( "Parse directory and create the DicomDir : " << Filename ); + ParseDirectory(); } + return true; } /** @@ -221,17 +227,17 @@ void DicomDir::Load(std::string const &fileName ) */ bool DicomDir::IsReadable() { - if( Filetype == Unknown) + if ( Filetype == Unknown ) { gdcmWarningMacro( "Wrong filetype"); return false; } - if( !MetaElems ) + if ( !MetaElems ) { gdcmWarningMacro( "Meta Elements missing in DicomDir"); return false; } - if( Patients.size() <= 0 ) + if ( Patients.size() <= 0 ) { gdcmWarningMacro( "NO Patient in DicomDir"); return false; @@ -245,18 +251,18 @@ bool DicomDir::IsReadable() */ DicomDirMeta *DicomDir::NewMeta() { - if( MetaElems ) + if ( MetaElems ) delete MetaElems; DocEntry *entry = GetFirstEntry(); - if( entry ) + if ( entry ) { - MetaElems = new DicomDirMeta(true); + MetaElems = new DicomDirMeta(true); // true = empty entry = GetFirstEntry(); while( entry ) { - if( dynamic_cast(entry) ) + if ( dynamic_cast(entry) ) break; RemoveEntryNoDestroy(entry); @@ -267,7 +273,7 @@ DicomDirMeta *DicomDir::NewMeta() } else // after root directory parsing { - MetaElems = new DicomDirMeta(false); + MetaElems = new DicomDirMeta(false); // false = not empty } MetaElems->SetSQItemNumber(0); // To avoid further missprinting return MetaElems; @@ -345,7 +351,7 @@ void DicomDir::ParseDirectory() void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, DicomDir::Method *argDelete ) { - if( StartArg && StartMethodArgDelete ) + if ( StartArg && StartMethodArgDelete ) { StartMethodArgDelete( StartArg ); } @@ -367,7 +373,7 @@ void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, DicomDir::Method *argDelete ) { - if( ProgressArg && ProgressMethodArgDelete ) + if ( ProgressArg && ProgressMethodArgDelete ) { ProgressMethodArgDelete( ProgressArg ); } @@ -387,7 +393,7 @@ void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg, DicomDir::Method *argDelete ) { - if( EndArg && EndMethodArgDelete ) + if ( EndArg && EndMethodArgDelete ) { EndMethodArgDelete( EndArg ); } @@ -446,7 +452,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) std::ofstream *fp = new std::ofstream(fileName.c_str(), std::ios::out | std::ios::binary); - if( !fp ) + if ( !fp ) { gdcmWarningMacro("Failed to open(write) File: " << fileName.c_str()); return false; @@ -524,14 +530,6 @@ bool DicomDir::AnonymizeDicomDir() return true; } - - - - - - - - //----------------------------------------------------------------------------- // Protected /** @@ -554,7 +552,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) { Progress = (float)(count+1)/(float)fileList.size(); CallProgressMethod(); - if( Abort ) + if ( Abort ) { break; } @@ -563,13 +561,13 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) f->SetLoadMode(LoadMode); // we allow user not to load Sequences... f->Load( it->c_str() ); -// if( !f ) +// if ( !f ) // { // gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() ); // continue; // } - if( f->IsReadable() ) + if ( f->IsReadable() ) { // Add the file to the chained list: list.push_back(f); @@ -604,7 +602,7 @@ void DicomDir::CallStartMethod() { Progress = 0.0f; Abort = false; - if( StartMethod ) + if ( StartMethod ) { StartMethod( StartArg ); } @@ -615,7 +613,7 @@ void DicomDir::CallStartMethod() */ void DicomDir::CallProgressMethod() { - if( ProgressMethod ) + if ( ProgressMethod ) { ProgressMethod( ProgressArg ); } @@ -627,7 +625,7 @@ void DicomDir::CallProgressMethod() void DicomDir::CallEndMethod() { Progress = 1.0f; - if( EndMethod ) + if ( EndMethod ) { EndMethod( EndArg ); } @@ -704,53 +702,63 @@ void DicomDir::CreateDicomDir() continue; } - if( v == "PATIENT " ) + // A decent DICOMDIR has much more images than series, + // more series than studies, and so on. + // This is the right order to preform the tests + + if ( v == "IMAGE " ) { - si = new DicomDirPatient(true); - if( !AddPatientToEnd( static_cast(si)) ) + si = new DicomDirImage(true); + if ( !AddImageToEnd( static_cast(si)) ) { delete si; si = NULL; - gdcmErrorMacro( "Add PatientToEnd failed"); + gdcmErrorMacro( "Add AddImageToEnd failed"); } } - else if( v == "STUDY " ) + else if ( v == "SERIES" ) { - si = new DicomDirStudy(true); - if( !AddStudyToEnd( static_cast(si)) ) + si = new DicomDirSerie(true); + if ( !AddSerieToEnd( static_cast(si)) ) { delete si; si = NULL; - gdcmErrorMacro( "Add AddStudyToEnd failed"); + gdcmErrorMacro( "Add AddSerieToEnd failed"); } } - else if( v == "SERIES" ) + else if ( v == "STUDY " ) { - si = new DicomDirSerie(true); - if( !AddSerieToEnd( static_cast(si)) ) + si = new DicomDirStudy(true); + if ( !AddStudyToEnd( static_cast(si)) ) { delete si; si = NULL; - gdcmErrorMacro( "Add AddSerieToEnd failed"); + gdcmErrorMacro( "Add AddStudyToEnd failed"); } } - else if( v == "IMAGE " ) + else if ( v == "PATIENT " ) { - si = new DicomDirImage(true); - if( !AddImageToEnd( static_cast(si)) ) + si = new DicomDirPatient(true); + if ( !AddPatientToEnd( static_cast(si)) ) { delete si; si = NULL; - gdcmErrorMacro( "Add AddImageToEnd failed"); + gdcmErrorMacro( "Add PatientToEnd failed"); } } else { - // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE', - // neither an 'IMAGE' SQItem. Skip to next item. - continue; + // It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE', + // nor an 'IMAGE' SQItem. Skip to next item. + gdcmWarningMacro( " -------------------------------------------" + << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : " + << v); + + // FIXME : deal with other item types ! + tmpSI=s->GetNextSQItem(); // To avoid infinite loop + continue; } - if( si ) + if ( si ) MoveSQItem(si,tmpSI); tmpSI=s->GetNextSQItem(); @@ -774,7 +782,7 @@ bool DicomDir::AddPatientToEnd(DicomDirPatient *dd) */ bool DicomDir::AddStudyToEnd(DicomDirStudy *dd) { - if( Patients.size() > 0 ) + if ( Patients.size() > 0 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; @@ -790,13 +798,13 @@ bool DicomDir::AddStudyToEnd(DicomDirStudy *dd) */ bool DicomDir::AddSerieToEnd(DicomDirSerie *dd) { - if( Patients.size() > 0 ) + if ( Patients.size() > 0 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; DicomDirStudy *study = (*itp)->GetLastStudy(); - if( study ) + if ( study ) { study->AddSerie(dd); return true; @@ -811,16 +819,16 @@ bool DicomDir::AddSerieToEnd(DicomDirSerie *dd) */ bool DicomDir::AddImageToEnd(DicomDirImage *dd) { - if( Patients.size() > 0 ) + if ( Patients.size() > 0 ) { ListDicomDirPatient::iterator itp = Patients.end(); itp--; DicomDirStudy *study = (*itp)->GetLastStudy(); - if( study ) + if ( study ) { DicomDirSerie *serie = study->GetLastSerie(); - if( serie ) + if ( serie ) { serie->AddImage(dd); return true; @@ -862,22 +870,22 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list) serCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000e); serCurID = (*it)->GetEntryValue(0x0020,0x0011); - if( patCurName != patPrevName || patCurID != patPrevID || first ) + if ( patCurName != patPrevName || patCurID != patPrevID || first ) { SetElement(path, GDCM_DICOMDIR_PATIENT, *it); first = true; } - // if new Study Deal with 'STUDY' Elements - if( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID + // if new Study, deal with 'STUDY' Elements + if ( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID || first ) { SetElement(path, GDCM_DICOMDIR_STUDY, *it); first = true; } - // if new Serie Deal with 'SERIE' Elements - if( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID + // if new Serie, deal with 'SERIE' Elements + if ( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID || first ) { SetElement(path, GDCM_DICOMDIR_SERIE, *it); @@ -920,7 +928,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, case GDCM_DICOMDIR_IMAGE: elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); si = new DicomDirImage(true); - if( !AddImageToEnd(static_cast(si)) ) + if ( !AddImageToEnd(static_cast(si)) ) { delete si; gdcmErrorMacro( "Add ImageToEnd failed"); @@ -929,7 +937,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, case GDCM_DICOMDIR_SERIE: elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); si = new DicomDirSerie(true); - if( !AddSerieToEnd(static_cast(si)) ) + if ( !AddSerieToEnd(static_cast(si)) ) { delete si; gdcmErrorMacro( "Add SerieToEnd failed"); @@ -938,7 +946,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, case GDCM_DICOMDIR_STUDY: elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); si = new DicomDirStudy(true); - if( !AddStudyToEnd(static_cast(si)) ) + if ( !AddStudyToEnd(static_cast(si)) ) { delete si; gdcmErrorMacro( "Add StudyToEnd failed"); @@ -947,7 +955,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, case GDCM_DICOMDIR_PATIENT: elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); si = new DicomDirPatient(true); - if( !AddPatientToEnd(static_cast(si)) ) + if ( !AddPatientToEnd(static_cast(si)) ) { delete si; gdcmErrorMacro( "Add PatientToEnd failed"); @@ -956,7 +964,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, case GDCM_DICOMDIR_META: elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); si = new DicomDirMeta(true); - if( MetaElems ) + if ( MetaElems ) { delete MetaElems; gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); @@ -987,7 +995,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, entry->SetOffset(0); // just to avoid further missprinting - if( header ) + if ( header ) { // NULL when we Build Up (ex nihilo) a DICOMDIR // or when we add the META elems @@ -998,16 +1006,16 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, val = GDCM_UNFOUND; } - if( val == GDCM_UNFOUND) + if ( val == GDCM_UNFOUND) { - if( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID + if ( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID { // force to the *end* File Name val = Util::GetName( path ); } - else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image + else if ( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image { - if( header->GetFileName().substr(0, path.length()) != path ) + if ( header->GetFileName().substr(0, path.length()) != path ) { gdcmWarningMacro( "The base path of file name is incorrect"); val = header->GetFileName(); @@ -1075,7 +1083,7 @@ bool DicomDir::HeaderLessThan(Document *header1, Document *header2) */ void DicomDir::Print(std::ostream &os, std::string const & ) { - if( MetaElems ) + if ( MetaElems ) { MetaElems->SetPrintLevel(PrintLevel); MetaElems->Print(os);