ENH: Try to sync gdcm CVS and gdcm 1.2. ~2000 lines of changes, please be gentle...

[gdcm.git] / src / gdcmFileHelper.h

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index f4322b9b0196927a2a3b2c1b351e449647f34fa1..5a64bdfccebc8103242ff6d0e3d161f426c50d53 100644 (file)
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/07 09:50:52 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2006/02/16 20:06:14 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -52,11 +52,11 @@ public:
    };
      
 public:
+/// \brief Constructs a FileHelper with a RefCounter
    static FileHelper *New() {return new FileHelper();}
+/// \brief Constructs a FileHelper with a RefCounter from a fileHelper  
    static FileHelper *New(File *header) {return new FileHelper(header);}
    
-   virtual ~FileHelper();
-
    void Print(std::ostream &os = std::cout, std::string const &indent = ""); 
 
    /// Accessor to \ref File
@@ -154,10 +154,15 @@ public:
    void SetKeepMediaStorageSOPClassUID (bool v) 
                               { KeepMediaStorageSOPClassUID = v; }
    // no GetKeepMediaStorageSOPClassUID() method, on purpose!
+
+   void CallStartMethod();
+   void CallProgressMethod();
+   void CallEndMethod();
    
 protected:
    FileHelper( );
    FileHelper( File *header );
+   ~FileHelper();
 
    bool CheckWriteIntegrity();
 
@@ -189,6 +194,13 @@ private:
    uint8_t *GetRaw();
 
 // members variables:
+protected:
+   /// value of the ??? for any progress bar
+   float Progress;
+   mutable bool Abort;
+   
+private:
+
    /// gdcm::File to use to load the file
    File *FileInternal;
 
@@ -208,7 +220,7 @@ private:
    // Write variables
    /// \brief (WMODE_RAW, WMODE_RGB)
    FileMode WriteMode;
-   
+
    /// \brief (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
    FileType WriteType;
    
@@ -220,8 +232,8 @@ private:
    /// See vtkgdcmSerieViewer for an example
    VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;
    
-   /// if user knows he didn't modify the pixels (e.g. he just anonymized 
-   /// the file), he is allowed to ask to keep the original
+   /// \brief if user knows he didn't modify the pixels (e.g. he just 
+   /// anonymized the file), he is allowed to ask to keep the original
    /// 'Media Storage SOP Class UID' and 'Image Type'  
    bool KeepMediaStorageSOPClassUID;
 };