X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=ee3b95c18920c33bb0bf28ac6234044a2d54ea3c;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=03cc6a20c939c2cdc175ae2db38e06dad6fefaed;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 03cc6a20..ee3b95c1 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2004/10/22 03:05:40 $ - Version: $Revision: 1.74 $ + Date: $Date: 2004/11/30 17:04:01 $ + Version: $Revision: 1.83 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -34,11 +34,16 @@ #include #include -#ifdef _MSC_VER +#ifdef _MSC_VER +#define getcwd _getcwd +#endif + +#if defined( _MSC_VER) || defined(__BORLANDC__) #include #else #include #endif + namespace gdcm { @@ -121,7 +126,8 @@ DicomDir::DicomDir(std::string const & fileName, bool parseDir ): /// \todo FIXME : what do we do when the parsed file IS NOT a /// DICOMDIR file ? } - CreateDicomDir(); + else + CreateDicomDir(); } } @@ -133,6 +139,8 @@ DicomDir::~DicomDir() SetStartMethod(NULL); SetProgressMethod(NULL); SetEndMethod(NULL); + + TagHT.clear(); for(ListDicomDirPatient::iterator cc = Patients.begin(); cc!= Patients.end(); ++cc) @@ -229,14 +237,15 @@ void DicomDir::ParseDirectory() /** * \ingroup DicomDir - * \brief Set the start method to call when the parsing of the directory starts + * \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(Method* method, void* arg, - Method* argDelete ) +void DicomDir::SetStartMethod( DicomDir::Method* method, void* arg, + DicomDir::Method* argDelete ) { if( StartArg && StartMethodArgDelete ) { @@ -255,21 +264,22 @@ void DicomDir::SetStartMethod(Method* method, void* arg, * class is destroyed * @param method Method to call to delete the argument */ -void DicomDir::SetStartMethodArgDelete(Method* method) +void DicomDir::SetStartMethodArgDelete( DicomDir::Method* method ) { StartMethodArgDelete = method; } /** * \ingroup DicomDir - * \brief Set the progress method to call when the parsing of the directory progress + * \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(Method* method, void* arg, - Method* argDelete ) +void DicomDir::SetProgressMethod( DicomDir::Method* method, void* arg, + DicomDir::Method* argDelete ) { if( ProgressArg && ProgressMethodArgDelete ) { @@ -288,7 +298,7 @@ void DicomDir::SetProgressMethod(Method* method, void* arg, * class is destroyed * @param method Method to call to delete the argument */ -void DicomDir::SetProgressMethodArgDelete(Method* method) +void DicomDir::SetProgressMethodArgDelete( DicomDir::Method* method ) { ProgressMethodArgDelete = method; } @@ -301,8 +311,8 @@ void DicomDir::SetProgressMethodArgDelete(Method* method) * @param argDelete Argument * \warning In python : the arg parameter isn't considered */ -void DicomDir::SetEndMethod(Method* method, void* arg, - Method* argDelete ) +void DicomDir::SetEndMethod( DicomDir::Method* method, void* arg, + DicomDir::Method* argDelete ) { if( EndArg && EndMethodArgDelete ) { @@ -317,18 +327,18 @@ void DicomDir::SetEndMethod(Method* method, void* arg, /** * \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 + * 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(Method* method) +void DicomDir::SetEndMethodArgDelete( DicomDir::Method* method ) { EndMethodArgDelete = method; } /** * \ingroup DicomDir - * \brief writes on disc a 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 ! * \todo : to be re-written using the DICOMDIR tree-like structure @@ -340,6 +350,7 @@ void DicomDir::SetEndMethodArgDelete(Method* method) 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 }; @@ -347,30 +358,36 @@ bool DicomDir::WriteDicomDir(std::string const& fileName) 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; } - uint8_t filePreamble[128]; + char filePreamble[128]; memset(filePreamble, 0, 128); - fp->write((char*)filePreamble, 128); - fp->write("DICM",4); + fp->write(filePreamble, 128); //FIXME + binary_write( *fp, "DICM"); DicomDirMeta *ptrMeta = GetDicomDirMeta(); - ptrMeta->Write(fp, ExplicitVR); + ptrMeta->WriteContent(fp, ExplicitVR); // force writing 0004|1220 [SQ ], that CANNOT exist within DicomDirMeta - fp->write((char*)&sq[0],8); + 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 ); + (*cc)->WriteContent( fp, ExplicitVR ); } // force writing Sequence Delimitation Item - fp->write((char*)&sqt[0],8); // fffe e0dd ffff ffff + for(i=0;i<4;++i) + { + binary_write(*fp, sqt[i]); // fffe e0dd ffff ffff + } fp->close(); return true; @@ -392,9 +409,6 @@ void DicomDir::CreateDicomDirChainedList(std::string const & path) VectDocument list; Header *header; - TagHT.clear(); - Patients.clear(); - for( DirList::iterator it = fileList.begin(); it != fileList.end(); ++it ) @@ -463,10 +477,10 @@ DicomDirMeta * DicomDir::NewMeta() } else // after root directory parsing { - std::list elemList; - elemList=Global::GetDicomDirElements()->GetDicomDirMetaElements(); - m->FillObject(elemList); - } + ListDicomDirMetaElem const & elemList = + Global::GetDicomDirElements()->GetDicomDirMetaElements(); + m->FillObject(elemList); + } m->SetSQItemNumber(0); // To avoid further missprinting return m; } @@ -476,13 +490,13 @@ DicomDirMeta * DicomDir::NewMeta() */ DicomDirPatient * DicomDir::NewPatient() { - std::list::iterator it; + ListDicomDirPatientElem::const_iterator it; uint16_t tmpGr,tmpEl; DictEntry *dictEntry; ValEntry *entry; - std::list elemList; - elemList=Global::GetDicomDirElements()->GetDicomDirPatientElements(); + ListDicomDirPatientElem const & elemList = + Global::GetDicomDirElements()->GetDicomDirPatientElements(); SQItem *s = new SQItem(0); // for all the DicomDirPatient Elements @@ -523,7 +537,7 @@ DicomDirPatient * DicomDir::NewPatient() DicomDirPatient *p = new DicomDirPatient(s, &TagHT); Patients.push_front( p ); - return p; + return p; } /** @@ -534,16 +548,17 @@ DicomDirPatient * DicomDir::NewPatient() * GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...) * @param header Header of the current file */ -void DicomDir::SetElement(std::string &path,DicomDirType type, - Document *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; DictEntry *dictEntry; ValEntry *entry; std::string val; SQItem *si = new SQItem(0); // all the items will be at level 1 + switch( type ) { case GDCM_DICOMDIR_IMAGE: @@ -693,6 +708,7 @@ void DicomDir::SetElement(std::string &path,DicomDirType type, } +//----------------------------------------------------------------------------- /** * \brief CallStartMethod */ @@ -706,6 +722,7 @@ void DicomDir::CallStartMethod() } } +//----------------------------------------------------------------------------- /** * \ingroup DicomDir * \brief CallProgressMethod @@ -718,6 +735,7 @@ void DicomDir::CallProgressMethod() } } +//----------------------------------------------------------------------------- /** * \ingroup DicomDir * \brief CallEndMethod @@ -765,7 +783,7 @@ void DicomDir::CreateDicomDir() return; } - DicomDirType type = DicomDir::GDCM_DICOMDIR_META; + DicomDirType type; // = DicomDir::GDCM_DICOMDIR_META; MetaElems = NewMeta(); ListSQItem listItems = s->GetSQItems(); @@ -867,7 +885,8 @@ void DicomDir::AddDicomDirSerieToEnd(SQItem *s) if( (*itp)->GetDicomDirStudies().size() > 0 ) { - ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end(); + ListDicomDirStudy::const_iterator itst = + (*itp)->GetDicomDirStudies().end(); itst--; (*itst)->AddDicomDirSerie(new DicomDirSerie(s, &TagHT)); } @@ -888,12 +907,13 @@ void DicomDir::AddDicomDirSerieToEnd(SQItem *s) 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 DicomDirImage(s, &TagHT)); } @@ -907,8 +927,11 @@ void DicomDir::AddDicomDirSerieToEnd(SQItem *s) * @param path path of the root directory * @param list chained list of Headers */ -void DicomDir::SetElements(std::string &path, VectDocument &list) +void DicomDir::SetElements(std::string const & path, VectDocument const &list) { + TagHT.clear(); + Patients.clear(); + std::string patPrevName = "", patPrevID = ""; std::string studPrevInstanceUID = "", studPrevID = ""; std::string serPrevInstanceUID = "", serPrevID = ""; @@ -917,8 +940,8 @@ void DicomDir::SetElements(std::string &path, VectDocument &list) std::string studCurInstanceUID, studCurID; std::string serCurInstanceUID, serCurID; - 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);