X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.h;h=ee5e9d776ac572051ea069079970f0943885a398;hb=ab9b96bb7b0c77c1beaee820985debe75f04b831;hp=5d053d2b7829c1100ccf56a14603779bbbbcafd2;hpb=06c8a65724fa7d53ee2c97b72f8ac9de5f375a18;p=gdcm.git

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index 5d053d2b..ee5e9d77 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/06/17 12:35:00 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/09/02 07:10:03 $
+  Version:   $Revision: 1.22 $
                                                                                 
   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,15 +55,22 @@ public:
 public:
    FileHelper( );
    FileHelper( File *header );
-   FileHelper( std::string const &filename );
- 
+   GDCM_LEGACY(FileHelper( std::string const &filename ));
+   
    virtual ~FileHelper();
 
    void Print(std::ostream &os = std::cout, std::string const &indent = ""); 
 
    /// Accessor to \ref File
    File *GetFile() { return FileInternal; }
+   
 
+   void SetLoadMode(int loadMode);
+   void SetFileName(std::string const &fileName);
+   bool Load();
+   /// to allow user to modify pixel order (e.g. Mirror, TopDown,...)
+   void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) 
+                        { UserFunction = userFunc; }   
    // File methods
    bool SetValEntry(std::string const &content,
                     uint16_t group, uint16_t elem);
@@ -76,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);
 
@@ -100,31 +114,31 @@ 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);  };
+   void SetWriteModeToRGB()           { SetWriteMode(WMODE_RGB);  }
    /// \brief Sets the Write Mode ( )
-   void SetWriteMode(FileMode mode)   { WriteMode = mode;         };
+   void SetWriteMode(FileMode mode)   { WriteMode = mode;         }
    /// \brief Gets the Write Mode ( )
-   FileMode GetWriteMode()            { return WriteMode;         };
+   FileMode GetWriteMode()            { return WriteMode;         }
 
    // Write format
 
    /// \brief Tells the writer we want to write as Implicit VR
-   void SetWriteTypeToDcmImplVR()     { SetWriteType(ImplicitVR); };
+   void SetWriteTypeToDcmImplVR()     { SetWriteType(ImplicitVR); }
    /// \brief Tells the writer we want to write as Explicit VR
-   void SetWriteTypeToDcmExplVR()     { SetWriteType(ExplicitVR); };
+   void SetWriteTypeToDcmExplVR()     { SetWriteType(ExplicitVR); }
    /// \brief Tells the writer we want to write as ACR-NEMA
-   void SetWriteTypeToAcr()           { SetWriteType(ACR);        };
+   void SetWriteTypeToAcr()           { SetWriteType(ACR);        }
    /// \brief Tells the writer we want to write as LibIDO
-   void SetWriteTypeToAcrLibido()     { SetWriteType(ACR_LIBIDO); };
+   void SetWriteTypeToAcrLibido()     { SetWriteType(ACR_LIBIDO); }
    /// \brief Tells the writer which format we want to write
    /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
-   void SetWriteType(FileType format) { WriteType = format;       };
+   void SetWriteType(FileType format) { WriteType = format;       }
    /// \brief Gets the format we talled the write we wanted to write
    ///   (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
-   FileType GetWriteType()            { return WriteType;         };
+   FileType GetWriteType()            { return WriteType;         }
 
    // Write pixels of ONE image on hard drive
    // No test is made on processor "endianness"
@@ -171,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
@@ -189,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