X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=6812b76f0652d55359bf770c105bcbce311ce114;hb=17ebda2271dd65565f512e835546b22c22ebbbb0;hp=a5902b911e288bf7fe00107cedc9ca560fc56645;hpb=63b1baaa4ffc54e72247d80978c79456618281ce;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index a5902b91..6812b76f 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/11/30 11:41:35 $ - Version: $Revision: 1.179 $ + Date: $Date: 2006/04/11 16:03:26 $ + Version: $Revision: 1.187 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -53,6 +53,11 @@ #else # include #endif + +#if defined(__BORLANDC__) + #include // for memset +#endif + // ---------------------------------------------------------------------------- // Note for future developpers // ---------------------------------------------------------------------------- @@ -124,6 +129,36 @@ DicomDir::DicomDir() 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 (LD_ALL); // concerns only dicom files + SetFileName( fileName ); + Load( ); +} +#endif + /** * \brief Canonical destructor */ @@ -154,6 +189,28 @@ 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( ); +} +#endif /** * \brief Does the Loading Job (internal use only) @@ -203,11 +260,11 @@ bool DicomDir::DoTheLoadingJob( ) const char *cwd = getcwd(buf, 2048); if( cwd ) { - SetFileName( buf ); // will be converted into a string + SetFileName( buf ); // will be converted into a string } else { - gdcmErrorMacro( "Path was too long to fit on 2048 bytes" ); + gdcmErrorMacro( "Path was too long to fit on 2048 bytes" ); } } NewMeta(); @@ -353,7 +410,7 @@ bool DicomDir::Write(std::string const &fileName) { int i; uint16_t sq[6] = { 0x0004, 0x1220, 0x5153, 0x0000, 0xffff, 0xffff }; - uint16_t sqt[4]= { 0xfffe, 0xe0dd, 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); @@ -387,7 +444,7 @@ bool DicomDir::Write(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(); @@ -588,7 +645,7 @@ void DicomDir::CreateDicomDir() // 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 " ) { @@ -888,9 +945,9 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, 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 @@ -905,17 +962,17 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { tmpGr = it->Group; tmpEl = it->Elem; - dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); - - entry = DataEntry::New( dictEntry ); + //dictEntry = GetPubDict()->GetEntry(tmpGr, tmpEl); + //entry = DataEntry::New( dictEntry ); + + entry = DataEntry::New(tmpGr, tmpEl, GDCM_VRUNKNOWN); /// \todo : modify dicomelements file, to store VR 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->GetEntryString(tmpGr, tmpEl); + val = header->GetEntryString(tmpGr, tmpEl); } else { @@ -923,55 +980,74 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, } if ( val == GDCM_UNFOUND) - { + { if ( tmpGr == 0x0004 ) // never present in File ! { switch (tmpEl) - { - case 0x1130: // File-set ID - // force to the *end* File Name - val = Util::GetName( path ); - break; + { + case 0x1130: // File-set ID + // force to the *end* File Name + val = Util::GetName( path ); + break; - case 0x1500: // Only used for image + 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(); + { + gdcmWarningMacro( "The base path of file name is incorrect"); + val = header->GetFileName(); } else - { - val = &(header->GetFileName().c_str()[path.length()+1]); + { + // 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; + break; - case 0x1510: // Referenced SOP Class UID in File - referencedVal = header->GetEntryString(0x0008, 0x0016); - // FIXME : probabely something to check - val = referencedVal; - 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 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; + 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; - } + default : + val = it->Value; + } } + else + { + // 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; + } + } } /* FIX later the pb of creating the 'Implementation Version Name'! @@ -986,12 +1062,14 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, val += Util::GetVersion(); } */ + entry->SetString( val ); // troubles expected when vr=SQ ... if ( type == GDCM_DICOMDIR_META ) // fusible : should never print ! { gdcmDebugMacro("GDCM_DICOMDIR_META ?!? should never print that"); } + si->AddEntry(entry); entry->Delete(); }