X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=eb2ac4d7a38a5ac17ea6744353145470c14d9c48;hb=721d134c6e594b9a23bf1ce002ed87bfbc1576a7;hp=73cf77e57d0da0ad0b03c710435765226c0cc0fe;hpb=b442d0142cdd33c0d02fd3fa6e57138a7c4a9e0a;p=gdcm.git diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index 73cf77e5..eb2ac4d7 100644 --- a/src/gdcmDicomDir.h +++ b/src/gdcmDicomDir.h @@ -1,114 +1,164 @@ -// gdcmDicomDir.h -//----------------------------------------------------------------------------- -#ifndef GDCMDICOMDIR_H -#define GDCMDICOMDIR_H - -#include "gdcmHeader.h" -#include "gdcmCommon.h" -#include "gdcmPatient.h" -#include "gdcmMeta.h" -#include "gdcmDicomDirElement.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDir.h,v $ + Language: C++ + 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 + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + +#ifndef _GDCMDICOMDIR_H_ +#define _GDCMDICOMDIR_H_ + +#include "gdcmDocument.h" +#include "gdcmDebug.h" #include #include +namespace GDCM_NAME_SPACE +{ //----------------------------------------------------------------------------- -typedef std::list ListPatient; -typedef std::vector ListHeader; +class DicomDirPatient; +class DicomDirMeta; +class DicomDirElement; +class DicomDirStudy; +class DicomDirSerie; +class DicomDirVisit; +class DicomDirImage; +class DicomDirPrivate; +class SQItem; + +typedef std::list ListDicomDirPatient; +typedef std::vector VectDocument; -typedef GDCM_EXPORT void( gdcmMethod)(void * =NULL); //----------------------------------------------------------------------------- -/* - * \defgroup gdcmDicomDir - * \brief gdcmDicomDir 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 + * -> DicomDirVisit + * -> DicomDirSerie + * -> DicomDirImage + * -> DicomDirPrivate (for Siemens CSA non image) */ -class GDCM_EXPORT gdcmDicomDir: public gdcmParser +class GDCM_EXPORT DicomDir: public Document { + gdcmTypeMacro(DicomDir); + public: -// gdcmDicomDir(ListTag *l, bool exception_on_error = false); - gdcmDicomDir(const char *FileName, - bool parseDir = false, - bool exception_on_error = false); +/// \brief Constructs a DicomDir with a RefCounter + static DicomDir *New() {return new DicomDir();} + +// 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 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(); + /// Returns a pointer to the DicomDirMeta for this DICOMDIR. + DicomDirMeta *GetMeta() { return MetaElems; } + + // Patients + DicomDirPatient *NewPatient(); + void ClearPatient(); + + DicomDirPatient *GetFirstPatient(); + DicomDirPatient *GetNextPatient(); + /// returns the number of Patients currently held in the gdcm::DicomDir + int GetNumberOfPatients() { return Patients.size();} - ~gdcmDicomDir(void); - - void SetPrintLevel(int level) { printLevel = level; }; - virtual void Print(std::ostream &os = std::cout); + // Parsing + void ParseDirectory(); -// Informations contained in the parser - virtual bool IsReadable(void); - inline gdcmMeta *GetMeta() {return metaElems;}; - inline ListPatient &GetPatients() {return patients;}; + /// GetProgress GetProgress + float GetProgress() const { return Progress; } + /// AbortProgress AbortProgress + void AbortProgress() { Abort = true; } + /// IsAborted IsAborted + bool IsAborted() { return Abort; } -// Parsing - void ParseDirectory(void); + // Write + bool Write(std::string const &fileName); - void SetStartMethod(gdcmMethod *,void * =NULL,gdcmMethod * =NULL); - void SetStartMethodArgDelete(gdcmMethod *); - void SetProgressMethod(gdcmMethod *,void * =NULL,gdcmMethod * =NULL); - void SetProgressMethodArgDelete(gdcmMethod *); - void SetEndMethod(gdcmMethod *,void * =NULL,gdcmMethod * =NULL); - void SetEndMethodArgDelete(gdcmMethod *); + bool Anonymize(); - inline float GetProgress(void) {return(progress);}; + virtual void Copy(DocEntrySet *set); - inline void AbortProgress(void) {abort=true;}; - inline bool IsAborted(void) {return(abort);}; - -// Write - bool Write(std::string fileName); - -// Types + /// Types of the DicomDirObject within the DicomDir typedef enum { - GDCM_NONE, - GDCM_META, - GDCM_PATIENT, - GDCM_STUDY, - GDCM_SERIE, - GDCM_IMAGE, - } gdcmDicomDirType; - + GDCM_DICOMDIR_NONE, + GDCM_DICOMDIR_META, + GDCM_DICOMDIR_PATIENT, + GDCM_DICOMDIR_STUDY, + GDCM_DICOMDIR_SERIE, + GDCM_DICOMDIR_VISIT, + GDCM_DICOMDIR_IMAGE, + GDCM_DICOMDIR_PRIVATE + } DicomDirType; + protected: - void NewDicomDir(std::string path); - std::string GetPath(void); + DicomDir(); + ~DicomDir(); +// GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ) - void CallStartMethod(void); - void CallProgressMethod(void); - void CallEndMethod(void); + void CreateDicomDirChainedList(std::string const &path); private: - void CreateDicomDir(void); - void AddObjectToEnd(gdcmDicomDirType type, - ListTag::iterator begin,ListTag::iterator end); - void AddMetaToEnd (ListTag::iterator begin,ListTag::iterator end); - void AddPatientToEnd(ListTag::iterator begin,ListTag::iterator end); - void AddStudyToEnd (ListTag::iterator begin,ListTag::iterator end); - void AddSerieToEnd (ListTag::iterator begin,ListTag::iterator end); - void AddImageToEnd (ListTag::iterator begin,ListTag::iterator end); - - void SetElements(std::string &path,ListHeader &list); - void SetElement (std::string &path,gdcmDicomDirType type,gdcmHeader *header); - - static bool HeaderLessThan(gdcmHeader *header1,gdcmHeader *header2); - - gdcmMeta *metaElems; - ListPatient patients; - - gdcmMethod *startMethod; - gdcmMethod *progressMethod; - gdcmMethod *endMethod; - gdcmMethod *startMethodArgDelete; - gdcmMethod *progressMethodArgDelete; - gdcmMethod *endMethodArgDelete; - void *startArg; - void *progressArg; - void *endArg; - - float progress; - bool abort; -}; + 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 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' + DicomDirMeta *MetaElems; + + /// Chained list of DicomDirPatient (to be exploited hierarchicaly) + ListDicomDirPatient Patients; + ListDicomDirPatient::iterator ItPatient; + + /// value of the ??? for any progress bar + bool ParseDir; + +}; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif