X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=eb2ac4d7a38a5ac17ea6744353145470c14d9c48;hb=76ac46b16fd92d0fb444f786d4946424d9029315;hp=2a524f3e13a1b24c55e6d0246f818ac5d1e5ca0c;hpb=4289ddedc713b40cb0af61e19e788bc63f0e5af0;p=gdcm.git diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index 2a524f3e..eb2ac4d7 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/08/31 09:29:12 $ - Version: $Revision: 1.68 $ + Date: $Date: 2007/09/17 12:16:02 $ + Version: $Revision: 1.82 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,8 +16,8 @@ =========================================================================*/ -#ifndef GDCMDICOMDIR_H -#define GDCMDICOMDIR_H +#ifndef _GDCMDICOMDIR_H_ +#define _GDCMDICOMDIR_H_ #include "gdcmDocument.h" #include "gdcmDebug.h" @@ -25,7 +25,7 @@ #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- class DicomDirPatient; @@ -35,6 +35,7 @@ class DicomDirStudy; class DicomDirSerie; class DicomDirVisit; class DicomDirImage; +class DicomDirPrivate; class SQItem; typedef std::list ListDicomDirPatient; @@ -43,36 +44,36 @@ typedef std::vector VectDocument; //----------------------------------------------------------------------------- /** * \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 + * -> DicomDirVisit + * -> DicomDirSerie + * -> DicomDirImage + * -> DicomDirPrivate (for Siemens CSA non image) */ class GDCM_EXPORT DicomDir: public Document { -public: - typedef void Method(void*); + gdcmTypeMacro(DicomDir); - DicomDir(); - GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ); - ~DicomDir(); +public: +/// \brief Constructs a DicomDir with a RefCounter + static DicomDir *New() {return new DicomDir();} - GDCM_LEGACY( bool Load(std::string const &filename) ); +// 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) + 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) + Filename = dirName, IsDocumentModified = true;} + /// Accessor to 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(); @@ -87,36 +88,14 @@ public: DicomDirPatient *GetFirstPatient(); DicomDirPatient *GetNextPatient(); - + /// returns the number of Patients currently held in the gdcm::DicomDir + int GetNumberOfPatients() { return Patients.size();} + // 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 ); - 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; } + float GetProgress() const { return Progress; } /// AbortProgress AbortProgress void AbortProgress() { Abort = true; } /// IsAborted IsAborted @@ -127,6 +106,8 @@ public: bool Anonymize(); + virtual void Copy(DocEntrySet *set); + /// Types of the DicomDirObject within the DicomDir typedef enum { @@ -136,32 +117,35 @@ public: GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE, GDCM_DICOMDIR_VISIT, - GDCM_DICOMDIR_IMAGE + GDCM_DICOMDIR_IMAGE, + GDCM_DICOMDIR_PRIVATE } DicomDirType; - + protected: + DicomDir(); + ~DicomDir(); +// GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ) + 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); - + bool AddPatientToEnd(DicomDirPatient *dd); + bool AddStudyToEnd (DicomDirStudy *dd); + bool AddSerieToEnd (DicomDirSerie *dd); + bool AddVisitToEnd (DicomDirVisit *dd); + bool AddImageToEnd (DicomDirImage *dd); + bool AddPrivateToEnd(DicomDirPrivate *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' @@ -171,29 +155,9 @@ private: 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 //-----------------------------------------------------------------------------