X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=c7605f6211a53edc74407af990e2dffd3ea10400;hb=1d69b92978803204089d270599133917d944c651;hp=3eb1b625fa05a962bb7a3983e593141eafb410dd;hpb=fae5f95ae8cf044c024b1793b94032c9368f0f4b;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 3eb1b625..c7605f62 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -1,62 +1,157 @@
-// gdcmDicomDir.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+  
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDicomDir.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:44 $
+  Version:   $Revision: 1.34 $
+  
+  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 "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirMeta.h"
 #include "gdcmDicomDirElement.h"
 
+#include <list>
+#include <vector>
+namespace gdcm 
+{
+
 //-----------------------------------------------------------------------------
-typedef std::list<gdcmPatient *> ListPatient;
-typedef std::list<gdcmHeader *>  ListHeader;
+typedef std::list<DicomDirPatient*>   ListDicomDirPatient;
+typedef std::vector<Document*>  VectDocument;
 
+typedef GDCM_EXPORT void(Method)(void* = NULL);
 //-----------------------------------------------------------------------------
-/*
- * \defgroup gdcmDicomDir
- * \brief    gdcmDicomDir defines an object representing a DICOMDIR in memory.
+
+/**
+ * \ingroup DicomDir
+ * \brief    DicomDir defines an object representing a DICOMDIR in memory.
  *
  */
-class GDCM_EXPORT gdcmDicomDir: public gdcmParser
+class GDCM_EXPORT DicomDir: public Document
 {
 public:
-   gdcmDicomDir(ListTag *l,           bool exception_on_error = false);
-   gdcmDicomDir(const char *FileName,bool exception_on_error = false);
-   
-   ~gdcmDicomDir(void);
+   DicomDir( std::string const & fileName, bool parseDir = false );
+   DicomDir(); 
+                   
+   ~DicomDir();
 
-   void SetPrintLevel(int level) { printLevel = level; };
+   /// \brief   canonical Printer 
+   /// \sa    SetPrintLevel
    virtual void Print(std::ostream &os = std::cout);
 
-   inline ListPatient &GetPatients() {return patients;};
-   bool   Write(std::string fileName);
+   /// Informations contained in the parser
+   virtual bool IsReadable();
+
+   /// Returns a pointer to the DicomDirMeta for this DICOMDIR. 
+   DicomDirMeta* GetDicomDirMeta() { return MetaElems; };
+
+   /// Returns the PATIENT chained List for this DICOMDIR.    
+   ListDicomDirPatient &GetDicomDirPatients() { return Patients; };
+
+   /// Parsing
+   void ParseDirectory();
+   
+   void SetStartMethod(Method*, void* = NULL, Method* = NULL);
+   void SetStartMethodArgDelete(Method*);
+   void SetProgressMethod(Method* ,void* = NULL, Method* = NULL);
+   void SetProgressMethodArgDelete(Method*);
+   void SetEndMethod(Method*, void* = NULL,Method* = NULL);
+   void SetEndMethodArgDelete(Method*);
+
+   /// GetProgress GetProgress
+   float GetProgress()  { return Progress; };
+
+   /// AbortProgress AbortProgress
+   void  AbortProgress() { Abort = true; };
+
+   /// IsAborted IsAborted
+   bool  IsAborted() { return Abort; };
+   
+   /// Adding
+   DicomDirMeta*    NewMeta();
+   DicomDirPatient* NewPatient();
+
+   /// Write  
+   bool WriteDicomDir(std::string const & fileName);
 
+   /// Types of the DicomDirObject within the DicomDir
    typedef enum
    {
-      GDCM_NONE,
-      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_IMAGE
+   } DicomDirType;
    
 protected:
-   void NewDicomDir(std::string path);
+   void CreateDicomDirChainedList(std::string const & path);
+   void CallStartMethod();
+   void CallProgressMethod();
+   void CallEndMethod();
 
 private:
-   void CreateDicomDir(void);
-   void AddObjectToEnd(gdcmDicomDirType type,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 Initialize();
+   void CreateDicomDir();
+   void AddDicomDirMeta();
+   void AddDicomDirPatientToEnd(SQItem* s);
+   void AddDicomDirStudyToEnd  (SQItem* s);
+   void AddDicomDirSerieToEnd  (SQItem* s);
+   void AddDicomDirImageToEnd  (SQItem* s);
 
-   void SetElements(std::string &path,ListHeader &list);
-   void SetElement(std::string &path,gdcmDicomDirType type,gdcmHeader *header);
+   void SetElements(std::string &path, VectDocument &list);
+   void SetElement (std::string &path,DicomDirType type,
+                    Document* header);
 
-   ListPatient patients;
-};
+   static bool HeaderLessThan(Document* header1,Document* header2);
+   
+// Variables
+
+   /// Pointer on *the* DicomDirObject 'DicomDirMeta Elements'
+   DicomDirMeta* MetaElems;
 
+   /// Chained list of DicomDirPatient (to be exploited recursively) 
+   ListDicomDirPatient Patients;
+
+   /// 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