X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=7a698763d2ea978b29def667c903e04d767582ea;hb=f7276083b636d98a16f347fde5916a3fca6855db;hp=edbc7b4bd0756d6393b0f6a5f9649251e840741a;hpb=2f27193f6cbd42d1143738e40563b4a4bd4a0c8a;p=gdcm.git diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index edbc7b4b..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: 2004/10/25 04:47:43 $ - Version: $Revision: 1.35 $ + 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 @@ -19,11 +19,8 @@ #ifndef GDCMDICOMDIR_H #define GDCMDICOMDIR_H -#include "gdcmCommon.h" #include "gdcmDocument.h" -#include "gdcmDicomDirPatient.h" -#include "gdcmDicomDirMeta.h" -#include "gdcmDicomDirElement.h" +#include "gdcmDebug.h" #include #include @@ -31,63 +28,104 @@ namespace gdcm { //----------------------------------------------------------------------------- -typedef std::list ListDicomDirPatient; -typedef std::vector VectDocument; +class DicomDirPatient; +class DicomDirMeta; +class DicomDirElement; +class DicomDirStudy; +class DicomDirSerie; +class DicomDirVisit; +class DicomDirImage; +class SQItem; + +typedef std::list ListDicomDirPatient; +typedef std::vector VectDocument; -typedef GDCM_EXPORT void(Method)(void* = NULL); //----------------------------------------------------------------------------- - /** - * \ingroup DicomDir - * \brief DicomDir defines an object representing a DICOMDIR in memory. - * + * \brief DicomDir defines an object representing a DICOMDIR in memory + * as a tree-like structure DicomDirPatient + * -> DicomDirStudy + * -> DicomDirSerie + * -> DicomDirImage */ class GDCM_EXPORT DicomDir: public Document { + gdcmTypeMacro(DicomDir); + public: - DicomDir( std::string const & filename, bool parseDir = false ); - DicomDir(); - - ~DicomDir(); + static DicomDir *New() {return new DicomDir();} - /// \brief canonical Printer - /// \sa SetPrintLevel - void Print(std::ostream &os = std::cout); + typedef void Method(void*); - /// Informations contained in the parser + 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(); /// Returns a pointer to the DicomDirMeta for this DICOMDIR. - DicomDirMeta* GetDicomDirMeta() { return MetaElems; }; + DicomDirMeta *GetMeta() { return MetaElems; } + + // Patients + DicomDirPatient *NewPatient(); + void ClearPatient(); - /// Returns the PATIENT chained List for this DICOMDIR. - ListDicomDirPatient const & GetDicomDirPatients() const { return Patients; }; + DicomDirPatient *GetFirstPatient(); + DicomDirPatient *GetNextPatient(); - /// Parsing + // Parsing void ParseDirectory(); - - void SetStartMethod(Method*, void* = NULL, Method* = NULL); - void SetStartMethodArgDelete(Method*); - void SetProgressMethod(Method* ,void* = NULL, Method* = NULL); - void SetProgressMethodArgDelete(Method*); - void SetEndMethod(Method*, void* = NULL,Method* = NULL); - void SetEndMethodArgDelete(Method*); - /// GetProgress GetProgress - float GetProgress() { return Progress; }; + // 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 ); + void SetProgressMethod( DicomDir::Method *method, + void *arg = NULL ); + void SetEndMethod( DicomDir::Method *method, + 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; } /// AbortProgress AbortProgress - void AbortProgress() { Abort = true; }; - + void AbortProgress() { Abort = true; } /// IsAborted IsAborted - bool IsAborted() { return Abort; }; - - /// Adding - DicomDirMeta* NewMeta(); - DicomDirPatient* NewPatient(); + bool IsAborted() { return Abort; } - /// Write - bool WriteDicomDir(std::string const & fileName); + // Write + bool Write(std::string const &fileName); + + bool Anonymize(); /// Types of the DicomDirObject within the DicomDir typedef enum @@ -97,11 +135,15 @@ public: GDCM_DICOMDIR_PATIENT, GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE, + GDCM_DICOMDIR_VISIT, GDCM_DICOMDIR_IMAGE } DicomDirType; protected: - void CreateDicomDirChainedList(std::string const & path); + DicomDir(); + ~DicomDir(); + + void CreateDicomDirChainedList(std::string const &path); void CallStartMethod(); void CallProgressMethod(); void CallEndMethod(); @@ -109,48 +151,52 @@ protected: private: void Initialize(); void CreateDicomDir(); - void AddDicomDirMeta(); - void AddDicomDirPatientToEnd(SQItem* s); - void AddDicomDirStudyToEnd (SQItem* s); - void AddDicomDirSerieToEnd (SQItem* s); - void AddDicomDirImageToEnd (SQItem* s); - - void SetElements(std::string const & path, VectDocument const &list); - void SetElement (std::string const & path, DicomDirType type, - Document* header); - - static bool HeaderLessThan(Document* header1, Document* header2); + 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); + + 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 //-----------------------------------------------------------------------------