X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=2ca54af0f96aee3e5e6db84d9a11ac7ebf90e6dc;hb=f215c25069021e599c885489388965b2c1b43f78;hp=1a47080925328ad312a6fd473843c6a7315c4d0f;hpb=5ac625c72835828d687ebdef878691d0913ae41b;p=gdcm.git diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index 1a470809..2ca54af0 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/29 12:48:45 $ - Version: $Revision: 1.176 $ + Date: $Date: 2006/02/16 20:06:13 $ + Version: $Revision: 1.186 $ 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) @@ -202,13 +259,13 @@ bool DicomDir::DoTheLoadingJob( ) char buf[2048]; 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(); gdcmDebugMacro( "Parse directory and create the DicomDir : " @@ -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(); @@ -438,7 +495,7 @@ bool DicomDir::Anonymize() /** * \brief Copies all the attributes from an other DocEntrySet * @param set entry to copy from - * @remarks The contained DocEntries a not copied, only referenced + * @remarks The contained DocEntries are not copied, only referenced */ void DicomDir::Copy(DocEntrySet *set) { @@ -477,12 +534,12 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) File *f; DirListType fileList = dirList.GetFilenames(); - + unsigned int nbFile = fileList.size(); for( DirListType::iterator it = fileList.begin(); it != fileList.end(); ++it ) { - Progress = (float)(count+1)/(float)fileList.size(); + Progress = (float)(count+1)/(float)nbFile; CallProgressMethod(); if ( Abort ) { @@ -523,32 +580,6 @@ void DicomDir::CreateDicomDirChainedList(std::string const &path) } } -/** - * \brief CallStartMethod - */ -void DicomDir::CallStartMethod() -{ - Progress = 0.0f; - Abort = false; - CommandManager::ExecuteCommand(this,CMD_STARTPROGRESS); -} - -/** - * \brief CallProgressMethod - */ -void DicomDir::CallProgressMethod() -{ - CommandManager::ExecuteCommand(this,CMD_PROGRESS); -} - -/** - * \brief CallEndMethod - */ -void DicomDir::CallEndMethod() -{ - Progress = 1.0f; - CommandManager::ExecuteCommand(this,CMD_ENDPROGRESS); -} //----------------------------------------------------------------------------- // Private @@ -614,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 " ) { @@ -914,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 @@ -940,8 +971,7 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, { // 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 { @@ -949,55 +979,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'! @@ -1012,12 +1061,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(); } @@ -1029,15 +1080,16 @@ void DicomDir::SetElement(std::string const &path, DicomDirType type, * @param dst destination SQItem * @param src source SQItem */ -void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src) +void DicomDir::MoveSQItem(DocEntrySet *dst, DocEntrySet *src) { DocEntry *entry; - +// todo : rewrite the whole stuff, without using RemoveEntry an AddEntry, +// to save time entry = src->GetFirstEntry(); while(entry) { + dst->AddEntry(entry); // use it, *before* removing it! src->RemoveEntry(entry); - dst->AddEntry(entry); // we destroyed -> the current iterator is not longer valid entry = src->GetFirstEntry(); }