Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2005/07/19 15:19:26 $
- Version: $Revision: 1.149 $
+ Date: $Date: 2005/08/29 12:29:50 $
+ Version: $Revision: 1.155 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//
// (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
*/
DicomDir::~DicomDir()
{
- SetStartMethod(NULL);
- SetProgressMethod(NULL);
- SetEndMethod(NULL);
+ SetStartMethod(NULL,NULL,NULL);
+ SetProgressMethod(NULL,NULL,NULL);
+ SetEndMethod(NULL,NULL,NULL);
ClearPatient();
if ( MetaElems )
// 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.
*/
if ( ! this->Document::Load( ) )
return false;
}
- return DoTheLoadingJob( );
+ 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,
CreateDicomDir();
}
+void DicomDir::SetStartMethod( DicomDir::Method *method, void *arg )
+{
+ SetStartMethod(method,arg,NULL);
+}
+
+void DicomDir::SetProgressMethod( DicomDir::Method *method, void *arg )
+{
+ SetProgressMethod(method,arg,NULL);
+}
+
+void DicomDir::SetEndMethod( DicomDir::Method *method, void *arg )
+{
+ SetEndMethod(method,arg,NULL);
+}
+
/**
* \brief Set the start method to call when the parsing of the
* directory starts.
break;
}
- f = new File( );
- f->SetLoadMode(LoadMode); // we allow user not to load Sequences, or Shadow
- // groups, or ......
- f->SetFileName( it->c_str() );
+ f = new File( );
+ 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 )