X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDir.h;h=40772ca8ddcd3aee59abca3d2a8cc614d92a497d;hb=00e89cde772e18e4f2baab2b01680330af909d59;hp=fdb03622805aeb9d261e47f9c2fffc21fabbdd5b;hpb=19c54f9be7d29dcdd8fbb56b6308e55ed230441d;p=gdcm.git diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h index fdb03622..40772ca8 100644 --- a/src/gdcmDicomDir.h +++ b/src/gdcmDicomDir.h @@ -1,9 +1,24 @@ -// gdcmDicomDir.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDicomDir.h,v $ + Language: C++ + Date: $Date: 2004/10/09 03:21:55 $ + Version: $Revision: 1.33 $ + + 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 "gdcmHeader.h" #include "gdcmCommon.h" #include "gdcmDocument.h" #include "gdcmDicomDirPatient.h" @@ -14,10 +29,10 @@ #include //----------------------------------------------------------------------------- -typedef std::list ListDicomDirPatient; -typedef std::vector VectDocument; +typedef std::list ListDicomDirPatient; +typedef std::vector VectDocument; -typedef GDCM_EXPORT void(gdcmMethod)(void * = NULL); +typedef GDCM_EXPORT void(gdcmMethod)(void* = NULL); //----------------------------------------------------------------------------- /** @@ -28,71 +43,51 @@ typedef GDCM_EXPORT void(gdcmMethod)(void * = NULL); class GDCM_EXPORT gdcmDicomDir: public gdcmDocument { public: -// gdcmDicomDir(ListTag *l, -// bool exception_on_error = false); - gdcmDicomDir(const char *FileName, - bool parseDir = false, - bool exception_on_error = false); - gdcmDicomDir(bool exception_on_error = false); + gdcmDicomDir( std::string const & fileName, bool parseDir = false ); + gdcmDicomDir(); - ~gdcmDicomDir(void); - - /** - * \ingroup gdcmDicomDir - * \brief Sets the print level for the Dicom Header - * \note 0 for Light Print; 1 for 'medium' Print, 2 for Heavy - */ - void SetPrintLevel(int level) - { printLevel = level; }; - /** - * \ingroup gdcmDicomDir - * \brief canonical Printer - * \sa SetPrintLevel - */ + ~gdcmDicomDir(); + + /// \brief canonical Printer + /// \sa SetPrintLevel virtual void Print(std::ostream &os = std::cout); -// Informations contained in the parser - virtual bool IsReadable(void); + /// Informations contained in the parser + virtual bool IsReadable(); -/// \brief returns a pointer to the gdcmDicomDirMeta for this DICOMDIR. - inline gdcmDicomDirMeta *GetDicomDirMeta() - {return metaElems;}; + /// Returns a pointer to the gdcmDicomDirMeta for this DICOMDIR. + gdcmDicomDirMeta* GetDicomDirMeta() { return MetaElems; }; - /// \brief returns the PATIENT chained List for this DICOMDIR. - inline ListDicomDirPatient &GetDicomDirPatients() - {return patients;}; + /// Returns the PATIENT chained List for this DICOMDIR. + ListDicomDirPatient &GetDicomDirPatients() { return Patients; }; -// Parsing - void ParseDirectory(void); + /// Parsing + void ParseDirectory(); - 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 *); - -/// \brief GetProgress GetProgress - inline float GetProgress(void) - {return(progress);}; - -/// \brief AbortProgress AbortProgress - inline void AbortProgress(void) - {abort=true; }; - -/// \brief IsAborted IsAborted - inline bool IsAborted(void) - {return(abort); }; + 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*); + + /// GetProgress GetProgress + float GetProgress() { return Progress; }; + + /// AbortProgress AbortProgress + void AbortProgress() { Abort = true; }; + + /// IsAborted IsAborted + bool IsAborted() { return Abort; }; -// Adding - gdcmDicomDirMeta * NewMeta(void); - gdcmDicomDirPatient * NewPatient(void); + /// Adding + gdcmDicomDirMeta* NewMeta(); + gdcmDicomDirPatient* NewPatient(); -// Write - void WriteEntries(FILE *_fp); - bool Write(std::string fileName); + /// Write + bool WriteDicomDir(std::string const & fileName); -/// Types of the gdcmObject within the gdcmDicomDir + /// Types of the gdcmDicomDirObject within the gdcmDicomDir typedef enum { GDCM_DICOMDIR_NONE, @@ -100,63 +95,60 @@ public: GDCM_DICOMDIR_PATIENT, GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE, - GDCM_DICOMDIR_IMAGE, + GDCM_DICOMDIR_IMAGE } gdcmDicomDirType; protected: - void CreateDicomDirChainedList(std::string path); - - void CallStartMethod(void); - void CallProgressMethod(void); - void CallEndMethod(void); + void CreateDicomDirChainedList(std::string const & path); + void CallStartMethod(); + void CallProgressMethod(); + void CallEndMethod(); private: - void CreateDicomDir(void); -// void AddObjectToEnd(gdcmDicomDirType type, gdcmSQItem *s); - void AddDicomDirMeta (); - void AddDicomDirPatientToEnd(gdcmSQItem *s); - void AddDicomDirStudyToEnd (gdcmSQItem *s); - void AddDicomDirSerieToEnd (gdcmSQItem *s); - void AddDicomDirImageToEnd (gdcmSQItem *s); + void Initialize(); + void CreateDicomDir(); + void AddDicomDirMeta(); + void AddDicomDirPatientToEnd(gdcmSQItem* s); + void AddDicomDirStudyToEnd (gdcmSQItem* s); + void AddDicomDirSerieToEnd (gdcmSQItem* s); + void AddDicomDirImageToEnd (gdcmSQItem* s); void SetElements(std::string &path, VectDocument &list); void SetElement (std::string &path,gdcmDicomDirType type, - gdcmDocument *header); - - void UpdateDirectoryRecordSequenceLength(void); + gdcmDocument* header); - static bool HeaderLessThan(gdcmDocument *header1,gdcmDocument *header2); + static bool HeaderLessThan(gdcmDocument* header1,gdcmDocument* header2); // Variables -/// \brief pointer on *the* gdcmObject 'DicomDirMeta Elements' - gdcmDicomDirMeta *metaElems; - -/// \brief chained list of DicomDirPatient (to be exploited recursively) - ListDicomDirPatient patients; - -/// pointer to the initialisation method for any progress bar - gdcmMethod *startMethod; -/// pointer to the incrementation method for any progress bar - gdcmMethod *progressMethod; -/// pointer to the tremination method for any progress bar - gdcmMethod *endMethod; -/// pointer to the ??? method for any progress bar - gdcmMethod *startMethodArgDelete; -/// pointer to the ??? method for any progress bar - gdcmMethod *progressMethodArgDelete; -/// pointer to the ??? method for any progress bar - gdcmMethod *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; + /// Pointer on *the* gdcmDicomDirObject 'DicomDirMeta Elements' + gdcmDicomDirMeta* MetaElems; + + /// Chained list of DicomDirPatient (to be exploited recursively) + ListDicomDirPatient Patients; + + /// pointer to the initialisation method for any progress bar + gdcmMethod* StartMethod; + /// pointer to the incrementation method for any progress bar + gdcmMethod* ProgressMethod; + /// pointer to the termination method for any progress bar + gdcmMethod* EndMethod; + /// pointer to the ??? method for any progress bar + gdcmMethod* StartMethodArgDelete; + /// pointer to the ??? method for any progress bar + gdcmMethod* ProgressMethodArgDelete; + /// pointer to the ??? method for any progress bar + gdcmMethod* 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; }; //-----------------------------------------------------------------------------