Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/12/13 16:32:20 $
- Version: $Revision: 1.181 $
+ 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
#else
# include <unistd.h>
#endif
+
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memset
+#endif
+
// ----------------------------------------------------------------------------
// Note for future developpers
// ----------------------------------------------------------------------------
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
*/
}
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)
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();
// 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 " )
{
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
{
// 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
{
}
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]);
- val = &(header->GetFileName().c_str()[path.length()]);
+ {
+ // 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'!
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();
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff