Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2005/01/25 11:11:58 $
- Version: $Revision: 1.50 $
+ 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
#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;
//-----------------------------------------------------------------------------
-
/**
- * \ingroup DicomDir
* \brief DicomDir defines an object representing a DICOMDIR in memory
- * as a tree-like structure DicomDirPatient -> DicomDirStudy -> DicomDirSerie
- * -> DicomDirImage
- *
+ * as a tree-like structure DicomDirPatient
+ * -> DicomDirStudy
+ * -> DicomDirSerie
+ * -> DicomDirImage
*/
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();}
- /// \brief canonical Printer
- void Print(std::ostream &os = std::cout, std::string const & indent = "" );
+ typedef void Method(void*);
+ 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
+ // Informations contained in the parser
virtual bool IsReadable();
- /// Parsing
+ // Meta
+ DicomDirMeta *NewMeta();
+ /// Returns a pointer to the DicomDirMeta for this DICOMDIR.
+ DicomDirMeta *GetMeta() { return MetaElems; }
+
+ // Patients
+ DicomDirPatient *NewPatient();
+ void ClearPatient();
+
+ DicomDirPatient *GetFirstPatient();
+ DicomDirPatient *GetNextPatient();
+
+ // 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 unecessary notation at C++ level.
+ // 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; };
-
- /// Returns a pointer to the DicomDirMeta for this DICOMDIR.
- DicomDirMeta* GetMeta() { return MetaElems; };
-
- // should avoid exposing internal mechanism
- DicomDirPatient *GetFirstPatient();
- DicomDirPatient *GetNextPatient();
+ bool IsAborted() { return Abort; }
- /// Adding
- DicomDirMeta *NewMeta();
- DicomDirPatient *NewPatient();
-
- /// Removing
- void ClearPatient();
+ // Write
+ bool Write(std::string const &fileName);
- /// Write
- bool WriteDicomDir(std::string const &fileName);
+ bool Anonymize();
/// 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();
+ ~DicomDir();
+
void CreateDicomDirChainedList(std::string const &path);
void CallStartMethod();
void CallProgressMethod();
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);
void SetElement (std::string const &path, DicomDirType type,
Document *header);
- void MoveSQItem(DocEntrySet *dst,DocEntrySet *src);
+ void MoveSQItem(DocEntrySet *dst, DocEntrySet *src);
static bool HeaderLessThan(Document *header1, Document *header2);
// Variables
/// Pointer on *the* DicomDirObject 'DicomDirMeta Elements'
- DicomDirMeta* MetaElems;
+ DicomDirMeta *MetaElems;
- /// Chained list of DicomDirPatient (to be exploited recursively)
+ /// Chained list of DicomDirPatient (to be exploited hierarchicaly)
ListDicomDirPatient Patients;
ListDicomDirPatient::iterator ItPatient;
/// pointer to the initialisation method for any progress bar
- Method* StartMethod;
+ Method *StartMethod;
/// pointer to the incrementation method for any progress bar
- Method* ProgressMethod;
+ Method *ProgressMethod;
/// pointer to the termination method for any progress bar
- Method* EndMethod;
+ Method *EndMethod;
/// pointer to the ??? method for any progress bar
- Method* StartMethodArgDelete;
+ Method *StartMethodArgDelete;
/// pointer to the ??? method for any progress bar
Method* ProgressMethodArgDelete;
/// pointer to the ??? method for any progress bar
- Method* EndMethodArgDelete;
+ Method *EndMethodArgDelete;
/// pointer to the ??? for any progress bar
- void* StartArg;
+ void *StartArg;
/// pointer to the ??? for any progress bar
- void* ProgressArg;
+ void *ProgressArg;
/// pointer to the ??? for any progress bar
- void* EndArg;
+ 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
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff