X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDicomDir.h;h=c77f91a521781a529416f8b602a63ca5057142df;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=40772ca8ddcd3aee59abca3d2a8cc614d92a497d;hpb=28d134e7a6dcc11f3703bb8ec85334636f57f56e;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 40772ca8..c77f91a5 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/09 03:21:55 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2004/11/16 10:25:53 $
+  Version:   $Revision: 1.39 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,48 +28,60 @@
 #include <list>
 #include <vector>
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
-typedef std::list<gdcmDicomDirPatient*>   ListDicomDirPatient;
-typedef std::vector<gdcmDocument*>  VectDocument;
+typedef std::list<DicomDirPatient*>   ListDicomDirPatient;
+typedef std::vector<Document*>  VectDocument;
 
-typedef GDCM_EXPORT void(gdcmMethod)(void* = NULL);
 //-----------------------------------------------------------------------------
 
 /**
- * \ingroup 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 gdcmDocument
+class GDCM_EXPORT DicomDir: public Document
 {
 public:
-   gdcmDicomDir( std::string const & fileName, bool parseDir = false );
-   gdcmDicomDir(); 
+   typedef void(Method)(void*);
+
+   DicomDir( std::string const & filename, bool parseDir = false );
+   DicomDir(); 
                    
-   ~gdcmDicomDir();
+   ~DicomDir();
 
    /// \brief   canonical Printer 
    /// \sa    SetPrintLevel
-   virtual void Print(std::ostream &os = std::cout);
+   void Print(std::ostream &os = std::cout);
 
    /// Informations contained in the parser
    virtual bool IsReadable();
 
-   /// Returns a pointer to the gdcmDicomDirMeta for this DICOMDIR. 
-   gdcmDicomDirMeta* GetDicomDirMeta() { return MetaElems; };
+   /// 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; };
+   ListDicomDirPatient const & GetDicomDirPatients() const { return Patients; };
 
    /// 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*);
+   // 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*,
+                           void* = NULL,
+                           DicomDir::Method* = NULL );
+   void SetProgressMethod( DicomDir::Method*, 
+                           void* = NULL,
+                           DicomDir::Method* = NULL );
+   void SetEndMethod(      DicomDir::Method*,
+                           void* = NULL, 
+                           DicomDir::Method* = NULL );
+   void SetStartMethodArgDelete( DicomDir::Method* );
+   void SetProgressMethodArgDelete( DicomDir::Method* );
+   void SetEndMethodArgDelete( DicomDir::Method* );
 
    /// GetProgress GetProgress
    float GetProgress()  { return Progress; };
@@ -81,13 +93,13 @@ public:
    bool  IsAborted() { return Abort; };
    
    /// Adding
-   gdcmDicomDirMeta*    NewMeta();
-   gdcmDicomDirPatient* NewPatient();
+   DicomDirMeta*    NewMeta();
+   DicomDirPatient* NewPatient();
 
    /// Write  
    bool WriteDicomDir(std::string const & fileName);
 
-   /// Types of the gdcmDicomDirObject within the gdcmDicomDir
+   /// Types of the DicomDirObject within the DicomDir
    typedef enum
    {
       GDCM_DICOMDIR_NONE,
@@ -96,7 +108,7 @@ public:
       GDCM_DICOMDIR_STUDY,
       GDCM_DICOMDIR_SERIE,
       GDCM_DICOMDIR_IMAGE
-   } gdcmDicomDirType;
+   } DicomDirType;
    
 protected:
    void CreateDicomDirChainedList(std::string const & path);
@@ -108,37 +120,37 @@ private:
    void Initialize();
    void CreateDicomDir();
    void AddDicomDirMeta();
-   void AddDicomDirPatientToEnd(gdcmSQItem* s);
-   void AddDicomDirStudyToEnd  (gdcmSQItem* s);
-   void AddDicomDirSerieToEnd  (gdcmSQItem* s);
-   void AddDicomDirImageToEnd  (gdcmSQItem* s);
+   void AddDicomDirPatientToEnd(SQItem* s);
+   void AddDicomDirStudyToEnd  (SQItem* s);
+   void AddDicomDirSerieToEnd  (SQItem* s);
+   void AddDicomDirImageToEnd  (SQItem* s);
 
-   void SetElements(std::string &path, VectDocument &list);
-   void SetElement (std::string &path,gdcmDicomDirType type,
-                    gdcmDocument* header);
+   void SetElements(std::string const & path, VectDocument const &list);
+   void SetElement (std::string const & path, DicomDirType type,
+                    Document* header);
 
-   static bool HeaderLessThan(gdcmDocument* header1,gdcmDocument* header2);
+   static bool HeaderLessThan(Document* header1, Document* header2);
    
 // Variables
 
-   /// Pointer on *the* gdcmDicomDirObject 'DicomDirMeta Elements'
-   gdcmDicomDirMeta* MetaElems;
+   /// 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   
-   gdcmMethod* StartMethod;
+   Method* StartMethod;
    /// pointer to the incrementation method for any progress bar
-   gdcmMethod* ProgressMethod;
+   Method* ProgressMethod;
    /// pointer to the termination method for any progress bar
-   gdcmMethod* EndMethod;
+   Method* EndMethod;
    /// pointer to the ??? method for any progress bar   
-   gdcmMethod* StartMethodArgDelete;
+   Method* StartMethodArgDelete;
    /// pointer to the ??? method for any progress bar
-   gdcmMethod* ProgressMethodArgDelete;
+   Method* ProgressMethodArgDelete;
    /// pointer to the ??? method for any progress bar
-   gdcmMethod* EndMethodArgDelete;
+   Method* EndMethodArgDelete;
    /// pointer to the ??? for any progress bar   
    void* StartArg;
    /// pointer to the ??? for any progress bar
@@ -150,6 +162,6 @@ private:
    /// value of the ??? for any progress bar   
    bool Abort;
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif