Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/07/08 19:07:12 $
- Version: $Revision: 1.146 $
+ Date: $Date: 2005/08/19 13:15:05 $
+ Version: $Revision: 1.153 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// PS 3.3-2003, pages 731-750
//-----------------------------------------------------------------------------
#include "gdcmDicomDir.h"
+#include "gdcmDicomDirObject.h"
#include "gdcmDicomDirStudy.h"
#include "gdcmDicomDirSerie.h"
#include "gdcmDicomDirVisit.h"
//
// (Root directory Entity) PATIENT
// PATIENT STUDY
-// STUDY SERIES
+// STUDY SERIES
+// STUDY VISIT
// SERIES IMAGE
// IMAGE /
//
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.
* 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( )
ParseDir = parseDir;
SetLoadMode (0x00000000); // concerns only dicom files
- Load( fileName );
+ SetFileName( fileName );
+ Load( );
}
+#endif
/**
* \brief Canonical destructor
// Public
/**
- * \brief Loader. use SetLoadMode(), SetFileName() before !
+ * \brief Loader. use SetFileName(fn)
+ * or SetLoadMode(lm) + SetDirectoryName(dn) before !
* @return false if file cannot be open or no swap info was found,
* or no tag was found.
*/
return DoTheLoadingJob( );
}
+ #ifndef GDCM_LEGACY_REMOVE
/**
- * \brief Loader. (DEPRECATED : not to break the API)
+ * \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 )
{
return DoTheLoadingJob( );
}
+/// DEPRECATED : use SetDirectoryName(dname) instead
+void DicomDir::SetParseDir(bool parseDir)
+{
+ ParseDir = parseDir;
+}
+#endif
+
/**
* \brief Does the Loading Job (internal use only)
* @return false if file cannot be open or no swap info was found,
}
f = new File( );
- f->SetLoadMode(LoadMode); // we allow user not to load Sequences...
- f->Load( it->c_str() );
+ f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow
+ // groups, or ......
+ f->SetFileName( it->c_str() );
+ /*int res = */f->Load( );
// if ( !f )
// {
continue;
}
if ( si )
- MoveSQItem(si,tmpSI);
+ //MoveSQItem(si,tmpSI); // Old code : Copies each Entry
+ // -and then removes the source-
+ si->MoveObject(tmpSI); // New code : Copies the List
tmpSI=s->GetNextSQItem();
}
* @param src source SQItem
*/
void DicomDir::MoveSQItem(DocEntrySet *dst,DocEntrySet *src)
-{
+{
DocEntry *entry;
entry = src->GetFirstEntry();