Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2005/03/04 09:53:21 $
- Version: $Revision: 1.57 $
+ Date: $Date: 2006/05/11 19:49:38 $
+ Version: $Revision: 1.75 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMDICOMDIR_H
#include "gdcmDocument.h"
+#include "gdcmDebug.h"
#include <list>
#include <vector>
class DicomDirElement;
class DicomDirStudy;
class DicomDirSerie;
+class DicomDirVisit;
class DicomDirImage;
class SQItem;
-typedef std::list<DicomDirPatient *> ListDicomDirPatient;
-typedef std::vector<Document *> VectDocument;
+typedef std::list<DicomDirPatient *> ListDicomDirPatient;
+typedef std::vector<Document *> VectDocument;
//-----------------------------------------------------------------------------
/**
*/
class GDCM_EXPORT DicomDir: public Document
{
-public:
- typedef void Method(void*);
+ gdcmTypeMacro(DicomDir);
- DicomDir( std::string const &filename, bool parseDir = false );
- DicomDir();
-
- ~DicomDir();
+public:
+/// \brief Constructs a DicomDir with a RefCounter
+ static DicomDir *New() {return new DicomDir();}
+ 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; }
+ /// Accessor to \ref Filename
+ virtual void SetFileName(std::string const &fileName)
+ { ParseDir = false; if (Filename != fileName)
+ 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();
// Parsing
void ParseDirectory();
- // Note: the DicomDir:: namespace prefix is needed by Swig in the
- // 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 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 );
-
/// GetProgress GetProgress
- float GetProgress() { return Progress; };
+ float GetProgress() const { 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 Anonymize();
+
+ virtual void Copy(DocEntrySet *set);
/// Types of the DicomDirObject within the DicomDir
typedef enum
GDCM_DICOMDIR_PATIENT,
GDCM_DICOMDIR_STUDY,
GDCM_DICOMDIR_SERIE,
+ GDCM_DICOMDIR_VISIT,
GDCM_DICOMDIR_IMAGE
} DicomDirType;
protected:
+ DicomDir();
+ GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) )
+ ~DicomDir();
+
void CreateDicomDirChainedList(std::string const &path);
- void CallStartMethod();
- void CallProgressMethod();
- void CallEndMethod();
private:
void Initialize();
void CreateDicomDir();
-
+ bool DoTheLoadingJob();
bool AddPatientToEnd(DicomDirPatient *dd);
bool AddStudyToEnd (DicomDirStudy *dd);
bool AddSerieToEnd (DicomDirSerie *dd);
+ bool AddVisitToEnd (DicomDirVisit *dd);
bool AddImageToEnd (DicomDirImage *dd);
void SetElements(std::string const &path, VectDocument const &list);
ListDicomDirPatient Patients;
ListDicomDirPatient::iterator ItPatient;
- /// pointer to the initialisation method for any progress bar
- Method *StartMethod;
- /// pointer to the incrementation method for any progress bar
- Method *ProgressMethod;
- /// pointer to the termination method for any progress bar
- Method *EndMethod;
- /// pointer to the ??? method for any progress bar
- Method *StartMethodArgDelete;
- /// pointer to the ??? method for any progress bar
- Method* ProgressMethodArgDelete;
- /// pointer to the ??? method for any progress bar
- Method *EndMethodArgDelete;
- /// pointer to the ??? for any progress bar
- void *StartArg;
- /// pointer to the ??? for any progress bar
- void *ProgressArg;
- /// pointer to the ??? for any progress bar
- void *EndArg;
- /// value of the ??? for any progress bar
- float Progress;
/// value of the ??? for any progress bar
- bool Abort;
+ bool ParseDir;
+
};
} // end namespace gdcm
//-----------------------------------------------------------------------------