X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=7a5af4303ca529569e1ec02a675d36c3cccb9d34;hb=bcb8af026dee96c6c8452d0160556f148fd1d4be;hp=1426b6317bdb915469b32e4652275dfc4f0be409;hpb=4bdf977b8a564a425e9ac35787bb3a5ce50047fb;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 1426b631..7a5af430 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -1,35 +1,172 @@
-// gdcmDICOMDIR.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+  
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDir.h,v $
+  Language:  C++
+  Date:      $Date: 2005/02/11 15:22:18 $
+  Version:   $Revision: 1.56 $
+  
+  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 "gdcmPatient.h"
+#include "gdcmDocument.h"
+
+#include <list>
+#include <vector>
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
+class DicomDirPatient;
+class DicomDirMeta;
+class DicomDirElement;
+class DicomDirStudy;
+class DicomDirSerie;
+class DicomDirImage;
+class SQItem;
 
-typedef std::list<gdcmPatient *> lPatient;
+typedef std::list<DicomDirPatient *>   ListDicomDirPatient;
+typedef std::vector<Document *>  VectDocument;
 
 //-----------------------------------------------------------------------------
-/*
- * \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 
+ *                                -> DicomDirSerie
+ *                                    -> DicomDirImage
  */
-class GDCM_EXPORT gdcmDicomDir: public gdcmParser {
+class GDCM_EXPORT DicomDir: public Document
+{
 public:
+   typedef void(Method)(void*);
+
+   DicomDir( std::string const &filename, bool parseDir = false );
+   DicomDir(); 
+                   
+   ~DicomDir();
+
+   void Print(std::ostream &os = std::cout, std::string const &indent = "" );
+
+   // 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();
+
+   // Parsing
+   void ParseDirectory();
 
-   gdcmDicomDir(std::string &FileName,bool exception_on_error = false );
-   ~gdcmDicomDir();
+   // 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 *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 );
 
-   inline lPatient &GetPatients() {return patients;};
-   inline void AddPatient(gdcmPatient *patient) {patients.push_back(patient);};
+   /// GetProgress GetProgress
+   float GetProgress()  { return Progress; };
+   /// AbortProgress AbortProgress
+   void  AbortProgress() { Abort = true; };
+   /// IsAborted IsAborted
+   bool  IsAborted() { return Abort; };
+
+   // Write
+   bool WriteDicomDir(std::string const &fileName);
+
+   /// Types of the DicomDirObject within the DicomDir
+   typedef enum
+   {
+      GDCM_DICOMDIR_NONE,
+      GDCM_DICOMDIR_META,
+      GDCM_DICOMDIR_PATIENT,
+      GDCM_DICOMDIR_STUDY,
+      GDCM_DICOMDIR_SERIE,
+      GDCM_DICOMDIR_IMAGE
+   } DicomDirType;
    
+protected:
+   void CreateDicomDirChainedList(std::string const &path);
+   void CallStartMethod();
+   void CallProgressMethod();
+   void CallEndMethod();
+
 private:
-   lPatient patients;
+   void Initialize();
+   void CreateDicomDir();
 
-};
+   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(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;
+
+   /// 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;
+};
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif