X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDir.cxx;h=d9f71b67e87674bc768b0146f74039a2e3f0440f;hb=4dd42f8153a4d5ea8d2524b3c6670e80232f73b4;hp=fb5f55595e9b6c02e46af3dd2708d528e5a973ba;hpb=3fd520b58c8d1939994de2c63cc038c3e7ac9522;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index fb5f5559..d9f71b67 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/26 15:29:52 $ - Version: $Revision: 1.64 $ + Date: $Date: 2004/10/09 03:21:55 $ + Version: $Revision: 1.71 $ 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,16 @@ #include "gdcmSQItem.h" #include "gdcmValEntry.h" +#include +#include +#include + +#ifdef _MSC_VER + #include +#else + #include +#endif + //----------------------------------------------------------------------------- // For full DICOMDIR description, see: // PS 3.3-2003, pages 731-750 @@ -53,16 +53,14 @@ gdcmDicomDir::gdcmDicomDir() :gdcmDocument( ) { Initialize(); // sets all private fields to NULL - - std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ... - SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements - AddDicomDirMeta(); + 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 @@ -74,12 +72,11 @@ gdcmDicomDir::gdcmDicomDir() gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir ): gdcmDocument( 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 + // Whatever user passed (a root directory or a DICOMDIR) + // and whatever the value of parseDir was, + // gdcmDocument 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() ) // when user passed a Directory to parse @@ -90,15 +87,14 @@ gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir ): { // user passed '.' as Name // we get current directory name - char* dummy = new char[1000]; + char dummy[1000]; getcwd(dummy, (size_t)1000); SetFileName( dummy ); // will be converted into a string - delete[] dummy; // no longer needed } if ( parseDir ) // user asked for a recursive parsing of a root directory { - metaElems = NewMeta(); + MetaElems = NewMeta(); dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory" " and create the DicomDir"); @@ -134,15 +130,15 @@ gdcmDicomDir::~gdcmDicomDir() SetStartMethod(NULL); SetProgressMethod(NULL); SetEndMethod(NULL); - for(ListDicomDirPatient::iterator cc = patients.begin(); - cc!= patients.end(); + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc!= Patients.end(); ++cc) { delete *cc; } - if ( metaElems ) + if ( MetaElems ) { - delete metaElems; + delete MetaElems; } } @@ -153,13 +149,13 @@ gdcmDicomDir::~gdcmDicomDir() */ void gdcmDicomDir::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 ); @@ -183,11 +179,11 @@ bool gdcmDicomDir::IsReadable() { return false; } - if( !metaElems ) + if( !MetaElems ) { return false; } - if( patients.size() <= 0 ) + if( Patients.size() <= 0 ) { return false; } @@ -201,20 +197,20 @@ bool gdcmDicomDir::IsReadable() void gdcmDicomDir::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; } @@ -236,17 +232,17 @@ void gdcmDicomDir::ParseDirectory() * @param argDelete Argument * \warning In python : the arg parameter isn't considered */ -void gdcmDicomDir::SetStartMethod(gdcmMethod *method, void *arg, - gdcmMethod *argDelete ) +void gdcmDicomDir::SetStartMethod(gdcmMethod* method, void* arg, + gdcmMethod* argDelete ) { - if( startArg && startMethodArgDelete ) + if( StartArg && StartMethodArgDelete ) { - startMethodArgDelete( startArg ); + StartMethodArgDelete( StartArg ); } - startMethod = method; - startArg = arg; - startMethodArgDelete = argDelete; + StartMethod = method; + StartArg = arg; + StartMethodArgDelete = argDelete; } /** @@ -256,9 +252,9 @@ void gdcmDicomDir::SetStartMethod(gdcmMethod *method, void *arg, * class is destroyed * @param method Method to call to delete the argument */ -void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod *method) +void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod* method) { - startMethodArgDelete = method; + StartMethodArgDelete = method; } /** @@ -269,17 +265,17 @@ void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod *method) * @param argDelete Argument * \warning In python : the arg parameter isn't considered */ -void gdcmDicomDir::SetProgressMethod(gdcmMethod *method, void *arg, - gdcmMethod *argDelete ) +void gdcmDicomDir::SetProgressMethod(gdcmMethod* method, void* arg, + gdcmMethod* argDelete ) { - if( progressArg && progressMethodArgDelete ) + if( ProgressArg && ProgressMethodArgDelete ) { - progressMethodArgDelete( progressArg ); + ProgressMethodArgDelete( ProgressArg ); } - progressMethod = method; - progressArg = arg; - progressMethodArgDelete = argDelete; + ProgressMethod = method; + ProgressArg = arg; + ProgressMethodArgDelete = argDelete; } /** @@ -289,9 +285,9 @@ void gdcmDicomDir::SetProgressMethod(gdcmMethod *method, void *arg, * class is destroyed * @param method Method to call to delete the argument */ -void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod *method) +void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod* method) { - progressMethodArgDelete = method; + ProgressMethodArgDelete = method; } /** @@ -302,17 +298,17 @@ void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod *method) * @param argDelete Argument * \warning In python : the arg parameter isn't considered */ -void gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg, - gdcmMethod *argDelete ) +void gdcmDicomDir::SetEndMethod(gdcmMethod* method, void* arg, + gdcmMethod* argDelete ) { - if( endArg && endMethodArgDelete ) + if( EndArg && EndMethodArgDelete ) { - endMethodArgDelete( endArg ); + EndMethodArgDelete( EndArg ); } - endMethod = method; - endArg = arg; - endMethodArgDelete = argDelete; + EndMethod = method; + EndArg = arg; + EndMethodArgDelete = argDelete; } /** @@ -322,9 +318,9 @@ void gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg, * is destroyed * @param method Method to call to delete the argument */ -void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method) +void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod* method) { - endMethodArgDelete = method; + EndMethodArgDelete = method; } /** @@ -339,40 +335,39 @@ void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method) * @return false only when fail to open */ -bool gdcmDicomDir::Write(std::string const & fileName) +bool gdcmDicomDir::WriteDicomDir(std::string const& fileName) { - uint16_t sq[5] = { 0x0004, 0x1220, 0x0000, 0xffff, 0xffff }; - uint16_t sqt[3]= { 0xfffe, 0xe0dd, 0x0000 }; + uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff }; + uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0xffff, 0xffff }; - FILE * fp = fopen(fileName.c_str(), "wb"); + FILE* fp = fopen(fileName.c_str(), "wb"); if( !fp ) { printf("Failed to open(write) File [%s] \n", fileName.c_str()); return false; } - uint8_t* filePreamble = new uint8_t[128]; + uint8_t filePreamble[128]; memset(filePreamble, 0, 128); fwrite(filePreamble,128,1,fp); fwrite("DICM",4,1,fp); - delete[] filePreamble; - // UpdateDirectoryRecordSequenceLength(); // TODO (if *really* usefull) + gdcmDicomDirMeta *ptrMeta = GetDicomDirMeta(); ptrMeta->Write(fp, gdcmExplicitVR); // force writing 0004|1220 [SQ ], that CANNOT exist within gdcmDicomDirMeta - fwrite(&sq[0],4,1,fp); // 0004 1220 - fwrite("SQ" ,2,1,fp); // SQ - fwrite(&sq[2],6,1,fp); // 00 ffffffff - - for(ListDicomDirPatient::iterator cc = patients.begin();cc!=patients.end();++cc) + fwrite(&sq[0],8,1,fp); // 0004 1220 ffff ffff + + for(ListDicomDirPatient::iterator cc = Patients.begin(); + cc != Patients.end(); + ++cc ) { (*cc)->Write( fp, gdcmExplicitVR ); } + // force writing Sequence Delimitation Item - fwrite(&sqt[0],4,1,fp); // fffe e0dd - fwrite("UL" ,2,1,fp); // UL - fwrite(&sqt[2],1,1,fp); // 00 + fwrite(&sqt[0],8,1,fp); // fffe e0dd ffff ffff + fclose( fp ); return true; } @@ -394,15 +389,15 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) gdcmHeader *header; TagHT.clear(); - patients.clear(); + Patients.clear(); for( gdcmDirList::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; } @@ -415,6 +410,7 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) "failure in new Header ", it->c_str() ); } + if( header->IsReadable() ) { // Add the file header to the chained list: @@ -422,6 +418,7 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path) dbg.Verbose( 1, "gdcmDicomDir::CreateDicomDirChainedList: readable ", it->c_str() ); + } else { @@ -429,14 +426,12 @@ 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::string tmp = fileList.GetDirName(); //for each Header of the chained list, add/update the Patient/Study/Serie/Image info - SetElements(tmp, list); + SetElements(tmp, list); CallEndMethod(); } @@ -453,7 +448,7 @@ gdcmDicomDirMeta * gdcmDicomDir::NewMeta() { TagDocEntryHT::iterator lastOneButSequence = TagHT.end(); lastOneButSequence --; - // This works because ALL the 'out of Sequence' Tags belong to Meta Elems + // 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; @@ -464,19 +459,14 @@ gdcmDicomDirMeta * gdcmDicomDir::NewMeta() } else // after root directory parsing { - //cout << "gdcmDicomDir::NewMeta avec FillObject" << endl; std::list elemList; elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements(); m->FillObject(elemList); - // we create the Sequence manually - //gdcmSeqEntry *se =NewSeqEntryByNumber(0x0004, 0x1220); // NOT YET! - //m->AddEntry(se); } m->SetSQItemNumber(0); // To avoid further missprinting return m; } - /** * \brief adds a new Patient (with the basic elements) to a partially created DICOMDIR */ @@ -489,24 +479,17 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient() 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 !!! - gdcmSQItem *s = new gdcmSQItem(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->SetOffset(0); // just to avoid further missprinting - entry->SetValue( it->value ); + entry->SetValue( it->Value ); // dealing with value length ... @@ -534,7 +517,7 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient() } gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &TagHT); - patients.push_front( p ); + Patients.push_front( p ); return p; } @@ -543,7 +526,7 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient() * \brief adds to the HTable * the gdcmEntries (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 gdcmDicomDirObject type to create (GDCM_DICOMDIR_PATIENT, * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) * @param header gdcmHeader of the current file */ @@ -577,7 +560,6 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, case GDCM_DICOMDIR_META: elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements(); - // add already done ? break; default: @@ -595,8 +577,8 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, 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 ! @@ -604,11 +586,16 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, 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 + { val = GDCM_UNFOUND; + } if( val == GDCM_UNFOUND) { @@ -626,15 +613,19 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, 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; } // GDCM_UNFOUND or not ! @@ -666,7 +657,10 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, } if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! - std::cout << " special Treatment for GDCM_DICOMDIR_META" << std::endl; + { + std::cout << "GDCM_DICOMDIR_META ?!? should never print that" + << std::endl; + } si->AddEntry(entry); } switch( type ) @@ -700,11 +694,11 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type, */ void gdcmDicomDir::CallStartMethod() { - progress = 0.0f; - abort = false; - if( startMethod ) + Progress = 0.0f; + Abort = false; + if( StartMethod ) { - startMethod( startArg ); + StartMethod( StartArg ); } } @@ -714,9 +708,9 @@ void gdcmDicomDir::CallStartMethod() */ void gdcmDicomDir::CallProgressMethod() { - if( progressMethod ) + if( ProgressMethod ) { - progressMethod( progressArg ); + ProgressMethod( ProgressArg ); } } @@ -726,10 +720,10 @@ void gdcmDicomDir::CallProgressMethod() */ void gdcmDicomDir::CallEndMethod() { - progress = 1.0f; - if( endMethod ) + Progress = 1.0f; + if( EndMethod ) { - endMethod( endArg ); + EndMethod( EndArg ); } } @@ -768,7 +762,7 @@ void gdcmDicomDir::CreateDicomDir() } gdcmDicomDirType type = gdcmDicomDir::GDCM_DICOMDIR_META; - metaElems = NewMeta(); + MetaElems = NewMeta(); ListSQItem listItems = s->GetSQItems(); @@ -823,11 +817,11 @@ void gdcmDicomDir::CreateDicomDir() */ void gdcmDicomDir::AddDicomDirMeta() { - if( metaElems ) + if( MetaElems ) { - delete metaElems; + delete MetaElems; } - metaElems = new gdcmDicomDirMeta( &TagHT ); + MetaElems = new gdcmDicomDirMeta( &TagHT ); } /** @@ -837,7 +831,7 @@ void gdcmDicomDir::AddDicomDirMeta() */ void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s) { - patients.push_back(new gdcmDicomDirPatient(s, &TagHT)); + Patients.push_back(new gdcmDicomDirPatient(s, &TagHT)); } /** @@ -847,9 +841,9 @@ void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s) */ void gdcmDicomDir::AddDicomDirStudyToEnd(gdcmSQItem *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)); } @@ -862,9 +856,9 @@ void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s) */ void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *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 ) @@ -883,9 +877,9 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *s) */ void gdcmDicomDir::AddDicomDirImageToEnd(gdcmSQItem *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 ) @@ -919,8 +913,6 @@ void gdcmDicomDir::SetElements(std::string &path, VectDocument &list) std::string studCurInstanceUID, studCurID; std::string serCurInstanceUID, serCurID; - //SetElement( path, GDCM_DICOMDIR_META,NULL); // already done (NewMeta) - for( VectDocument::iterator it = list.begin(); it != list.end(); ++it ) { @@ -970,36 +962,4 @@ bool gdcmDicomDir::HeaderLessThan(gdcmDocument *header1, gdcmDocument *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; -/// -} - //-----------------------------------------------------------------------------