X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=b7f4cb00d04bfa18f3376856c1c2f893daaad918;hb=559c3639fc5b255b36a951f352db1addead9f78f;hp=e0dd8a54767a3e15029252b9eec362cfb0515c14;hpb=4b4569ba7d0829cf3782ff6b5bbe5ae1009466e6;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index e0dd8a54..b7f4cb00 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2004/08/01 02:39:09 $ - Version: $Revision: 1.62 $ + Date: $Date: 2004/11/03 20:52:13 $ + Version: $Revision: 1.77 $ 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. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -16,16 +16,6 @@ =========================================================================*/ -#include -#include -#include - -#ifdef _MSC_VER - #include -#else - #include -#endif - #include "gdcmDicomDir.h" #include "gdcmDicomDirStudy.h" #include "gdcmDicomDirSerie.h" @@ -39,6 +29,19 @@ #include "gdcmSQItem.h" #include "gdcmValEntry.h" +#include +#include +#include +#include + +#ifdef _MSC_VER + #include +#else + #include +#endif +namespace gdcm +{ + //----------------------------------------------------------------------------- // For full DICOMDIR description, see: // PS 3.3-2003, pages 731-750 @@ -46,24 +49,21 @@ // Constructor / Destructor /** - * \ingroup gdcmDicomDir - * \brief Constructor : creates an empty gdcmDicomDir - * @param exception_on_error whether we want to throw an exception or not + * \ingroup DicomDir + * \brief Constructor : creates an empty DicomDir */ -gdcmDicomDir::gdcmDicomDir(bool exception_on_error): - gdcmDocument( exception_on_error ) +DicomDir::DicomDir() + :Document( ) { - Initialize(); - - std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ... - SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements - AddDicomDirMeta(); + Initialize(); // sets all private fields to NULL + std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ... + MetaElems = NewMeta(); } /** * \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 @@ -71,38 +71,35 @@ gdcmDicomDir::gdcmDicomDir(bool exception_on_error): * and wants to explore recursively the directories * - false if user passed an already built DICOMDIR file * and wants to use it - * @param exception_on_error whether we want to throw an exception or not */ -gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir, - bool exception_on_error): - gdcmDocument( fileName, exception_on_error) +DicomDir::DicomDir(std::string const & fileName, bool parseDir ): + Document( fileName ) { - // que l'on ai passe un root directory ou un DICOMDIR - // et quelle que soit la valeur de parseDir, - // on a deja lance gdcmDocument - Initialize(); + // Whatever user passed (a root directory or a DICOMDIR) + // and whatever the value of parseDir was, + // Document is already executed + Initialize(); // sets all private fields to NULL - // gdcmDocument already executed // if user passed a root directory, sure we didn't get anything - if ( TagHT.begin() == TagHT.end() ) + if ( TagHT.begin() == TagHT.end() ) // when user passed a Directory to parse { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry HT empty"); + dbg.Verbose(0, "DicomDir::DicomDir : entry HT empty"); if ( fileName.size() == 1 && fileName[0] == '.' ) { // user passed '.' as Name // we get current directory name - char* dummy = new char[1000]; + char dummy[1000]; getcwd(dummy, (size_t)1000); - std::cout << "Directory to parse : [" << dummy << "]" << std::endl; SetFileName( dummy ); // will be converted into a string - delete[] dummy; // no longer needed } - if ( parseDir ) + if ( parseDir ) // user asked for a recursive parsing of a root directory { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory" + MetaElems = NewMeta(); + + dbg.Verbose(0, "DicomDir::DicomDir : Parse directory" " and create the DicomDir"); ParseDirectory(); } @@ -113,13 +110,13 @@ gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir, // apres le constructeur } } - else + else // Only if user passed a DICOMDIR { // Directory record sequence - gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); if ( !e ) { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record" + dbg.Verbose(0, "DicomDir::DicomDir : NO Directory record" " sequence (0x0004,0x1220)"); /// \todo FIXME : what do we do when the parsed file IS NOT a /// DICOMDIR file ? @@ -131,23 +128,21 @@ gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir, /** * \brief Canonical destructor */ -gdcmDicomDir::~gdcmDicomDir() +DicomDir::~DicomDir() { SetStartMethod(NULL); SetProgressMethod(NULL); SetEndMethod(NULL); - - if ( metaElems ) - { - delete metaElems; - } - - for(ListDicomDirPatient::iterator cc = patients.begin(); - cc!= patients.end(); + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); ++cc) { delete *cc; } + if ( MetaElems ) + { + delete MetaElems; + } } //----------------------------------------------------------------------------- @@ -155,15 +150,15 @@ gdcmDicomDir::~gdcmDicomDir() /** * \brief Canonical Printer */ -void gdcmDicomDir::Print(std::ostream &os) +void DicomDir::Print(std::ostream &os) { - if(metaElems) + if( MetaElems ) { - metaElems->SetPrintLevel(PrintLevel); - metaElems->Print(os); + MetaElems->SetPrintLevel(PrintLevel); + MetaElems->Print(os); } - for(ListDicomDirPatient::iterator cc = patients.begin(); - cc != patients.end(); + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); ++cc) { (*cc)->SetPrintLevel( PrintLevel ); @@ -178,20 +173,20 @@ void gdcmDicomDir::Print(std::ostream &os) * decides whether or not the current header was properly parsed * and contains the mandatory information for being considered as * a well formed and usable DicomDir. - * @return true when gdcmDocument is the one of a reasonable DicomDir, + * @return true when Document is the one of a reasonable DicomDir, * false otherwise. */ -bool gdcmDicomDir::IsReadable() +bool DicomDir::IsReadable() { - if( !gdcmDocument::IsReadable() ) + if( !Document::IsReadable() ) { return false; } - if( !metaElems ) + if( !MetaElems ) { return false; } - if( patients.size() <= 0 ) + if( Patients.size() <= 0 ) { return false; } @@ -203,136 +198,136 @@ bool gdcmDicomDir::IsReadable() * \brief Sets all fields to NULL */ -void gdcmDicomDir::Initialize() +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; - - metaElems = 0; + StartMethod = NULL; + ProgressMethod = NULL; + EndMethod = NULL; + StartMethodArgDelete = NULL; + ProgressMethodArgDelete = NULL; + EndMethodArgDelete = NULL; + StartArg = NULL; + ProgressArg = NULL; + EndArg = NULL; + + Progress = 0.0; + Abort = false; + + MetaElems = 0; } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief fills the whole structure, starting from a root Directory */ -void gdcmDicomDir::ParseDirectory() +void DicomDir::ParseDirectory() { CreateDicomDirChainedList( GetFileName() ); CreateDicomDir(); } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \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 gdcmDicomDir::SetStartMethod(gdcmMethod *method, void *arg, - gdcmMethod *argDelete ) +void DicomDir::SetStartMethod(Method* method, void* arg, + Method* argDelete ) { - if( startArg && startMethodArgDelete ) + if( StartArg && StartMethodArgDelete ) { - startMethodArgDelete( startArg ); + StartMethodArgDelete( StartArg ); } - startMethod = method; - startArg = arg; - startMethodArgDelete = argDelete; + StartMethod = method; + StartArg = arg; + StartMethodArgDelete = argDelete; } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \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 gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod *method) +void DicomDir::SetStartMethodArgDelete(Method* method) { - startMethodArgDelete = method; + StartMethodArgDelete = method; } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \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 gdcmDicomDir::SetProgressMethod(gdcmMethod *method, void *arg, - gdcmMethod *argDelete ) +void DicomDir::SetProgressMethod(Method* method, void* arg, + Method* argDelete ) { - if( progressArg && progressMethodArgDelete ) + if( ProgressArg && ProgressMethodArgDelete ) { - progressMethodArgDelete( progressArg ); + ProgressMethodArgDelete( ProgressArg ); } - progressMethod = method; - progressArg = arg; - progressMethodArgDelete = argDelete; + ProgressMethod = method; + ProgressArg = arg; + ProgressMethodArgDelete = argDelete; } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \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 gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod *method) +void DicomDir::SetProgressMethodArgDelete(Method* method) { - progressMethodArgDelete = method; + ProgressMethodArgDelete = method; } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \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 gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg, - gdcmMethod *argDelete ) +void DicomDir::SetEndMethod(Method* method, void* arg, + Method* argDelete ) { - if( endArg && endMethodArgDelete ) + if( EndArg && EndMethodArgDelete ) { - endMethodArgDelete( endArg ); + EndMethodArgDelete( EndArg ); } - endMethod = method; - endArg = arg; - endMethodArgDelete = argDelete; + EndMethod = method; + EndArg = arg; + EndMethodArgDelete = argDelete; } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \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 gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method) +void DicomDir::SetEndMethodArgDelete(Method* method) { - endMethodArgDelete = method; + EndMethodArgDelete = method; } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief writes on disc a DICOMDIR * \ warning does NOT add the missing elements in the header : * it's up to the user doing it ! @@ -343,127 +338,98 @@ void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method) * @return false only when fail to open */ -bool gdcmDicomDir::Write(std::string const & fileName) -{ - FILE * fp1 = fopen(fileName.c_str(), "wb"); - if( !fp1 ) +bool DicomDir::WriteDicomDir(std::string const& fileName) +{ + int i; + uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff }; + uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0xffff, 0xffff }; + + std::ofstream* fp = new std::ofstream(fileName.c_str(), + std::ios::out | std::ios::binary); + if( !fp ) { - printf("Failed to open(write) File [%s] \n", fileName.c_str()); + dbg.Verbose(2, "Failed to open(write) File: ", fileName.c_str()); return false; } - char * filePreamble = new char[128]; - fwrite(filePreamble,128,1,fp1); - fwrite("DICM",4,1,fp1); - delete[] filePreamble; - UpdateDirectoryRecordSequenceLength(); - WriteEntries(fp1); + char filePreamble[128]; + memset(filePreamble, 0, 128); + fp->write(filePreamble, 128); //FIXME + binary_write( *fp, "DICM"); + + DicomDirMeta *ptrMeta = GetDicomDirMeta(); + ptrMeta->Write(fp, ExplicitVR); + + // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta + for(i=0;i<4;++i) + { + binary_write(*fp, sq[i]); + } + + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); + ++cc ) + { + (*cc)->Write( fp, ExplicitVR ); + } + + // force writing Sequence Delimitation Item + for(i=0;i<4;++i) + { + binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff + } - fclose( fp1 ); + fp->close(); return true; } -/** - * \brief Writes in a file using the tree-like structure. - * @param _fp already open file pointer - */ - -void gdcmDicomDir::WriteEntries(FILE *) //_fp -{ - /// \todo (?) tester les echecs en ecriture - /// (apres chaque fwrite, dans le WriteEntry) - - -/* TODO : to go on compiling - - gdcmDicomDirMeta *ptrMeta; - ListDicomDirPatient::iterator itPatient; - ListDicomDirStudy::iterator itStudy; - ListDicomDirSerie::iterator itSerie; - ListDicomDirImage::iterator itImage; - ListTag::iterator i; - - ptrMeta= GetDicomDirMeta(); - for(i=ptrMeta->debut();i!=ptrMeta->fin();++i) { - WriteEntry(*i,_fp, gdcmExplicitVR); - } - - itPatient = GetDicomDirPatients().begin(); - while ( itPatient != GetDicomDirPatients().end() ) { - for(i=(*itPatient)->debut();i!=(*itPatient)->fin();++i) { - WriteEntry(*i,_fp, gdcmExplicitVR); - } - itStudy = ((*itPatient)->GetDicomDirStudies()).begin(); - while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) { - for(i=(*itStudy)->debut();i!=(*itStudy)->fin();++i) { - WriteEntry(*i,_fp, gdcmExplicitVR); - } - itSerie = ((*itStudy)->GetDicomDirSeries()).begin(); - while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) { - for(i=(*itSerie)->debut();i!=(*itSerie)->fin();++i) { - WriteEntry(*i,_fp, gdcmExplicitVR); - } - itImage = ((*itSerie)->GetDicomDirImages()).begin(); - while (itImage != (*itSerie)->GetDicomDirImages().end() ) { - for(i=(*itImage)->debut();i!=(*itImage)->fin();++i) { - WriteEntry(*i,_fp, gdcmExplicitVR); - } - ++itImage; - } - ++itSerie; - } - ++itStudy; - } - ++itPatient; - } - */ -} - //----------------------------------------------------------------------------- // Protected /** - * \ingroup gdcmDicomDir - * \brief create a gdcmDocument-like chained list from a root Directory + * \ingroup DicomDir + * \brief create a Document-like chained list from a root Directory * @param path entry point of the tree-like structure */ -void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) +void DicomDir::CreateDicomDirChainedList(std::string const & path) { CallStartMethod(); - gdcmDirList fileList(path,1); // gets recursively the file list + DirList fileList(path,1); // gets recursively the file list unsigned int count = 0; VectDocument list; - gdcmHeader *header; + Header *header; TagHT.clear(); - patients.clear(); + Patients.clear(); - for( gdcmDirList::iterator it = fileList.begin(); + for( DirList::iterator it = fileList.begin(); it != fileList.end(); ++it ) { - progress = (float)(count+1)/(float)fileList.size(); + Progress = (float)(count+1)/(float)fileList.size(); CallProgressMethod(); - if( abort ) + if( Abort ) { break; } - header = new gdcmHeader( it->c_str(),false ); + header = new Header( it->c_str() ); if( !header ) { dbg.Verbose( 1, - "gdcmDicomDir::CreateDicomDirChainedList: " + "DicomDir::CreateDicomDirChainedList: " "failure in new Header ", it->c_str() ); } + if( header->IsReadable() ) { // Add the file header to the chained list: list.push_back(header); dbg.Verbose( 1, - "gdcmDicomDir::CreateDicomDirChainedList: readable ", + "DicomDir::CreateDicomDirChainedList: readable ", it->c_str() ); + } else { @@ -471,68 +437,70 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) } count++; } - // sorts Patient/Study/Serie/ - std::sort(list.begin(), list.end(), gdcmDicomDir::HeaderLessThan ); - - std::string tmp = fileList.GetDirName(); - + std::sort(list.begin(), list.end(), DicomDir::HeaderLessThan ); + + std::string tmp = fileList.GetDirName(); //for each Header of the chained list, add/update the Patient/Study/Serie/Image info SetElements(tmp, list); - CallEndMethod(); } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief adds *the* Meta to a partially created DICOMDIR */ - - /// \todo FIXME : Heuuuuu ! Il prend les Entries du Document deja parse, - /// il ne fabrique rien ! -gdcmDicomDirMeta * gdcmDicomDir::NewMeta() +DicomDirMeta * DicomDir::NewMeta() { - gdcmDicomDirMeta *m = new gdcmDicomDirMeta( &TagHT ); - for ( TagDocEntryHT::iterator cc = TagHT.begin(); - cc != TagHT.end(); ++cc) + DicomDirMeta *m = new DicomDirMeta( &TagHT ); + + if ( TagHT.begin() != TagHT.end() ) // after Document Parsing + { + TagDocEntryHT::iterator lastOneButSequence = TagHT.end(); + lastOneButSequence --; + // ALL the 'out of Sequence' Tags belong to Meta Elems + // (we skip 0004|1220 [Directory record sequence] ) + for ( TagDocEntryHT::iterator cc = TagHT.begin(); + cc != lastOneButSequence; + ++cc) + { + m->AddDocEntry( cc->second ); + } + } + else // after root directory parsing { - m->AddDocEntry( cc->second ); + ListDicomDirMetaElem const & elemList = + Global::GetDicomDirElements()->GetDicomDirMetaElements(); + m->FillObject(elemList); } + m->SetSQItemNumber(0); // To avoid further missprinting return m; } - /** * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR */ -gdcmDicomDirPatient * gdcmDicomDir::NewPatient() +DicomDirPatient * DicomDir::NewPatient() { - std::list::iterator it; + ListDicomDirPatientElem::const_iterator it; uint16_t tmpGr,tmpEl; - gdcmDictEntry *dictEntry; - gdcmValEntry *entry; - - std::list elemList; - elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); -// Looks nice, but gdcmDicomDir IS NOT a gdcmObject ... -// gdcmDicomDirPatient *p = new gdcmDicomDirPatient(ptagHT); -// FillObject(elemList); -// patients.push_front( p ); -// return p; -/// \todo TODO : find a trick to use FillObject !!! + DictEntry *dictEntry; + ValEntry *entry; - gdcmSQItem *s = new gdcmSQItem(0); + ListDicomDirPatientElem const & elemList = + Global::GetDicomDirElements()->GetDicomDirPatientElements(); + SQItem *s = new SQItem(0); // for all the DicomDirPatient Elements for( it = elemList.begin(); it != elemList.end(); ++it ) { - tmpGr = it->group; - tmpEl = it->elem; + tmpGr = it->Group; + tmpEl = it->Elem; dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl); - entry = new gdcmValEntry( dictEntry ); + entry = new ValEntry( dictEntry ); entry->SetOffset(0); // just to avoid further missprinting - entry->SetValue( it->value ); + entry->SetValue( it->Value ); // dealing with value length ... @@ -559,68 +527,80 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient() s->AddDocEntry( entry ); } - gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &TagHT); - patients.push_front( p ); + DicomDirPatient *p = new DicomDirPatient(s, &TagHT); + Patients.push_front( p ); return p; } /** * \brief adds to the HTable - * the gdcmEntries (Dicom Elements) corresponding to the given type + * the Entries (Dicom Elements) corresponding to the given type * @param path full path file name (only used when type = GDCM_DICOMDIR_IMAGE - * @param type gdcmObject type to create (GDCM_DICOMDIR_PATIENT, + * @param type DicomDirObject type to create (GDCM_DICOMDIR_PATIENT, * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) - * @param header gdcmHeader of the current file + * @param header Header of the current file */ -void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, - gdcmDocument *header) +void DicomDir::SetElement(std::string const & path, DicomDirType type, + Document *header) { - std::list elemList; - std::list::iterator it; + ListDicomDirElem elemList; //FIXME this is going to be a by copy operation + ListDicomDirElem::const_iterator it; uint16_t tmpGr, tmpEl; - gdcmDictEntry *dictEntry; - gdcmValEntry *entry; + DictEntry *dictEntry; + ValEntry *entry; std::string val; - //gdcmObject *o; + SQItem *si = new SQItem(0); // all the items will be at level 1 switch( type ) { case GDCM_DICOMDIR_IMAGE: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirImageElements(); break; case GDCM_DICOMDIR_SERIE: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirSerieElements(); break; case GDCM_DICOMDIR_STUDY: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirStudyElements(); break; case GDCM_DICOMDIR_PATIENT: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirPatientElements(); break; case GDCM_DICOMDIR_META: - elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements(); + elemList = Global::GetDicomDirElements()->GetDicomDirMetaElements(); 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; + tmpGr = it->Group; + tmpEl = it->Elem; dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl); - entry = new gdcmValEntry( dictEntry ); // Be sure it's never a BinEntry ! + + entry = new ValEntry( dictEntry ); // Be sure it's never a BinEntry ! entry->SetOffset(0); // just to avoid further missprinting + entry->SetLength(0); // just to avoid further missprinting - if( header ) // NULL when we Build Up (ex nihilo) a DICOMDIR - // or when we add the META elems + if( header ) { + // NULL when we Build Up (ex nihilo) a DICOMDIR + // or when we add the META elems val = header->GetEntryByNumber(tmpGr, tmpEl); } else @@ -633,35 +613,35 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, if( tmpGr == 0x0004 && tmpEl == 0x1130 ) // File-set ID { // force to the *end* File Name - val = GetName( path ); + val = Util::GetName( path ); } else if( tmpGr == 0x0004 && tmpEl == 0x1500 ) // Only used for image { if( header->GetFileName().substr(0, path.length()) != path ) { - dbg.Verbose(0, "gdcmDicomDir::SetElement : the base path" + dbg.Verbose(0, "DicomDir::SetElement : the base path" " of file name is incorrect"); val = header->GetFileName(); } else { val = &(header->GetFileName().c_str()[path.length()]); - } + } } else { - val = it->value; + val = it->Value; } } else { if ( header->GetEntryLengthByNumber(tmpGr,tmpEl) == 0 ) - { - val = it->value; - } + val = it->Value; } - entry->SetValue( val ); + // GDCM_UNFOUND or not ! + + entry->SetValue( val ); // troubles expected when vr=SQ ... if( dictEntry ) { @@ -686,60 +666,88 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, entry->SetLength( entry->GetValue().length() ); } } - std::cout << " was TagHT[entry->GetKey()] = entry " << std::endl; - if ( type == GDCM_DICOMDIR_META ) { - std::cout << " special Treatment for GDCM_DICOMDIR_META" << std::endl; - + + if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! + { + std::cout << "GDCM_DICOMDIR_META ?!? should never print that" + << std::endl; } - //TagHT[entry->GetKey()] = entry; // FIXME : use a SEQUENCE ! + si->AddEntry(entry); + } + switch( type ) + { + case GDCM_DICOMDIR_IMAGE: + AddDicomDirImageToEnd(si); + break; + + case GDCM_DICOMDIR_SERIE: + AddDicomDirSerieToEnd(si); + break; + + case GDCM_DICOMDIR_STUDY: + AddDicomDirStudyToEnd(si); + break; + + case GDCM_DICOMDIR_PATIENT: + AddDicomDirPatientToEnd(si); + break; + + default: + return; } + //int count=1; // find a trick to increment + //s->AddEntry(si, count); // Seg Faults + } +//----------------------------------------------------------------------------- /** * \brief CallStartMethod */ -void gdcmDicomDir::CallStartMethod() +void DicomDir::CallStartMethod() { - progress = 0.0f; - abort = false; - if( startMethod ) + Progress = 0.0f; + Abort = false; + if( StartMethod ) { - startMethod( startArg ); + StartMethod( StartArg ); } } +//----------------------------------------------------------------------------- /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief CallProgressMethod */ -void gdcmDicomDir::CallProgressMethod() +void DicomDir::CallProgressMethod() { - if( progressMethod ) + if( ProgressMethod ) { - progressMethod( progressArg ); + ProgressMethod( ProgressArg ); } } +//----------------------------------------------------------------------------- /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief CallEndMethod */ -void gdcmDicomDir::CallEndMethod() +void DicomDir::CallEndMethod() { - progress = 1.0f; - if( endMethod ) + Progress = 1.0f; + if( EndMethod ) { - endMethod( endArg ); + EndMethod( EndArg ); } } //----------------------------------------------------------------------------- // Private /** - * \ingroup gdcmDicomDir - * \brief create a 'gdcmDicomDir' from a DICOMDIR gdcmHeader + * \ingroup DicomDir + * \brief create a 'DicomDir' from a DICOMDIR Header */ -void gdcmDicomDir::CreateDicomDir() +void DicomDir::CreateDicomDir() { // The list is parsed. // When a DicomDir tag ("PATIENT", "STUDY", "SERIE", "IMAGE") is found : @@ -750,67 +758,63 @@ void gdcmDicomDir::CreateDicomDir() // + loop to 1 - // Directory record sequence - gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); + DocEntry *e = GetDocEntryByNumber(0x0004, 0x1220); if ( !e ) { - dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : NO Directory record" + dbg.Verbose(0, "DicomDir::DicomDir : NO Directory record" " sequence (0x0004,0x1220)"); /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? return; } - gdcmSeqEntry* s = dynamic_cast(e); + SeqEntry* s = dynamic_cast(e); if ( !s ) { - dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: no SeqEntry present"); + dbg.Verbose(0, "DicomDir::CreateDicomDir: no SeqEntry present"); // useless : (0x0004,0x1220) IS a Sequence ! return; } - gdcmDicomDirType type = gdcmDicomDir::GDCM_DICOMDIR_META; - metaElems = NewMeta(); + DicomDirType type = DicomDir::GDCM_DICOMDIR_META; + MetaElems = NewMeta(); ListSQItem listItems = s->GetSQItems(); - gdcmDocEntry * d; + DocEntry * d; std::string v; for( ListSQItem::iterator i = listItems.begin(); i !=listItems.end(); ++i ) { d = (*i)->GetDocEntryByNumber(0x0004, 0x1430); // Directory Record Type - if ( gdcmValEntry* ValEntry = dynamic_cast< gdcmValEntry* >(d) ) + if ( ValEntry* valEntry = dynamic_cast< ValEntry* >(d) ) { - v = ValEntry->GetValue(); + v = valEntry->GetValue(); } else { - dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: not a ValEntry."); + dbg.Verbose(0, "DicomDir::CreateDicomDir: not a ValEntry."); continue; } if( v == "PATIENT " ) { AddDicomDirPatientToEnd( *i ); - //AddObjectToEnd(type,*i); - type = gdcmDicomDir::GDCM_DICOMDIR_PATIENT; + type = DicomDir::GDCM_DICOMDIR_PATIENT; } else if( v == "STUDY " ) { AddDicomDirStudyToEnd( *i ); - // AddObjectToEnd(type,*i); - type = gdcmDicomDir::GDCM_DICOMDIR_STUDY; + type = DicomDir::GDCM_DICOMDIR_STUDY; } else if( v == "SERIES" ) { AddDicomDirSerieToEnd( *i ); - // AddObjectToEnd(type,*i); - type = gdcmDicomDir::GDCM_DICOMDIR_SERIE; + type = DicomDir::GDCM_DICOMDIR_SERIE; } else if( v == "IMAGE " ) { AddDicomDirImageToEnd( *i ); - // AddObjectToEnd(type,*i); - type = gdcmDicomDir::GDCM_DICOMDIR_IMAGE; + type = DicomDir::GDCM_DICOMDIR_IMAGE; } else { @@ -822,138 +826,100 @@ void gdcmDicomDir::CreateDicomDir() } /** - * \ingroup gdcmDicomDir - * \brief AddObjectToEnd - * @param type - * @param begin iterator on the first DocEntry within the chained List - * @param end iterator on the last DocEntry within the chained List - */ - -// now useless ? - -/*void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,gdcmSQItem *s) -{ - if(s==NULL) // ?? - return; - - switch(type) - { - case gdcmDicomDir::GDCM_DICOMDIR_META: - AddDicomDirMeta(); - break; - case gdcmDicomDir::GDCM_DICOMDIR_PATIENT: - AddDicomDirPatientToEnd(s); - break; - case gdcmDicomDir::GDCM_DICOMDIR_STUDY: - AddDicomDirStudyToEnd(s); - break; - case gdcmDicomDir::GDCM_DICOMDIR_SERIE: - AddDicomDirSerieToEnd(s); - break; - case gdcmDicomDir::GDCM_DICOMDIR_IMAGE: - AddDicomDirImageToEnd(s); - break; - case gdcmDicomDir::GDCM_DICOMDIR_NONE: - AddDicomDirImageToEnd(s); //FIXME - break; - } -} - -*/ - -/** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief Well ... there is only one occurence */ -void gdcmDicomDir::AddDicomDirMeta() +void DicomDir::AddDicomDirMeta() { - if( metaElems ) + if( MetaElems ) { - delete metaElems; + delete MetaElems; } - metaElems = new gdcmDicomDirMeta( &TagHT ); + MetaElems = new DicomDirMeta( &TagHT ); } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief AddDicomDirPatientToEnd * @param s SQ Item to enqueue to the DicomPatient chained List */ -void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s) +void DicomDir::AddDicomDirPatientToEnd(SQItem *s) { - patients.push_back(new gdcmDicomDirPatient(s, &TagHT)); + Patients.push_back(new DicomDirPatient(s, &TagHT)); } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief AddDicomDirStudyToEnd * @param s SQ Item to enqueue to the DicomDirStudy chained List */ - void gdcmDicomDir::AddDicomDirStudyToEnd(gdcmSQItem *s) + void DicomDir::AddDicomDirStudyToEnd(SQItem *s) { - if( patients.size() > 0 ) + if( Patients.size() > 0 ) { - ListDicomDirPatient::iterator itp = patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; - (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(s, &TagHT)); + (*itp)->AddDicomDirStudy(new DicomDirStudy(s, &TagHT)); } } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief AddDicomDirSerieToEnd * @param s SQ Item to enqueue to the DicomDirSerie chained List */ -void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *s) +void DicomDir::AddDicomDirSerieToEnd(SQItem *s) { - if( patients.size() > 0 ) + if( Patients.size() > 0 ) { - ListDicomDirPatient::iterator itp = patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; if( (*itp)->GetDicomDirStudies().size() > 0 ) { - ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end(); + ListDicomDirStudy::const_iterator itst = + (*itp)->GetDicomDirStudies().end(); itst--; - (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(s, &TagHT)); + (*itst)->AddDicomDirSerie(new DicomDirSerie(s, &TagHT)); } } } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief AddDicomDirImageToEnd * @param s SQ Item to enqueue to the DicomDirImage chained List */ - void gdcmDicomDir::AddDicomDirImageToEnd(gdcmSQItem *s) + void DicomDir::AddDicomDirImageToEnd(SQItem *s) { - if( patients.size() > 0 ) + if( Patients.size() > 0 ) { - ListDicomDirPatient::iterator itp = patients.end(); + ListDicomDirPatient::iterator itp = Patients.end(); itp--; if( (*itp)->GetDicomDirStudies().size() > 0 ) { - ListDicomDirStudy::iterator itst = (*itp)->GetDicomDirStudies().end(); + ListDicomDirStudy::const_iterator itst = + (*itp)->GetDicomDirStudies().end(); itst--; if( (*itst)->GetDicomDirSeries().size() > 0 ) { - ListDicomDirSerie::iterator its = (*itst)->GetDicomDirSeries().end(); + ListDicomDirSerie::const_iterator its = (*itst)->GetDicomDirSeries().end(); its--; - (*its)->AddDicomDirImage(new gdcmDicomDirImage(s, &TagHT)); + (*its)->AddDicomDirImage(new DicomDirImage(s, &TagHT)); } } } } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \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 gdcmDicomDir::SetElements(std::string &path, VectDocument &list) +void DicomDir::SetElements(std::string const & path, VectDocument const &list) { std::string patPrevName = "", patPrevID = ""; std::string studPrevInstanceUID = "", studPrevID = ""; @@ -963,10 +929,8 @@ void gdcmDicomDir::SetElements(std::string &path, VectDocument &list) std::string studCurInstanceUID, studCurID; std::string serCurInstanceUID, serCurID; - SetElement( path, GDCM_DICOMDIR_META,NULL); - - for( VectDocument::iterator it = list.begin(); - it != list.end(); ++it ) + for( VectDocument::const_iterator it = list.begin(); + it != list.end(); ++it ) { // get the current file characteristics patCurName = (*it)->GetEntryByNumber(0x0010,0x0010); @@ -1006,44 +970,13 @@ void gdcmDicomDir::SetElements(std::string &path, VectDocument &list) } /** - * \ingroup gdcmDicomDir + * \ingroup DicomDir * \brief compares two dgcmHeaders */ -bool gdcmDicomDir::HeaderLessThan(gdcmDocument *header1, gdcmDocument *header2) +bool DicomDir::HeaderLessThan(Document *header1, Document *header2) { return *header1 < *header2; } - -/** - * \brief Sets the accurate value for the (0x0004,0x1220) element of a DICOMDIR - */ -void gdcmDicomDir::UpdateDirectoryRecordSequenceLength() -{ - -/// \todo FIXME : to go on compiling -/// -/// to be re written ! -/// int offset = 0; -/// ListTag::iterator it; -/// uint16_t gr, el; -/// std::string vr; -/// for(it=listEntries.begin();it!=listEntries.end();++it) { -/// gr = (*it)->GetGroup(); -/// el = (*it)->GetElement(); -/// vr = (*it)->GetVR(); -/// if (gr !=0xfffe) { -/// if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) { -/// offset += 4; // explicit VR AND OB, OW, SQ : 4 more bytes -/// } -/// offset += 2 + 2 + 4 + (*it)->GetLength(); -/// } else { -/// offset += 4; // delimiters don't have a value. -/// } -/// } -/// //bool res=SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. -/// SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps. -/// return; -/// -} +} // end namespace gdcm //-----------------------------------------------------------------------------