X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=18bce3cf67b7b6a172fc7ea712b1a06c60c29bf1;hb=6b0359d3c073112a5d6a23114d6adb0fff949e7b;hp=4ef11dd20b28ccb80cbfe14261cc5e25d9cd9368;hpb=6e9466fd9b712361db37c64dfc5d8a7efaae59f0;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 4ef11dd2..18bce3cf 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/01/28 15:58:40 $ - Version: $Revision: 1.121 $ + Date: $Date: 2005/02/07 14:48:34 $ + Version: $Revision: 1.130 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,6 +16,10 @@ =========================================================================*/ +//----------------------------------------------------------------------------- +// For full DICOMDIR description, see: +// PS 3.3-2003, pages 731-750 +//----------------------------------------------------------------------------- #include "gdcmDicomDir.h" #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" @@ -46,21 +50,67 @@ #else # include #endif - +// ---------------------------------------------------------------------------- +// Note for future developpers +// ---------------------------------------------------------------------------- +// +// Dicom PS 3.3 describes the relationship between Directory Records, as follow +// +// Directory Record Type Directory Record Types which may be included +// in the next lower-èlevel directory Entity +// +// (Root directory Entity) PATIENT +// +// PATIENT STUDY +// +// STUDY SERIES, VISIT, RESULTS, STUDY COMPONENT +// +// 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 +// IMAGE +// OVERLAY +// 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 +// +// ---------------------- +// The current gdcm version only deals with : +// +// (Root directory Entity) PATIENT +// PATIENT STUDY +// STUDY SERIES +// SERIES IMAGE +// IMAGE / +// +// DicomDir::CreateDicomDir will have to be completed +// Treelike structure management will have to be upgraded +// ---------------------------------------------------------------------------- + namespace gdcm { - -//----------------------------------------------------------------------------- -// For full DICOMDIR description, see: -// PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- // Constructor / Destructor - /** * \brief Constructor : creates an empty DicomDir */ DicomDir::DicomDir() - :Document( ) + :Document( ) { Initialize(); // sets all private fields to NULL NewMeta(); @@ -69,7 +119,7 @@ DicomDir::DicomDir() /** * \brief Constructor Parses recursively the directory and creates the DicomDir * or uses an already built DICOMDIR, depending on 'parseDir' value. - * @param fileName name + * @param fileName name * - of the root directory (parseDir = true) * - of the DICOMDIR (parseDir = false) * @param parseDir boolean @@ -93,7 +143,7 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse { if (!parseDir) - gdcmVerboseMacro( "Entry HT empty for file: "<SetPrintLevel(PrintLevel); - MetaElems->Print(os); - } - for(ListDicomDirPatient::iterator cc = Patients.begin(); - cc != Patients.end(); - ++cc) - { - (*cc)->SetPrintLevel(PrintLevel); - (*cc)->Print(os); - } -} - //----------------------------------------------------------------------------- // Public /** @@ -190,23 +217,108 @@ bool DicomDir::IsReadable() { if( Filetype == Unknown) { - gdcmVerboseMacro( "Wrong filetype"); + gdcmWarningMacro( "Wrong filetype"); return false; } if( !MetaElems ) { - gdcmVerboseMacro( "Meta Elements missing in DicomDir"); + gdcmWarningMacro( "Meta Elements missing in DicomDir"); return false; } if( Patients.size() <= 0 ) { - gdcmVerboseMacro( "NO Patient in DicomDir"); + gdcmWarningMacro( "NO Patient in DicomDir"); return false; } return true; } +/** + * \brief adds *the* Meta to a partially created DICOMDIR + */ +DicomDirMeta *DicomDir::NewMeta() +{ + if( MetaElems ) + delete MetaElems; + + DocEntry *entry = GetFirstEntry(); + if( entry ) + { + MetaElems = new DicomDirMeta(true); + + entry = GetFirstEntry(); + while( entry ) + { + if( dynamic_cast(entry) ) + break; + + RemoveEntryNoDestroy(entry); + MetaElems->AddEntry(entry); + + entry = GetFirstEntry(); + } + } + else // after root directory parsing + { + MetaElems = new DicomDirMeta(false); + } + MetaElems->SetSQItemNumber(0); // To avoid further missprinting + return MetaElems; +} + +/** + * \brief adds a new Patient (with the basic elements) to a partially created + * DICOMDIR + */ +DicomDirPatient *DicomDir::NewPatient() +{ + DicomDirPatient *p = new DicomDirPatient(); + AddPatientToEnd( p ); + return p; +} + +/** + * \brief Remove all Patients + */ +void DicomDir::ClearPatient() +{ + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); + ++cc) + { + delete *cc; + } + Patients.clear(); +} + +/** + * \brief Get the first entry while visiting the DicomDirPatients + * \return The first DicomDirPatient if found, otherwhise NULL + */ +DicomDirPatient *DicomDir::GetFirstPatient() +{ + ItPatient = Patients.begin(); + if ( ItPatient != Patients.end() ) + return *ItPatient; + return NULL; +} + +/** + * \brief Get the next entry while visiting the DicomDirPatients + * \note : meaningfull only if GetFirstEntry already called + * \return The next DicomDirPatient if found, otherwhise NULL + */ +DicomDirPatient *DicomDir::GetNextPatient() +{ + gdcmAssertMacro (ItPatient != Patients.end()); + + ++ItPatient; + if ( ItPatient != Patients.end() ) + return *ItPatient; + return NULL; +} + /** * \brief fills the whole structure, starting from a root Directory */ @@ -237,17 +349,6 @@ void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, StartMethodArgDelete = argDelete; } -/** - * \brief Set the method to delete the argument - * 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 DicomDir::SetStartMethodArgDelete( DicomDir::Method *method ) -{ - StartMethodArgDelete = method; -} - /** * \brief Set the progress method to call when the parsing of the * directory progress @@ -269,17 +370,6 @@ void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, ProgressMethodArgDelete = argDelete; } -/** - * \brief Set the method to delete the argument - * 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 DicomDir::SetProgressMethodArgDelete( DicomDir::Method *method ) -{ - ProgressMethodArgDelete = method; -} - /** * \brief Set the end method to call when the parsing of the directory ends * @param method Method to call @@ -302,40 +392,35 @@ void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg, /** * \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 DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) +void DicomDir::SetStartMethodArgDelete( DicomDir::Method *method ) { - EndMethodArgDelete = method; + StartMethodArgDelete = method; } /** - * \brief Get the first entry while visiting the DicomDirPatients - * \return The first DicomDirPatient if found, otherwhise NULL - */ -DicomDirPatient *DicomDir::GetFirstPatient() + * \brief Set the method to delete the argument + * 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 DicomDir::SetProgressMethodArgDelete( DicomDir::Method *method ) { - ItPatient = Patients.begin(); - if ( ItPatient != Patients.end() ) - return *ItPatient; - return NULL; + ProgressMethodArgDelete = method; } /** - * \brief Get the next entry while visiting the DicomDirPatients - * \note : meaningfull only if GetFirstEntry already called - * \return The next DicomDirPatient if found, otherwhise NULL + * \brief Set the method to delete the argument + * The argument is destroyed when the method is changed or when + * the class is destroyed + * @param method Method to call to delete the argument */ -DicomDirPatient *DicomDir::GetNextPatient() +void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) { - gdcmAssertMacro (ItPatient != Patients.end()); - - ++ItPatient; - if ( ItPatient != Patients.end() ) - return *ItPatient; - return NULL; + EndMethodArgDelete = method; } /** @@ -359,7 +444,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) std::ios::out | std::ios::binary); if( !fp ) { - gdcmVerboseMacro("Failed to open(write) File: " << fileName.c_str()); + gdcmWarningMacro("Failed to open(write) File: " << fileName.c_str()); return false; } @@ -398,12 +483,11 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) //----------------------------------------------------------------------------- // Protected - /** * \brief create a Document-like chained list from a root Directory * @param path entry point of the tree-like structure */ -void DicomDir::CreateDicomDirChainedList(std::string const & path) +void DicomDir::CreateDicomDirChainedList(std::string const &path) { CallStartMethod(); DirList dirList(path,1); // gets recursively the file list @@ -427,7 +511,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) header = new File( it->c_str() ); if( !header ) { - gdcmVerboseMacro( "Failure in new gdcm::File " << it->c_str() ); + gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() ); continue; } @@ -435,7 +519,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) { // Add the file to the chained list: list.push_back(header); - gdcmVerboseMacro( "Readable " << it->c_str() ); + gdcmWarningMacro( "Readable " << it->c_str() ); } else { @@ -460,249 +544,47 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) } /** - * \brief adds *the* Meta to a partially created DICOMDIR - */ -DicomDirMeta *DicomDir::NewMeta() + * \brief CallStartMethod + */ +void DicomDir::CallStartMethod() { - if( MetaElems ) - delete MetaElems; - - DocEntry *entry = GetFirstEntry(); - if( entry ) - { - MetaElems = new DicomDirMeta(true); - - entry = GetFirstEntry(); - while( entry ) - { - if( dynamic_cast(entry) ) - break; - - RemoveEntryNoDestroy(entry); - MetaElems->AddEntry(entry); - - entry = GetFirstEntry(); - } - } - else // after root directory parsing + Progress = 0.0f; + Abort = false; + if( StartMethod ) { - MetaElems = new DicomDirMeta(false); + StartMethod( StartArg ); } - MetaElems->SetSQItemNumber(0); // To avoid further missprinting - return MetaElems; } /** - * \brief adds a new Patient (with the basic elements) to a partially created - * DICOMDIR + * \brief CallProgressMethod */ -DicomDirPatient *DicomDir::NewPatient() +void DicomDir::CallProgressMethod() { - DicomDirPatient *p = new DicomDirPatient(); - AddPatientToEnd( p ); - return p; + if( ProgressMethod ) + { + ProgressMethod( ProgressArg ); + } } /** - * \brief Remove all Patients + * \brief CallEndMethod */ -void DicomDir::ClearPatient() +void DicomDir::CallEndMethod() { - for(ListDicomDirPatient::iterator cc = Patients.begin(); - cc!= Patients.end(); - ++cc) + Progress = 1.0f; + if( EndMethod ) { - delete *cc; + EndMethod( EndArg ); } - Patients.clear(); } +//----------------------------------------------------------------------------- +// Private /** - * \brief adds to the HTable - * the Entries (Dicom Elements) corresponding to the given type - * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE - * @param type DicomDirObject type to create (GDCM_DICOMDIR_PATIENT, - * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) - * @param header Header of the current file + * \brief Sets all fields to NULL */ -void DicomDir::SetElement(std::string const &path, DicomDirType type, - Document *header) -{ - ListDicomDirElem elemList; //FIXME this is going to be a by copy operation - ListDicomDirElem::const_iterator it; - uint16_t tmpGr, tmpEl; - DictEntry *dictEntry; - ValEntry *entry; - std::string val; - SQItem *si; - - switch( type ) - { - case GDCM_DICOMDIR_IMAGE: - elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); - si = new DicomDirImage(true); - if( !AddImageToEnd(static_cast(si)) ) - { - delete si; - gdcmErrorMacro( "Add ImageToEnd failed"); - } - break; - case GDCM_DICOMDIR_SERIE: - elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); - si = new DicomDirSerie(true); - if( !AddSerieToEnd(static_cast(si)) ) - { - delete si; - gdcmErrorMacro( "Add SerieToEnd failed"); - } - break; - case GDCM_DICOMDIR_STUDY: - elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); - si = new DicomDirStudy(true); - if( !AddStudyToEnd(static_cast(si)) ) - { - delete si; - gdcmErrorMacro( "Add StudyToEnd failed"); - } - break; - case GDCM_DICOMDIR_PATIENT: - elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); - si = new DicomDirPatient(true); - if( !AddPatientToEnd(static_cast(si)) ) - { - delete si; - gdcmErrorMacro( "Add PatientToEnd failed"); - } - break; - case GDCM_DICOMDIR_META: - elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); - si = new DicomDirMeta(true); - if( MetaElems ) - { - delete MetaElems; - gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); - } - MetaElems = static_cast(si); - break; - default: - return; - } - // removed all the seems-to-be-useless stuff about Referenced Image Sequence - // to avoid further troubles - // imageElem 0008 1140 "" // Referenced Image Sequence - // imageElem fffe e000 "" // 'no length' item : length to be set to 0xffffffff later - // imageElem 0008 1150 "" // Referenced SOP Class UID : to be set/forged later - // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later - // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later - // for all the relevant elements found in their own spot of the DicomDir.dic - // FIXME : troubles found when it's a SeqEntry - - for( it = elemList.begin(); it != elemList.end(); ++it) - { - tmpGr = it->Group; - tmpEl = it->Elem; - dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); - - entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! - - entry->SetOffset(0); // just to avoid further missprinting - - if( header ) - { - // NULL when we Build Up (ex nihilo) a DICOMDIR - // or when we add the META elems - val = header->GetEntryValue(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 = Util::GetName( path ); - } - else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image - { - if( header->GetFileName().substr(0, path.length()) != path ) - { - gdcmVerboseMacro( "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->GetEntryLength(tmpGr,tmpEl) == 0 ) - val = it->Value; - } - - entry->SetValue( val ); // troubles expected when vr=SQ ... - - if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! - { - gdcmVerboseMacro("GDCM_DICOMDIR_META ?!? should never print that"); - } - si->AddEntry(entry); - } -} - -//----------------------------------------------------------------------------- -/** - * \brief CallStartMethod - */ -void DicomDir::CallStartMethod() -{ - Progress = 0.0f; - Abort = false; - if( StartMethod ) - { - StartMethod( StartArg ); - } -} - -//----------------------------------------------------------------------------- -/** - * \brief CallProgressMethod - */ -void DicomDir::CallProgressMethod() -{ - if( ProgressMethod ) - { - ProgressMethod( ProgressArg ); - } -} - -//----------------------------------------------------------------------------- -/** - * \brief CallEndMethod - */ -void DicomDir::CallEndMethod() -{ - Progress = 1.0f; - if( EndMethod ) - { - EndMethod( EndArg ); - } -} - -//----------------------------------------------------------------------------- -// Private -/** - * \brief Sets all fields to NULL - */ -void DicomDir::Initialize() +void DicomDir::Initialize() { StartMethod = NULL; ProgressMethod = NULL; @@ -725,7 +607,7 @@ void DicomDir::Initialize() */ void DicomDir::CreateDicomDir() { - // The list is parsed. + // The SeqEntries of "Directory Record Sequence" are parsed. // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found : // 1 - we save the beginning iterator // 2 - we continue to parse @@ -737,7 +619,7 @@ void DicomDir::CreateDicomDir() DocEntry *e = GetDocEntry(0x0004, 0x1220); if ( !e ) { - gdcmVerboseMacro( "NO Directory record sequence (0x0004,0x1220)"); + gdcmWarningMacro( "No Directory Record Sequence (0004,1220) found"); /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? return; } @@ -745,8 +627,7 @@ void DicomDir::CreateDicomDir() SeqEntry *s = dynamic_cast(e); if ( !s ) { - gdcmVerboseMacro( "No SeqEntry present"); - // useless : (0x0004,0x1220) IS a Sequence ! + gdcmWarningMacro( "Element (0004,1220) is not a Sequence ?!?"); return; } @@ -766,7 +647,7 @@ void DicomDir::CreateDicomDir() } else { - gdcmVerboseMacro( "Not a ValEntry."); + gdcmWarningMacro( "Not a ValEntry."); continue; } @@ -816,6 +697,9 @@ void DicomDir::CreateDicomDir() // neither an 'IMAGE' SQItem. Skip to next item. continue; } + if( si ) + MoveSQItem(si,tmpSI); + tmpSI=s->GetNextSQItem(); } ClearEntry(); @@ -894,11 +778,12 @@ bool DicomDir::AddImageToEnd(DicomDirImage *dd) } /** - * \brief for each Header of the chained list, add/update the Patient/Study/Serie/Image info + * \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 DicomDir::SetElements(std::string const & path, VectDocument const &list) +void DicomDir::SetElements(std::string const &path, VectDocument const &list) { ClearEntry(); ClearPatient(); @@ -913,7 +798,8 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) bool first = true; for( VectDocument::const_iterator it = list.begin(); - it != list.end(); ++it ) + it != list.end(); + ++it ) { // get the current file characteristics patCurName = (*it)->GetEntryValue(0x0010,0x0010); @@ -958,6 +844,148 @@ void DicomDir::SetElements(std::string const & path, VectDocument const &list) } } +/** + * \brief adds to the HTable + * the Entries (Dicom Elements) corresponding to the given type + * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE + * @param type DicomDirObject type to create (GDCM_DICOMDIR_PATIENT, + * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) + * @param header Header of the current file + */ +void DicomDir::SetElement(std::string const &path, DicomDirType type, + Document *header) +{ + ListDicomDirElem elemList; //FIXME this is going to be a by copy operation + ListDicomDirElem::const_iterator it; + uint16_t tmpGr, tmpEl; + DictEntry *dictEntry; + ValEntry *entry; + std::string val; + SQItem *si; + + switch( type ) + { + case GDCM_DICOMDIR_IMAGE: + elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); + si = new DicomDirImage(true); + if( !AddImageToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add ImageToEnd failed"); + } + break; + case GDCM_DICOMDIR_SERIE: + elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); + si = new DicomDirSerie(true); + if( !AddSerieToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add SerieToEnd failed"); + } + break; + case GDCM_DICOMDIR_STUDY: + elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); + si = new DicomDirStudy(true); + if( !AddStudyToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add StudyToEnd failed"); + } + break; + case GDCM_DICOMDIR_PATIENT: + elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); + si = new DicomDirPatient(true); + if( !AddPatientToEnd(static_cast(si)) ) + { + delete si; + gdcmErrorMacro( "Add PatientToEnd failed"); + } + break; + case GDCM_DICOMDIR_META: + elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); + si = new DicomDirMeta(true); + if( MetaElems ) + { + delete MetaElems; + gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); + } + MetaElems = static_cast(si); + break; + default: + return; + } + // removed all the seems-to-be-useless stuff about Referenced Image Sequence + // to avoid further troubles + // imageElem 0008 1140 "" // Referenced Image Sequence + // imageElem fffe e000 "" // 'no length' item : length to be set to 0xffffffff later + // imageElem 0008 1150 "" // Referenced SOP Class UID : to be set/forged later + // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later + // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later + + // FIXME : troubles found when it's a SeqEntry + + // for all the relevant elements found in their own spot of the DicomDir.dic + for( it = elemList.begin(); it != elemList.end(); ++it) + { + tmpGr = it->Group; + tmpEl = it->Elem; + dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); + + entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! + + entry->SetOffset(0); // just to avoid further missprinting + + if( header ) + { + // NULL when we Build Up (ex nihilo) a DICOMDIR + // or when we add the META elems + val = header->GetEntryValue(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 = Util::GetName( path ); + } + else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image + { + if( header->GetFileName().substr(0, path.length()) != path ) + { + gdcmWarningMacro( "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->GetEntryLength(tmpGr,tmpEl) == 0 ) + val = it->Value; + } + + entry->SetValue( val ); // troubles expected when vr=SQ ... + + if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! + { + gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that"); + } + si->AddEntry(entry); + } +} + /** * \brief Move the content of the source SQItem to the destination SQItem * Only DocEntry's are moved @@ -986,6 +1014,28 @@ bool DicomDir::HeaderLessThan(Document *header1, Document *header2) return *header1 < *header2; } -} // end namespace gdcm +//----------------------------------------------------------------------------- +// Print +/** + * \brief Canonical Printer + * @param os ostream we want to print in + * @param indent Indentation string to be prepended during printing + */ +void DicomDir::Print(std::ostream &os, std::string const & ) +{ + if( MetaElems ) + { + MetaElems->SetPrintLevel(PrintLevel); + MetaElems->Print(os); + } + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); + ++cc) + { + (*cc)->SetPrintLevel(PrintLevel); + (*cc)->Print(os); + } +} //----------------------------------------------------------------------------- +} // end namespace gdcm