X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.h;h=196b96492688b9de2776c9fb3de66591cabbf471;hb=317592bf538baef94dbc465c9bb1aea77e217d10;hp=4aac9d3d3bdf83a663f2a9f1d87ef216564cf3f2;hpb=0a4f28d5ec16e85a53faa056246fd9d7dde3a168;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index 4aac9d3d..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/10/23 15:09:19 $
-  Version:   $Revision: 1.26 $
+  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
@@ -35,7 +38,7 @@ 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 gdm user
+ * WARNING : *none* of these functions may be invoked by gdcm user
  *           (internal use only)
  */
 class GDCM_EXPORT PixelReadConvert : public Base
@@ -67,7 +70,7 @@ private:
    bool IsRawRGB();
 
 // In progress
-   void GrabInformationsFromFile( File *file );
+   void GrabInformationsFromFile( File *file, FileHelper *fileHelper );
    bool ReadAndDecompressPixelData( std::ifstream *fp );
    void Squeeze();
    bool BuildRGBImage();
@@ -96,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.
@@ -123,6 +130,7 @@ private:
    int XSize;
    int YSize;
    int ZSize;
+   int TSize;
    int BitsAllocated;
    int BitsStored;
    int HighBitPosition;
@@ -131,8 +139,11 @@ private:
    bool PixelSign;
    int SwapCode;
 
-   bool IsRaw;
+   // 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;
    bool IsJPEGLossless;
@@ -161,6 +172,10 @@ private:
    
    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