Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2005/01/06 20:03:26 $
- Version: $Revision: 1.43 $
+ Date: $Date: 2005/07/08 10:13:38 $
+ Version: $Revision: 1.62 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
typedef std::vector<Document *> VectDocument;
//-----------------------------------------------------------------------------
-
/**
- * \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
{
public:
- typedef void(Method)(void*);
+ typedef void Method(void*);
DicomDir( std::string const &filename, bool parseDir = false );
DicomDir();
~DicomDir();
- /// \brief canonical Printer
- void Print(std::ostream &os = std::cout);
-
- /// Informations contained in the parser
+ 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
+ void SetParseDir(bool parseDir) { ParseDir = 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; };
- /// Returns the PATIENT chained List for this DICOMDIR.
- ListDicomDirPatient const & GetDicomDirPatients() const { return Patients; };
+ // Patients
+ DicomDirPatient *NewPatient();
+ void ClearPatient();
+
+ DicomDirPatient *GetFirstPatient();
+ DicomDirPatient *GetNextPatient();
- /// Parsing
+ // 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 *m,
- void* = NULL,
- DicomDir::Method *m = NULL );
- void SetProgressMethod( DicomDir::Method *m,
- void* = NULL,
- DicomDir::Method *m = NULL );
- void SetEndMethod( DicomDir::Method *m,
- void* = NULL,
- DicomDir::Method *m = NULL );
- void SetStartMethodArgDelete( DicomDir::Method *m );
+ // for the reasons of this unnecessary 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 );
+ void SetEndMethodArgDelete ( DicomDir::Method *m );
/// GetProgress GetProgress
float GetProgress() { return Progress; };
-
/// AbortProgress AbortProgress
void AbortProgress() { Abort = true; };
-
/// IsAborted IsAborted
bool IsAborted() { return Abort; };
-
- /// Adding
- DicomDirMeta *NewMeta();
- DicomDirPatient *NewPatient();
- /// Write
+ // Write
bool WriteDicomDir(std::string const &fileName);
+ bool AnonymizeDicomDir();
+
/// Types of the DicomDirObject within the DicomDir
typedef enum
{
private:
void Initialize();
void CreateDicomDir();
-
- bool AddDicomDirMeta();
- bool AddDicomDirPatientToEnd(DicomDirPatient *dd);
- bool AddDicomDirStudyToEnd (DicomDirStudy *dd);
- bool AddDicomDirSerieToEnd (DicomDirSerie *dd);
- bool AddDicomDirImageToEnd (DicomDirImage *dd);
+ bool DoTheLoadingJob();
+ bool AddPatientToEnd(DicomDirPatient *dd);
+ bool AddStudyToEnd (DicomDirStudy *dd);
+ bool AddSerieToEnd (DicomDirSerie *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(SQItem *dst,SQItem *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;
+ 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
//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff