X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.h;h=196b96492688b9de2776c9fb3de66591cabbf471;hb=7eb2c6a1c2b6d33ac2b9dd5e23304679c185f70b;hp=4cc379afa4cc6af9ba8040a53035663c1851051d;hpb=f404ce652df065234b0e8223f26d388c5a7e9af5;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 4cc379af..196b9649 100644
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2005/06/14 13:56:42 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2006/03/29 16:09:48 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,7 +21,10 @@
 #define GDCMPIXELREADCONVERT_H
 
 #include "gdcmBase.h"
+#include "gdcmFileHelper.h"
 #include "gdcmException.h"
+#include "gdcmCommandManager.h"
+
 #include <fstream>
 
 namespace gdcm
@@ -30,35 +33,53 @@ class File;
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
+typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, File *);
+
 /**
  * \brief Utility container for gathering the various forms the pixel data
  *        migth take during the user demanded processes.
+ * WARNING : *none* of these functions may be invoked by gdcm user
+ *           (internal use only)
  */
 class GDCM_EXPORT PixelReadConvert : public Base
 {
-public:
+friend class FileHelper;
+
+private:
    PixelReadConvert();
    virtual ~PixelReadConvert();
 
    void Print( std::ostream &os = std::cout, std::string const &indent = "" );
 
    // Getter accessors:
-   uint8_t *GetRGB()     { return RGB;     }
-   size_t   GetRGBSize() { return RGBSize; }
-   uint8_t *GetRaw()     { return Raw;     }
-   size_t   GetRawSize() { return RawSize; }
-   uint8_t *GetLutRGBA() { return LutRGBA; }
-
+   /// \brief returns pixel area holding RGB Pixels, made from Grey level + LUT
+   uint8_t *GetRGB()           { return RGB;     }
+   /// \brief returns pixel area length -RGB Pixels, (from Grey level + LUT)-
+   size_t   GetRGBSize()       { return RGBSize; }
+   /// \brief returns pixel area holding native RGB Pixels or Grey level
+   uint8_t *GetRaw()           { return Raw;     }
+   /// \brief returns pixel area size -native RGB Pixels or Grey level-
+   size_t   GetRawSize()       { return RawSize; }
+   /// \brief returns Red Green Blue Alpha LUT
+   uint8_t *GetLutRGBA()       { return LutRGBA; }
+   /// \brief returns Lut Item Number
+   int      GetLutItemNumber() { return LutItemNumber; }
+   /// \brief returns Lut Item Size
+   int      GetLutItemSize()   { return LutItemSize;   }
    // Predicates:
    bool IsRawRGB();
 
 // In progress
-   void GrabInformationsFromFile( File *file );
+   void GrabInformationsFromFile( File *file, FileHelper *fileHelper );
    bool ReadAndDecompressPixelData( std::ifstream *fp );
    void Squeeze();
    bool BuildRGBImage();
+   void BuildLUTRGBA();
+/// \brief Allow user to pass his own function to modify pixels 
+///        (e.g; mirror, upsidedown, ...) just after reading
+   void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) 
+                         { UserFunction = userFunc; }
 
-private:
    // Use the fp:
    void ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) 
                                  throw ( FormatError );
@@ -66,7 +87,6 @@ private:
 
    // In place (within Decompressed and with no fp access) decompression
    // or convertion:
-   void BuildLUTRGBA();
    void ConvertSwapZone();
    void ConvertReorderEndianity();
    bool ConvertReArrangeBits() throw ( FormatError );
@@ -79,6 +99,10 @@ private:
    void AllocateRGB();
    void AllocateRaw();
 
+   void CallStartMethod();
+   void CallProgressMethod();
+   void CallEndMethod();
+   
 // Variables
 /**
  * \brief Pixel data represented as RGB after LUT color interpretation.
@@ -95,20 +119,30 @@ private:
    /// \brief Red/Green/Blue/Alpha LookUpTable build out of the
    ///        Red/Green/Blue LUT descriptors (see \ref BuildLUTRGBA ).
    uint8_t *LutRGBA;
+   int LutItemNumber;
+   int LutItemSize;
+
+   // *ALL* the following info belong to the FileHelper
+   // One should think there is an analyze error in the model !
 
    size_t PixelOffset;
    size_t PixelDataLength;
    int XSize;
    int YSize;
    int ZSize;
+   int TSize;
    int BitsAllocated;
    int BitsStored;
    int HighBitPosition;
    int SamplesPerPixel;
-   int PixelSize;
+   //int PixelSize; // useless
    bool PixelSign;
    int SwapCode;
 
+   // cache whether this is a strange GE transfer syntax (which has   
+   // one transfer syntax for the header and another for the pixel data).
+   bool IsPrivateGETransferSyntax;
+
    bool IsRaw;
    bool IsJPEG2000;
    bool IsJPEGLS;
@@ -135,7 +169,13 @@ private:
    uint8_t *LutRedData;
    uint8_t *LutGreenData;
    uint8_t *LutBlueData;
-
+   
+   File *FileInternal; // must be passed to User Function
+   VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction;
+   /// Needed for the progression bar stuff
+   FileHelper *FH;
+   mutable bool Abort;
+   float Progress;
 };
 } // end namespace gdcm