X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.h;h=11f379f9359f89652004cc44ba7632e914f622ca;hb=a33271fe1b265854dd8ff69301a7e7777b04f2d1;hp=2a524f3e13a1b24c55e6d0246f818ac5d1e5ca0c;hpb=4289ddedc713b40cb0af61e19e788bc63f0e5af0;p=gdcm.git

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index 2a524f3e..11f379f9 100644
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/31 09:29:12 $
-  Version:   $Revision: 1.68 $
+  Date:      $Date: 2005/11/29 17:21:34 $
+  Version:   $Revision: 1.73 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,14 +50,12 @@ typedef std::vector<Document *> VectDocument;
  */
 class GDCM_EXPORT DicomDir: public Document
 {
-public:
-   typedef void Method(void*);
+   gdcmTypeMacro(DicomDir);
 
-   DicomDir(); 
-   GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ); 
-   ~DicomDir();
+public:
+/// \brief Constructs a DicomDir with a RefCounter
+   static DicomDir *New() {return new DicomDir();}
 
-   GDCM_LEGACY( bool Load(std::string const &filename) );
    bool Load( );
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
    
@@ -69,9 +67,6 @@ public:
    virtual void SetFileName(std::string const &fileName) 
                    { ParseDir = false; if (Filename != fileName)
                               Filename = fileName, IsDocumentModified = true;}
-
-   /// DEPRECATED : use SetDirectoryName
-   GDCM_LEGACY( void SetParseDir(bool parseDir) );
    
    // Informations contained in the parser
    virtual bool IsReadable();
@@ -91,32 +86,8 @@ public:
    // 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 unnecessary notation at C++ level.
-   void SetStartMethod(    DicomDir::Method *method,
-                           void *arg = NULL );
-   void SetProgressMethod( DicomDir::Method *method,
-                           void *arg = NULL );
-   void SetEndMethod(      DicomDir::Method *method,
-                           void *arg = NULL );
-   // Note: replace DicomDir::Method *method to void(*method)(void *) to
-   //       avoid wrapping problems with the typemap conversions
-   void SetStartMethod(    void(*method)(void *), // DicomDir::Method *method
-                           void *arg,
-                           void(*argDelete)(void *));
-   void SetProgressMethod( void(*method)(void *), // DicomDir::Method *method
-                           void *arg,
-                           void(*argDelete)(void *));
-   void SetEndMethod(      void(*method)(void *), // DicomDir::Method *method
-                           void *arg, 
-                           void(*argDelete)(void *));
-   void SetStartMethodArgDelete   ( DicomDir::Method *method );
-   void SetProgressMethodArgDelete( DicomDir::Method *method );
-   void SetEndMethodArgDelete     ( DicomDir::Method *method );
-
    /// GetProgress GetProgress
-   float GetProgress()   { return Progress; }
+   float GetProgress() const { return Progress; }
    /// AbortProgress AbortProgress
    void  AbortProgress() { Abort = true; }
    /// IsAborted IsAborted
@@ -127,6 +98,8 @@ public:
 
    bool Anonymize();
 
+   virtual void Copy(DocEntrySet *set);
+
    /// Types of the DicomDirObject within the DicomDir
    typedef enum
    {
@@ -140,10 +113,10 @@ public:
    } DicomDirType;
    
 protected:
+   DicomDir(); 
+   ~DicomDir();
+
    void CreateDicomDirChainedList(std::string const &path);
-   void CallStartMethod();
-   void CallProgressMethod();
-   void CallEndMethod();
 
 private:
    void Initialize();
@@ -171,29 +144,9 @@ private:
    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;
    bool ParseDir;
+
 };
 } // end namespace gdcm
 //-----------------------------------------------------------------------------