X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=73fb51adc0554533f41789b6bca3f8404556814b;hb=e51bf0565bbe4c0e269dd941cb4071ebde6012e4;hp=f25fefd786f195de9111b89d1e89b500ff3f659b;hpb=6003c9cbddd74caa0f6a7de58d5f1e3f8a4c38c4;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index f25fefd7..73fb51ad 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/02/06 14:31:09 $ - Version: $Revision: 1.129 $ + Date: $Date: 2005/02/11 16:55:39 $ + Version: $Revision: 1.132 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,7 +57,7 @@ // Dicom PS 3.3 describes the relationship between Directory Records, as follow // // Directory Record Type Directory Record Types which may be included -// in the next lower-èlevel directory Entity +// in the next lower-level directory Entity // // (Root directory Entity) PATIENT // @@ -96,7 +96,7 @@ // PATIENT STUDY // STUDY SERIES // SERIES IMAGE -// IMAGE +// IMAGE / // // DicomDir::CreateDicomDir will have to be completed // Treelike structure management will have to be upgraded @@ -165,8 +165,7 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): } else { - /// \todo if parseDir == false, it should be tagged as an error - // NO ! user may just call ParseDirectory() *after* constructor + // user may just call ParseDirectory() *after* constructor } } // Only if user passed a DICOMDIR @@ -179,8 +178,6 @@ DicomDir::DicomDir(std::string const &fileName, bool parseDir ): { gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)" << " in file " << fileName); - /// \todo FIXME : what do we do when the parsed file IS NOT a - /// DICOMDIR file ? } else CreateDicomDir(); @@ -427,9 +424,6 @@ void DicomDir::SetEndMethodArgDelete( DicomDir::Method *method ) * \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 - * *not* the chained list - * (does NOT exist if the DICOMDIR is user-forged !) * @param fileName file to be written to * @return false only when fail to open */ @@ -450,7 +444,7 @@ bool DicomDir::WriteDicomDir(std::string const &fileName) char filePreamble[128]; memset(filePreamble, 0, 128); - fp->write(filePreamble, 128); //FIXME + fp->write(filePreamble, 128); binary_write( *fp, "DICM"); DicomDirMeta *ptrMeta = GetMeta(); @@ -620,7 +614,6 @@ void DicomDir::CreateDicomDir() if ( !e ) { gdcmWarningMacro( "No Directory Record Sequence (0004,1220) found"); - /// \todo FIXME: what to do when the parsed file IS NOT a DICOMDIR file ? return; } @@ -855,7 +848,7 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list) void DicomDir::SetElement(std::string const &path, DicomDirType type, Document *header) { - ListDicomDirElem elemList; //FIXME this is going to be a by copy operation + ListDicomDirElem elemList; ListDicomDirElem::const_iterator it; uint16_t tmpGr, tmpEl; DictEntry *dictEntry;