X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=7a698763d2ea978b29def667c903e04d767582ea;hb=4ef8257270e9d499e8c5ece74c4582bcb6c3f6a4;hp=e7c6808feb714d6d9df6c731ca28682b2f652a44;hpb=cc8f86d8d77d1e831a04d5c80ec95f2f125c5313;p=gdcm.git diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index e7c6808f..7a698763 100644 --- a/src/gdcmDicomDir.h +++ b/src/gdcmDicomDir.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.h,v $ Language: C++ - Date: $Date: 2005/02/02 14:52:25 $ - Version: $Revision: 1.53 $ + Date: $Date: 2005/10/25 14:52:33 $ + Version: $Revision: 1.69 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,6 +20,7 @@ #define GDCMDICOMDIR_H #include "gdcmDocument.h" +#include "gdcmDebug.h" #include #include @@ -32,11 +33,12 @@ class DicomDirMeta; class DicomDirElement; class DicomDirStudy; class DicomDirSerie; +class DicomDirVisit; class DicomDirImage; class SQItem; -typedef std::list ListDicomDirPatient; -typedef std::vector VectDocument; +typedef std::list ListDicomDirPatient; +typedef std::vector VectDocument; //----------------------------------------------------------------------------- /** @@ -48,23 +50,36 @@ typedef std::vector 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: + static DicomDir *New() {return new DicomDir();} - void Print(std::ostream &os = std::cout, std::string const & indent = "" ); + 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; } + /// 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) ); + // Informations contained in the parser virtual bool IsReadable(); // Meta - DicomDirMeta *NewMeta(); + DicomDirMeta *NewMeta(); /// Returns a pointer to the DicomDirMeta for this DICOMDIR. - DicomDirMeta* GetMeta() { return MetaElems; }; + DicomDirMeta *GetMeta() { return MetaElems; } // Patients DicomDirPatient *NewPatient(); @@ -78,29 +93,39 @@ public: // 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; }; + bool IsAborted() { return Abort; } // Write - bool WriteDicomDir(std::string const &fileName); + bool Write(std::string const &fileName); + + bool Anonymize(); /// Types of the DicomDirObject within the DicomDir typedef enum @@ -110,10 +135,14 @@ public: 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(); @@ -122,50 +151,52 @@ protected: 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 //-----------------------------------------------------------------------------