X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=a12b7fa7fed62d2c95a81c59573bb3c84afabafd;hb=83d626ec3d3111a6d14586246b6e2dda56f0ab86;hp=8be64395a19f80c26c9804367ad21425ab1a6aaf;hpb=278965e64eb49669b1a05493843f97144d8323b4;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 8be64395..a12b7fa7 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/08/29 12:29:50 $ - Version: $Revision: 1.155 $ + Date: $Date: 2006/01/27 10:01:33 $ + Version: $Revision: 1.185 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,7 +36,8 @@ #include "gdcmFile.h" #include "gdcmSeqEntry.h" #include "gdcmSQItem.h" -#include "gdcmValEntry.h" +#include "gdcmDataEntry.h" +#include "gdcmCommandManager.h" #include #include @@ -52,6 +53,11 @@ #else # include #endif + +#if defined(__BORLANDC__) + #include // for memset +#endif + // ---------------------------------------------------------------------------- // Note for future developpers // ---------------------------------------------------------------------------- @@ -117,56 +123,21 @@ namespace gdcm * \brief Constructor : creates an empty DicomDir */ 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. - * @param fileName name - * - of the root directory (parseDir = true) - * - of the DICOMDIR (parseDir = false) - * @param parseDir boolean - * - true if user passed an entry point - * 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( ) -{ - // At this step, Document constructor is already executed, - // 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) - - ParseDir = parseDir; - SetLoadMode (0x00000000); // concerns only dicom files - SetFileName( fileName ); - Load( ); -} -#endif - /** * \brief Canonical destructor */ DicomDir::~DicomDir() { - SetStartMethod(NULL,NULL,NULL); - SetProgressMethod(NULL,NULL,NULL); - SetEndMethod(NULL,NULL,NULL); - ClearPatient(); if ( MetaElems ) { - delete MetaElems; + MetaElems->Delete(); } } @@ -181,9 +152,6 @@ DicomDir::~DicomDir() */ bool DicomDir::Load( ) { - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL - if (!ParseDir) { if ( ! this->Document::Load( ) ) @@ -192,35 +160,6 @@ bool DicomDir::Load( ) 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 ) -{ - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL - - SetFileName( fileName ); - if (!ParseDir) - { - if ( ! this->Document::Load( ) ) - return false; - } - return DoTheLoadingJob( ); -} - -/// 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, @@ -228,18 +167,14 @@ void DicomDir::SetParseDir(bool parseDir) */ bool DicomDir::DoTheLoadingJob( ) { - // We should clean out anything that already exists. - Initialize(); // sets all private fields to NULL + Progress = 0.0f; + Abort = false; if (!ParseDir) { // Only if user passed a DICOMDIR // ------------------------------ Fp = 0; - if ( !OpenFile() ) - { - return false; - } if (!Document::Load() ) { return false; @@ -269,12 +204,19 @@ bool DicomDir::DoTheLoadingJob( ) { // 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 + char buf[2048]; + const char *cwd = getcwd(buf, 2048); + if( cwd ) + { + SetFileName( buf ); // will be converted into a string + } + else + { + gdcmErrorMacro( "Path was too long to fit on 2048 bytes" ); + } } NewMeta(); - gdcmWarningMacro( "Parse directory and create the DicomDir : " + gdcmDebugMacro( "Parse directory and create the DicomDir : " << GetFileName() ); ParseDirectory(); } @@ -293,7 +235,7 @@ bool DicomDir::IsReadable() { if ( Filetype == Unknown ) { - gdcmWarningMacro( "Wrong filetype"); + gdcmErrorMacro( "Wrong filetype for " << GetFileName()); return false; } if ( !MetaElems ) @@ -316,12 +258,12 @@ bool DicomDir::IsReadable() DicomDirMeta *DicomDir::NewMeta() { if ( MetaElems ) - delete MetaElems; + MetaElems->Delete(); DocEntry *entry = GetFirstEntry(); if ( entry ) { - MetaElems = new DicomDirMeta(true); // true = empty + MetaElems = DicomDirMeta::New(true); // true = empty entry = GetFirstEntry(); while( entry ) @@ -329,15 +271,15 @@ DicomDirMeta *DicomDir::NewMeta() if ( dynamic_cast(entry) ) break; - RemoveEntryNoDestroy(entry); MetaElems->AddEntry(entry); + RemoveEntry(entry); entry = GetFirstEntry(); } } else // after root directory parsing { - MetaElems = new DicomDirMeta(false); // false = not empty + MetaElems = DicomDirMeta::New(false); // false = not empty } MetaElems->SetSQItemNumber(0); // To avoid further missprinting return MetaElems; @@ -349,9 +291,9 @@ DicomDirMeta *DicomDir::NewMeta() */ DicomDirPatient *DicomDir::NewPatient() { - DicomDirPatient *p = new DicomDirPatient(); - AddPatientToEnd( p ); - return p; + DicomDirPatient *dd = DicomDirPatient::New(); + AddPatientToEnd( dd ); + return dd; } /** @@ -363,7 +305,7 @@ void DicomDir::ClearPatient() cc!= Patients.end(); ++cc) { - delete *cc; + (*cc)->Unregister(); } Patients.clear(); } @@ -404,117 +346,6 @@ 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. - * @param method Method to call - * @param arg Argument to pass to the method - * @param argDelete Argument - * \warning In python : the arg parameter isn't considered - */ -void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg, - DicomDir::Method *argDelete ) -{ - if ( StartArg && StartMethodArgDelete ) - { - StartMethodArgDelete( StartArg ); - } - - StartMethod = method; - StartArg = arg; - StartMethodArgDelete = argDelete; -} - - -/** - * \brief Set the progress method to call when the parsing of the - * directory progress - * @param method Method to call - * @param arg Argument to pass to the method - * @param argDelete Argument - * \warning In python : the arg parameter isn't considered - */ -void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg, - DicomDir::Method *argDelete ) -{ - if ( ProgressArg && ProgressMethodArgDelete ) - { - ProgressMethodArgDelete( ProgressArg ); - } - - ProgressMethod = method; - ProgressArg = arg; - ProgressMethodArgDelete = argDelete; -} - -/** - * \brief Set the end method to call when the parsing of the directory ends - * @param method Method to call - * @param arg Argument to pass to the method - * @param argDelete Argument - * \warning In python : the arg parameter isn't considered - */ -void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg, - DicomDir::Method *argDelete ) -{ - if ( EndArg && EndMethodArgDelete ) - { - EndMethodArgDelete( EndArg ); - } - - EndMethod = method; - EndArg = arg; - EndMethodArgDelete = 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 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 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::SetEndMethodArgDelete( DicomDir::Method *method ) -{ - EndMethodArgDelete = method; -} - /** * \brief writes on disc a DICOMDIR * \ warning does NOT add the missing elements in the header : @@ -523,11 +354,11 @@ 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 }; - uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0xffff, 0xffff }; + uint16_t sq[6] = { 0x0004, 0x1220, 0x5153, 0x0000, 0xffff, 0xffff }; + uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0x0000, 0x0000 }; std::ofstream *fp = new std::ofstream(fileName.c_str(), std::ios::out | std::ios::binary); @@ -546,7 +377,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) ptrMeta->WriteContent(fp, ExplicitVR); // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta - for(i=0;i<4;++i) + for(i=0;i<6;++i) { binary_write(*fp, sq[i]); } @@ -561,7 +392,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) // force writing Sequence Delimitation Item for(i=0;i<4;++i) { - binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff + binary_write(*fp, sqt[i]); // fffe e0dd 0000 0000 } fp->close(); @@ -575,9 +406,9 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) * @return true */ -bool DicomDir::AnonymizeDicomDir() +bool DicomDir::Anonymize() { - ValEntry *v; + DataEntry *v; // Something clever to be found to forge the Patient names std::ostringstream s; int i = 1; @@ -586,22 +417,22 @@ bool DicomDir::AnonymizeDicomDir() ++cc) { s << i; - v = (*cc)->GetValEntry(0x0010, 0x0010) ; // Patient's Name + v = (*cc)->GetDataEntry(0x0010, 0x0010) ; // Patient's Name if (v) { - v->SetValue(s.str()); + v->SetString(s.str()); } - v = (*cc)->GetValEntry(0x0010, 0x0020) ; // Patient ID + v = (*cc)->GetDataEntry(0x0010, 0x0020) ; // Patient ID if (v) { - v->SetValue(" "); + v->SetString(" "); } - v = (*cc)->GetValEntry(0x0010, 0x0030) ; // Patient's BirthDate + v = (*cc)->GetDataEntry(0x0010, 0x0030) ; // Patient's BirthDate if (v) { - v->SetValue(" "); + v->SetString(" "); } s << ""; i++; @@ -609,6 +440,33 @@ bool DicomDir::AnonymizeDicomDir() return true; } +/** + * \brief Copies all the attributes from an other DocEntrySet + * @param set entry to copy from + * @remarks The contained DocEntries are not copied, only referenced + */ +void DicomDir::Copy(DocEntrySet *set) +{ + // Remove all previous childs + ClearPatient(); + + Document::Copy(set); + + DicomDir *dd = dynamic_cast(set); + if( dd ) + { + if(MetaElems) + MetaElems->Unregister(); + MetaElems = dd->MetaElems; + if(MetaElems) + MetaElems->Register(); + + Patients = dd->Patients; + for(ItPatient = Patients.begin();ItPatient != Patients.end();++ItPatient) + (*ItPatient)->Register(); + } +} + //----------------------------------------------------------------------------- // Protected /** @@ -624,39 +482,33 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) File *f; DirListType fileList = dirList.GetFilenames(); - + unsigned int nbFile = fileList.size(); for( DirListType::iterator it = fileList.begin(); it != fileList.end(); ++it ) { - Progress = (float)(count+1)/(float)fileList.size(); + Progress = (float)(count+1)/(float)nbFile; CallProgressMethod(); if ( Abort ) { break; } - f = new File( ); - f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow - // groups, or ...... + f = File::New( ); + f->SetLoadMode(LoadMode); // we allow user not to load Sequences, + // or Shadow groups, or ...... f->SetFileName( it->c_str() ); - /*int res = */f->Load( ); + f->Load( ); -// if ( !f ) -// { -// gdcmWarningMacro( "Failure in new gdcm::File " << it->c_str() ); -// continue; -// } - if ( f->IsReadable() ) { // Add the file to the chained list: list.push_back(f); - gdcmWarningMacro( "Readable " << it->c_str() ); + gdcmDebugMacro( "Readable " << it->c_str() ); } else { - delete f; + f->Delete(); } count++; } @@ -672,45 +524,10 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) itDoc!=list.end(); ++itDoc) { - delete dynamic_cast(*itDoc); + dynamic_cast(*itDoc)->Delete(); } } -/** - * \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 @@ -719,16 +536,6 @@ void DicomDir::CallEndMethod() */ void DicomDir::Initialize() { - StartMethod = NULL; - ProgressMethod = NULL; - EndMethod = NULL; - StartMethodArgDelete = NULL; - ProgressMethodArgDelete = NULL; - EndMethodArgDelete = NULL; - StartArg = NULL; - ProgressArg = NULL; - EndArg = NULL; - Progress = 0.0; Abort = false; @@ -747,6 +554,7 @@ void DicomDir::CreateDicomDir() // 3 - we find an other tag // + we create the object for the precedent tag // + loop to 1 - + gdcmDebugMacro("Create DicomDir"); // Directory record sequence DocEntry *e = GetDocEntry(0x0004, 0x1220); @@ -773,66 +581,66 @@ 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( "(0004,1430) not a ValEntry ?!?"); + gdcmWarningMacro( "(0004,1430) not a DataEntry ?!?"); continue; } // 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 + // This is the right order to perform the tests if ( v == "IMAGE " ) { - si = new DicomDirImage(true); + si = DicomDirImage::New(true); if ( !AddImageToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddImageToEnd failed"); } } else if ( v == "SERIES" ) { - si = new DicomDirSerie(true); + si = DicomDirSerie::New(true); if ( !AddSerieToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddSerieToEnd failed"); } } else if ( v == "VISIT " ) { - si = new DicomDirVisit(true); + si = DicomDirVisit::New(true); if ( !AddVisitToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddVisitToEnd failed"); } } else if ( v == "STUDY " ) { - si = new DicomDirStudy(true); + si = DicomDirStudy::New(true); if ( !AddStudyToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add AddStudyToEnd failed"); } } else if ( v == "PATIENT " ) { - si = new DicomDirPatient(true); + si = DicomDirPatient::New(true); if ( !AddPatientToEnd( static_cast(si)) ) { - delete si; + si->Delete(); si = NULL; gdcmErrorMacro( "Add PatientToEnd failed"); } @@ -841,7 +649,7 @@ void DicomDir::CreateDicomDir() { // It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE', // nor an 'IMAGE' SQItem. Skip to next item. - gdcmWarningMacro( " -------------------------------------------" + gdcmDebugMacro( " -------------------------------------------" << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : " << v); @@ -850,9 +658,7 @@ void DicomDir::CreateDicomDir() continue; } if ( si ) - //MoveSQItem(si,tmpSI); // Old code : Copies each Entry - // -and then removes the source- - si->MoveObject(tmpSI); // New code : Copies the List + si->Copy(tmpSI); tmpSI=s->GetNextSQItem(); } @@ -976,12 +782,12 @@ 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); + 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 ) { @@ -1032,7 +838,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; @@ -1040,53 +846,56 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { case GDCM_DICOMDIR_IMAGE: elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); - si = new DicomDirImage(true); + si = DicomDirImage::New(true); if ( !AddImageToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add ImageToEnd failed"); } break; case GDCM_DICOMDIR_SERIE: elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); - si = new DicomDirSerie(true); + si = DicomDirSerie::New(true); if ( !AddSerieToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add SerieToEnd failed"); } break; case GDCM_DICOMDIR_STUDY: elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); - si = new DicomDirStudy(true); + si = DicomDirStudy::New(true); if ( !AddStudyToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add StudyToEnd failed"); } break; case GDCM_DICOMDIR_PATIENT: elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); - si = new DicomDirPatient(true); + si = DicomDirPatient::New(true); if ( !AddPatientToEnd(static_cast(si)) ) { - delete si; + si->Delete(); gdcmErrorMacro( "Add PatientToEnd failed"); } break; case GDCM_DICOMDIR_META: - elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); - si = new DicomDirMeta(true); if ( MetaElems ) { - delete MetaElems; + MetaElems->Delete(); gdcmErrorMacro( "MetaElements already exist, they will be destroyed"); } - MetaElems = static_cast(si); + elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); + MetaElems = DicomDirMeta::New(true); + si = MetaElems; break; default: return; } + + // FIXME : troubles found when it's a SeqEntry + // removed all the seems-to-be-useless stuff about Referenced Image Sequence // to avoid further troubles // imageElem 0008 1140 "" // Referenced Image Sequence @@ -1095,8 +904,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, // 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 - + std::string referencedVal; // for all the relevant elements found in their own spot of the DicomDir.dic for( it = elemList.begin(); it != elemList.end(); ++it) { @@ -1104,15 +912,15 @@ 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 = DataEntry::New( dictEntry ); 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); + + val = header->GetEntryString(tmpGr, tmpEl); } else { @@ -1120,42 +928,98 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, } 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 ( tmpGr == 0x0004 ) // never present in File ! { - if ( header->GetFileName().substr(0, path.length()) != path ) + switch (tmpEl) { - gdcmWarningMacro( "The base path of file name is incorrect"); - val = header->GetFileName(); - } - else - { - val = &(header->GetFileName().c_str()[path.length()]); - } + case 0x1130: // File-set ID + // force to the *end* File Name + val = Util::GetName( path ); + break; + + case 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 + { + // avoid the first '/' in File name ! + if ( header->GetFileName().c_str()[path.length()] + == GDCM_FILESEPARATOR ) + val = &(header->GetFileName().c_str()[path.length()+1]); + else + val = &(header->GetFileName().c_str()[path.length()]); + } + break; + + case 0x1510: // Referenced SOP Class UID in File + referencedVal = header->GetEntryString(0x0008, 0x0016); + // FIXME : probabely something to check + val = referencedVal; + break; + + case 0x1511: // Referenced SOP Instance UID in File + referencedVal = header->GetEntryString(0x0008, 0x0018); + // FIXME : probabely something to check + val = referencedVal; + break; + + case 0x1512: // Referenced Transfer Syntax UID in File + referencedVal = header->GetEntryString(0x0002, 0x0010); + // FIXME : probabely something to check + val = referencedVal; + break; + + default : + val = it->Value; + } } else { - val = it->Value; - } + // If the entry is not found in the Header, don't write its 'value' in the DICOMDIR ! + entry->Delete(); + continue; + } } else { if ( header->GetEntryLength(tmpGr,tmpEl) == 0 ) + { val = it->Value; + // Don't polute the DICOMDIR with empty fields + if (val == "") + { + entry->Delete(); + continue; + } + } } - entry->SetValue( val ); // troubles expected when vr=SQ ... +/* FIX later the pb of creating the 'Implementation Version Name'! + + if (val == GDCM_UNFOUND) + val = ""; + + if ( tmpGr == 0x0002 && tmpEl == 0x0013) + { + // 'Implementation Version Name' + std::string val = "GDCM "; + val += Util::GetVersion(); + } +*/ + + entry->SetString( val ); // troubles expected when vr=SQ ... if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { - gdcmWarningMacro("GDCM_DICOMDIR_META ?!? should never print that"); + gdcmDebugMacro("GDCM_DICOMDIR_META ?!? should never print that"); } + si->AddEntry(entry); + entry->Delete(); } } @@ -1165,15 +1029,16 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, * @param dst destination SQItem * @param src source SQItem */ -void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src) +void DicomDir::MoveSQItem(DocEntrySet *dst, DocEntrySet *src) { DocEntry *entry; - +// todo : rewrite the whole stuff, without using RemoveEntry an AddEntry, +// to save time entry = src->GetFirstEntry(); while(entry) { - src->RemoveEntryNoDestroy(entry); - dst->AddEntry(entry); + dst->AddEntry(entry); // use it, *before* removing it! + src->RemoveEntry(entry); // we destroyed -> the current iterator is not longer valid entry = src->GetFirstEntry(); }