X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.h;h=39348bf7ee2c82d0c7f8ed4c63de6154d35361f9;hb=4bcf524dd8375b8c6e3d8a301322bb0d43f1be01;hp=327431ba5193a3e64202d348fa0911de455fa703;hpb=6516a88a1e363868706f0fb443fbc7ad9641a9b9;p=gdcm.git

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index 327431ba..39348bf7 100644
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/08 14:36:48 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2005/08/19 13:15:05 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,8 +19,11 @@
 #ifndef GDCMFILEHELPER_H
 #define GDCMFILEHELPER_H
 
-#include <iostream>
+#include "gdcmDebug.h"
 #include "gdcmBase.h"
+//#include <iostream>
+
+
 
 namespace gdcm 
 {
@@ -31,6 +34,9 @@ class SeqEntry;
 class PixelReadConvert;
 class PixelWriteConvert;
 class DocEntryArchive;
+
+typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, File *);
+
 //-----------------------------------------------------------------------------
 /**
  * \brief In addition to Dicom header exploration, this class is designed
@@ -49,7 +55,7 @@ public:
 public:
    FileHelper( );
    FileHelper( File *header );
-   FileHelper( std::string const &filename );
+   GDCM_LEGACY(FileHelper( std::string const &filename ));
    
    virtual ~FileHelper();
 
@@ -62,7 +68,9 @@ public:
    void SetLoadMode(int loadMode);
    void SetFileName(std::string const &fileName);
    bool Load();
-   
+   /// to allow user to modify pixel order (e.g. Mirror, TopDown, 90°Rotate,...)
+   void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) 
+                        { UserFunction = userFunc; }   
    // File methods
    bool SetValEntry(std::string const &content,
                     uint16_t group, uint16_t elem);
@@ -81,7 +89,8 @@ public:
 
    uint8_t *GetImageData();
    uint8_t *GetImageDataRaw();
-   size_t GetImageDataIntoVector(void *destination, size_t maxSize);
+
+   GDCM_LEGACY(size_t GetImageDataIntoVector(void *destination,size_t maxSize));
 
    void SetImageData(uint8_t *data, size_t expectedSize);
 
@@ -105,7 +114,7 @@ public:
 
    /// \brief Tells the writer we want to keep 'Grey pixels + Palettes color'
    ///        when possible (as opposed to convert 'Palettes color' to RGB)
-  void SetWriteModeToRaw()            { SetWriteMode(WMODE_RAW);  };
+   void SetWriteModeToRaw()           { SetWriteMode(WMODE_RAW);  };
    /// \brief Tells the writer we want to write RGB image when possible
    ///        (as opposed to 'Grey pixels + Palettes color')
    void SetWriteModeToRGB()           { SetWriteMode(WMODE_RGB);  };
@@ -176,7 +185,7 @@ private:
    ///  When false the destructor is in charge of deletion.
    bool SelfHeader;
    
-   /// Wether already parsed or not
+   /// Whether already parsed or not
    bool Parsed;
 
    // Utility pixel converter
@@ -194,6 +203,13 @@ private:
    FileMode WriteMode;
    /// \brief (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
    FileType WriteType;
+   /// Pointer to a user supplied function to allow modification of pixel order
+   /// (i.e. : Mirror, TopDown, 90°Rotation, ...)
+   /// use as : void userSuppliedFunction(uint8_t *im, gdcm::File *f)
+   /// NB : the "uint8_t *" type of first param is just for prototyping.
+   /// User will Cast it according what he founds with f->GetPixelType()
+   /// See vtkgdcmSerieViewer for an example
+   VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;
 };
 } // end namespace gdcm