Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2005/07/20 14:49:42 $
- Version: $Revision: 1.65 $
+ Date: $Date: 2005/11/21 09:46:25 $
+ Version: $Revision: 1.70 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
class GDCM_EXPORT DicomDir: public Document
{
+ gdcmTypeMacro(DicomDir);
+
public:
- typedef void Method(void*);
+/// \brief Constructs a DicomDir with a RefCounter
+ static DicomDir *New() {return new DicomDir();}
- DicomDir();
- GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) );
- ~DicomDir();
+ typedef void Method(void*);
- GDCM_LEGACY( bool Load(std::string const &filename) );
bool Load( );
void Print(std::ostream &os = std::cout, std::string const &indent = "" );
/// Sets the root Directory name to parse, recursively
void SetDirectoryName(std::string const &dirName)
{ ParseDir = true; if (Filename != dirName)
- Filename = dirName, IsDocumentModified = true; };
+ Filename = dirName, IsDocumentModified = true; }
/// Accessor to \ref Filename
virtual void SetFileName(std::string const &fileName)
{ ParseDir = false; if (Filename != fileName)
- Filename = fileName, IsDocumentModified = true;};
-
- /// DEPRECATED : use SetDirectoryName
- GDCM_LEGACY( void SetParseDir(bool parseDir) );
+ Filename = fileName, IsDocumentModified = true;}
// Informations contained in the parser
virtual bool IsReadable();
// Meta
DicomDirMeta *NewMeta();
/// Returns a pointer to the DicomDirMeta for this DICOMDIR.
- DicomDirMeta *GetMeta() { return MetaElems; };
+ DicomDirMeta *GetMeta() { return MetaElems; }
// Patients
DicomDirPatient *NewPatient();
// following method declarations. Refer to gdcmPython/gdcm.i
// for the reasons of this unnecessary notation at C++ level.
void SetStartMethod( DicomDir::Method *method,
- void *arg = NULL,
- DicomDir::Method *argDelete = NULL );
- void SetProgressMethod( DicomDir::Method *method,
- void *arg = NULL,
- DicomDir::Method *argDelete = NULL );
+ void *arg = NULL );
+ void SetProgressMethod( DicomDir::Method *method,
+ void *arg = NULL );
void SetEndMethod( DicomDir::Method *method,
- void *arg = NULL,
- DicomDir::Method *argDelete = NULL );
- void SetStartMethodArgDelete ( DicomDir::Method *m );
- void SetProgressMethodArgDelete( DicomDir::Method *m );
- void SetEndMethodArgDelete ( DicomDir::Method *m );
+ void *arg = NULL );
+ // Note: replace DicomDir::Method *method to void(*method)(void *) to
+ // avoid wrapping problems with the typemap conversions
+ void SetStartMethod( void(*method)(void *), // DicomDir::Method *method
+ void *arg,
+ void(*argDelete)(void *));
+ void SetProgressMethod( void(*method)(void *), // DicomDir::Method *method
+ void *arg,
+ void(*argDelete)(void *));
+ void SetEndMethod( void(*method)(void *), // DicomDir::Method *method
+ void *arg,
+ void(*argDelete)(void *));
+ void SetStartMethodArgDelete ( DicomDir::Method *method );
+ void SetProgressMethodArgDelete( DicomDir::Method *method );
+ void SetEndMethodArgDelete ( DicomDir::Method *method );
/// GetProgress GetProgress
- float GetProgress() { return Progress; };
+ float GetProgress() { return Progress; }
/// AbortProgress AbortProgress
- void AbortProgress() { Abort = true; };
+ void AbortProgress() { Abort = true; }
/// IsAborted IsAborted
- bool IsAborted() { return Abort; };
+ bool IsAborted() { return Abort; }
// Write
- bool WriteDicomDir(std::string const &fileName);
+ bool Write(std::string const &fileName);
- bool AnonymizeDicomDir();
+ bool Anonymize();
/// Types of the DicomDirObject within the DicomDir
typedef enum
} DicomDirType;
protected:
+ DicomDir();
+ ~DicomDir();
+
void CreateDicomDirChainedList(std::string const &path);
void CallStartMethod();
void CallProgressMethod();