X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=775ab82be7a8365ee3fc135d6b3869d4cbbbff6c;hb=05c174bd812b9e375823d6a95683cb5036795a02;hp=97ad3707b89501d048b8560319bdce72985cd695;hpb=d39850f79b642ca72e0c49d8242e7101c4bb4481;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 97ad3707..775ab82b 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/03/02 17:16:48 $ - Version: $Revision: 1.134 $ + Date: $Date: 2005/10/20 08:58:17 $ + Version: $Revision: 1.162 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,8 +21,10 @@ // PS 3.3-2003, pages 731-750 //----------------------------------------------------------------------------- #include "gdcmDicomDir.h" +#include "gdcmDicomDirObject.h" #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" +#include "gdcmDicomDirVisit.h" #include "gdcmDicomDirImage.h" #include "gdcmDicomDirPatient.h" #include "gdcmDicomDirMeta.h" @@ -34,7 +36,7 @@ #include "gdcmFile.h" #include "gdcmSeqEntry.h" #include "gdcmSQItem.h" -#include "gdcmValEntry.h" +#include "gdcmDataEntry.h" #include #include @@ -60,17 +62,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,13 +92,16 @@ // RAW DATA // REGISTRATION // FIDUCIAL +// PRIVATE +// ENCAP DOC // // ---------------------- // The current gdcm version only deals with : // // (Root directory Entity) PATIENT // PATIENT STUDY -// STUDY SERIES +// STUDY SERIES +// STUDY VISIT // SERIES IMAGE // IMAGE / // @@ -114,9 +120,11 @@ DicomDir::DicomDir() :Document( ) { Initialize(); // sets all private fields to NULL + ParseDir = false; NewMeta(); } +#ifndef GDCM_LEGACY_REMOVE /** * \brief Constructor Parses recursively the directory and creates the DicomDir * or uses an already built DICOMDIR, depending on 'parseDir' value. @@ -128,81 +136,141 @@ DicomDir::DicomDir() * and wants to explore recursively the directories * - false if user passed an already built DICOMDIR file * and wants to use it + * @deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name) + * or : new DicomDir() + SetFileName(name) */ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): - Document( fileName ) + 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) - Initialize(); // sets all private fields to NULL + ParseDir = parseDir; + SetLoadMode (LD_ALL); // concerns only dicom files + SetFileName( fileName ); + Load( ); +} +#endif - // if user passed a root directory, sure we didn't get anything +/** + * \brief Canonical destructor + */ +DicomDir::~DicomDir() +{ + SetStartMethod(NULL,NULL,NULL); + SetProgressMethod(NULL,NULL,NULL); + SetEndMethod(NULL,NULL,NULL); - if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse + ClearPatient(); + if ( MetaElems ) { - if (!parseDir) - gdcmWarningMacro( "Entry HT empty for file: "<Document::Load( ) ) + return false; + } + return DoTheLoadingJob( ); +} + +#ifndef GDCM_LEGACY_REMOVE +/** + * \brief Loader. (DEPRECATED : kept not to break the API) + * @param fileName file to be open for parsing + * @return false if file cannot be open or no swap info was found, + * or no tag was found. + * @deprecated use SetFileName(n) + Load() instead + */ +bool DicomDir::Load(std::string const &fileName ) +{ + SetFileName(fileName); + return Load(); +} + +/// DEPRECATED : use SetDirectoryName(dname) instead +/** + * \brief Loader. (DEPRECATED : kept not to break the API) + * @param paseDir Parse Dir + * @deprecated use SetDirectoryName(dname) instead + */ +void DicomDir::SetParseDir(bool parseDir) +{ + ParseDir = parseDir; +} +#endif + +/** + * \brief Does the Loading Job (internal use only) + * @return false if file cannot be open or no swap info was found, + * or no tag was found. + */ +bool DicomDir::DoTheLoadingJob( ) +{ + Progress = 0.0f; + Abort = false; - gdcmWarningMacro( "Parse directory and create the DicomDir"); - ParseDirectory(); + if (!ParseDir) + { + // Only if user passed a DICOMDIR + // ------------------------------ + Fp = 0; + if (!Document::Load() ) + { + return false; } - else + + if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse { - // user may just call ParseDirectory() *after* constructor + gdcmWarningMacro( "Entry HT empty for file: "<< GetFileName()); + return false; } - } - // Only if user passed a DICOMDIR - // ------------------------------ - else - { // Directory record sequence DocEntry *e = GetDocEntry(0x0004, 0x1220); if ( !e ) { gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)" - << " in file " << fileName); + << " in file " << GetFileName()); + return false; } else CreateDicomDir(); } -} - -/** - * \brief Canonical destructor - */ -DicomDir::~DicomDir() -{ - SetStartMethod(NULL); - SetProgressMethod(NULL); - SetEndMethod(NULL); - - ClearPatient(); - if ( MetaElems ) + else { - delete MetaElems; + // Only if user passed a root directory + // ------------------------------------ + if ( GetFileName() == "." ) + { + // user passed '.' as Name + // we get current directory name + char dummy[1000]; + getcwd(dummy, (size_t)1000); + SetFileName( dummy ); // will be converted into a string + } + NewMeta(); + gdcmWarningMacro( "Parse directory and create the DicomDir : " + << GetFileName() ); + ParseDirectory(); } + return true; } -//----------------------------------------------------------------------------- -// Public /** * \brief This predicate, based on hopefully reasonable heuristics, * decides whether or not the current document was properly parsed @@ -213,17 +281,17 @@ DicomDir::~DicomDir() */ 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; @@ -237,18 +305,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); @@ -259,7 +327,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; @@ -326,6 +394,21 @@ void DicomDir::ParseDirectory() CreateDicomDir(); } +void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg ) +{ + SetStartMethod(method,arg,NULL); +} + +void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg ) +{ + SetProgressMethod(method,arg,NULL); +} + +void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg ) +{ + SetEndMethod(method,arg,NULL); +} + /** * \brief Set the start method to call when the parsing of the * directory starts. @@ -337,7 +420,7 @@ void DicomDir::ParseDirectory() void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, DicomDir::Method *argDelete ) { - if( StartArg && StartMethodArgDelete ) + if ( StartArg && StartMethodArgDelete ) { StartMethodArgDelete( StartArg ); } @@ -347,6 +430,7 @@ void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, StartMethodArgDelete = argDelete; } + /** * \brief Set the progress method to call when the parsing of the * directory progress @@ -358,7 +442,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 ); } @@ -378,7 +462,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 ); } @@ -429,7 +513,7 @@ void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) * @return false only when fail to open */ -bool DicomDir::WriteDicomDir(std::string const &fileName) +bool DicomDir::Write(std::string const &fileName) { int i; uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff }; @@ -437,7 +521,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; @@ -476,6 +560,45 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) return true; } +/** + * \brief Anonymize a DICOMDIR + * @return true + */ + +bool DicomDir::Anonymize() +{ + DataEntry *v; + // Something clever to be found to forge the Patient names + std::ostringstream s; + int i = 1; + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); + ++cc) + { + s << i; + v = (*cc)->GetDataEntry(0x0010, 0x0010) ; // Patient's Name + if (v) + { + v->SetString(s.str()); + } + + v = (*cc)->GetDataEntry(0x0010, 0x0020) ; // Patient ID + if (v) + { + v->SetString(" "); + } + + v = (*cc)->GetDataEntry(0x0010, 0x0030) ; // Patient's BirthDate + if (v) + { + v->SetString(" "); + } + s << ""; + i++; + } + return true; +} + //----------------------------------------------------------------------------- // Protected /** @@ -488,7 +611,7 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) DirList dirList(path,1); // gets recursively the file list unsigned int count = 0; VectDocument list; - File *header; + File *f; DirListType fileList = dirList.GetFilenames(); @@ -498,27 +621,32 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) { Progress = (float)(count+1)/(float)fileList.size(); CallProgressMethod(); - if( Abort ) + if ( Abort ) { break; } - header = new File( it->c_str() ); - if( !header ) - { - gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() ); - continue; - } + f = new File( ); + f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow + // groups, or ...... + f->SetFileName( it->c_str() ); + /*int res = */f->Load( ); + +// if ( !f ) +// { +// gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() ); +// continue; +// } - if( header->IsReadable() ) + if ( f->IsReadable() ) { // Add the file to the chained list: - list.push_back(header); + list.push_back(f); gdcmWarningMacro( "Readable " << it->c_str() ); } else { - delete header; + delete f; } count++; } @@ -545,7 +673,7 @@ void DicomDir::CallStartMethod() { Progress = 0.0f; Abort = false; - if( StartMethod ) + if ( StartMethod ) { StartMethod( StartArg ); } @@ -556,7 +684,7 @@ void DicomDir::CallStartMethod() */ void DicomDir::CallProgressMethod() { - if( ProgressMethod ) + if ( ProgressMethod ) { ProgressMethod( ProgressArg ); } @@ -568,7 +696,7 @@ void DicomDir::CallProgressMethod() void DicomDir::CallEndMethod() { Progress = 1.0f; - if( EndMethod ) + if ( EndMethod ) { EndMethod( EndArg ); } @@ -598,7 +726,7 @@ void DicomDir::Initialize() } /** - * \brief create a 'DicomDir' from a DICOMDIR Header + * \brief create a 'gdcm::DicomDir' from a DICOMDIR Header */ void DicomDir::CreateDicomDir() { @@ -635,64 +763,84 @@ void DicomDir::CreateDicomDir() while(tmpSI) { d = tmpSI->GetDocEntry(0x0004, 0x1430); // Directory Record Type - if ( ValEntry* valEntry = dynamic_cast(d) ) + if ( DataEntry *dataEntry = dynamic_cast(d) ) { - v = valEntry->GetValue(); + v = dataEntry->GetString(); } else { - gdcmWarningMacro( "Not a ValEntry."); + gdcmWarningMacro( "(0004,1430) not a DataEntry ?!?"); 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 == "VISIT " ) { - si = new DicomDirSerie(true); - if( !AddSerieToEnd( static_cast(si)) ) + si = new DicomDirVisit(true); + if ( !AddVisitToEnd( static_cast(si)) ) { delete si; si = NULL; - gdcmErrorMacro( "Add AddSerieToEnd failed"); + gdcmErrorMacro( "Add AddVisitToEnd failed"); } } - else if( v == "IMAGE " ) + else if ( v == "STUDY " ) { - si = new DicomDirImage(true); - if( !AddImageToEnd( static_cast(si)) ) + si = new DicomDirStudy(true); + if ( !AddStudyToEnd( static_cast(si)) ) { delete si; si = NULL; - gdcmErrorMacro( "Add AddImageToEnd failed"); + gdcmErrorMacro( "Add AddStudyToEnd failed"); + } + } + else if ( v == "PATIENT " ) + { + si = new DicomDirPatient(true); + if ( !AddPatientToEnd( static_cast(si)) ) + { + delete si; + si = NULL; + 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 ) - MoveSQItem(si,tmpSI); + if ( si ) + si->MoveObject(tmpSI); // New code : Copies the List tmpSI=s->GetNextSQItem(); } @@ -715,7 +863,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--; @@ -731,13 +879,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; @@ -746,22 +894,42 @@ bool DicomDir::AddSerieToEnd(DicomDirSerie *dd) return false; } +/** + * \brief AddVisitToEnd + * @param dd SQ Item to enqueue to the DicomDirVisit chained List + */ +bool DicomDir::AddVisitToEnd(DicomDirVisit *dd) +{ + if ( Patients.size() > 0 ) + { + ListDicomDirPatient::iterator itp = Patients.end(); + itp--; + + DicomDirStudy *study = (*itp)->GetLastStudy(); + if ( study ) + { + study->AddVisit(dd); + return true; + } + } + return false; +} /** * \brief AddImageToEnd * @param dd SQ Item to enqueue to the DicomDirImage chained List */ 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; @@ -796,29 +964,29 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list) ++it ) { // get the current file characteristics - patCurName = (*it)->GetEntryValue(0x0010,0x0010); - patCurID = (*it)->GetEntryValue(0x0010,0x0011); - studCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000d); - studCurID = (*it)->GetEntryValue(0x0020,0x0010); - serCurInstanceUID = (*it)->GetEntryValue(0x0020,0x000e); - serCurID = (*it)->GetEntryValue(0x0020,0x0011); - - if( patCurName != patPrevName || patCurID != patPrevID || first ) + patCurName = (*it)->GetEntryString(0x0010,0x0010); + patCurID = (*it)->GetEntryString(0x0010,0x0011); + studCurInstanceUID = (*it)->GetEntryString(0x0020,0x000d); + studCurID = (*it)->GetEntryString(0x0020,0x0010); + serCurInstanceUID = (*it)->GetEntryString(0x0020,0x000e); + serCurID = (*it)->GetEntryString(0x0020,0x0011); + + 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); @@ -852,7 +1020,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, ListDicomDirElem::const_iterator it; uint16_t tmpGr, tmpEl; DictEntry *dictEntry; - ValEntry *entry; + DataEntry *entry; std::string val; SQItem *si; @@ -861,7 +1029,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"); @@ -870,7 +1038,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"); @@ -879,7 +1047,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"); @@ -888,21 +1056,21 @@ 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"); } break; 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"); } - MetaElems = static_cast(si); + elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); + MetaElems = new DicomDirMeta(true); + si = MetaElems; break; default: return; @@ -924,31 +1092,31 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, tmpEl = it->Elem; dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); - entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! + entry = new DataEntry( dictEntry ); // Be sure it's never a DataEntry ! 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 - val = header->GetEntryValue(tmpGr, tmpEl); + val = header->GetEntryString(tmpGr, tmpEl); } else { 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(); @@ -969,7 +1137,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, val = it->Value; } - entry->SetValue( val ); // troubles expected when vr=SQ ... + entry->SetString( val ); // troubles expected when vr=SQ ... if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { @@ -986,7 +1154,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, * @param src source SQItem */ void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src) -{ +{ DocEntry *entry; entry = src->GetFirstEntry(); @@ -1016,7 +1184,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);