ENH: This time for real. Install is ok. STYLE: some minor stuff

[gdcm.git] / src / gdcmDicomDir.h

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index f51c9f4cd0a8b4d8e3a1e5c73fe659d7241673b1..869bac746aa2317c8d3b9cb4d3e981520fa86db5 100644 (file)
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/21 05:02:11 $
-  Version:   $Revision: 1.66 $
+  Date:      $Date: 2006/02/16 20:06:13 $
+  Version:   $Revision: 1.74 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,12 +50,11 @@ 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( );
@@ -69,9 +68,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,33 +87,19 @@ 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,
-                           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 );
-
    /// GetProgress GetProgress
-   float GetProgress()   { return Progress; }
+   float GetProgress() const { return Progress; }
    /// AbortProgress AbortProgress
    void  AbortProgress() { Abort = true; }
    /// IsAborted IsAborted
    bool  IsAborted() { return Abort; }
 
    // Write
-   bool WriteDicomDir(std::string const &fileName);
+   bool Write(std::string const &fileName);
 
-   bool AnonymizeDicomDir();
+   bool Anonymize();
+
+   virtual void Copy(DocEntrySet *set);
 
    /// Types of the DicomDirObject within the DicomDir
    typedef enum
@@ -132,10 +114,11 @@ public:
    } DicomDirType;
    
 protected:
+   DicomDir(); 
+   GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) ); 
+   ~DicomDir();
+
    void CreateDicomDirChainedList(std::string const &path);
-   void CallStartMethod();
-   void CallProgressMethod();
-   void CallEndMethod();
 
 private:
    void Initialize();
@@ -163,29 +146,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
 //-----------------------------------------------------------------------------