X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=15162e8d6e53add093968c7b606ad62b9fe5e176;hb=5ac625c72835828d687ebdef878691d0913ae41b;hp=e7c6808feb714d6d9df6c731ca28682b2f652a44;hpb=cc8f86d8d77d1e831a04d5c80ec95f2f125c5313;p=gdcm.git diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index e7c6808f..15162e8d 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/11/29 12:48:46 $ + Version: $Revision: 1.72 $ 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,31 @@ typedef std::vector VectDocument; */ class GDCM_EXPORT DicomDir: public Document { -public: - typedef void(Method)(void*); - - DicomDir( std::string const &filename, bool parseDir = false ); - DicomDir(); - - ~DicomDir(); + gdcmTypeMacro(DicomDir); - void Print(std::ostream &os = std::cout, std::string const & indent = "" ); +public: +/// \brief Constructs a DicomDir with a RefCounter + static DicomDir *New() {return new DicomDir();} + 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(); + DicomDirMeta *NewMeta(); /// Returns a pointer to the DicomDirMeta for this DICOMDIR. - DicomDirMeta* GetMeta() { return MetaElems; }; + DicomDirMeta *GetMeta() { return MetaElems; } // Patients DicomDirPatient *NewPatient(); @@ -76,31 +86,19 @@ public: // 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. - 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 @@ -110,10 +108,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 +124,35 @@ 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; - /// 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; + + mutable bool Abort; }; } // end namespace gdcm //-----------------------------------------------------------------------------