X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=b747f9490c03b091a892f2d8b7ca24bb38b7861b;hb=9a3c8efad6a7f1b2f1fdb689dae4ce09bf2d433f;hp=d5b86bdb61883fb6e319d99b33ed25d76e364762;hpb=bc44a92d859676478ba1ad491d2a1d9256acb655;p=gdcm.git diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h index d5b86bdb..b747f949 100644 --- a/vtk/vtkGdcmReader.h +++ b/vtk/vtkGdcmReader.h @@ -1,11 +1,33 @@ -// vtkGdcmReader.h -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: vtkGdcmReader.h,v $ + Language: C++ + Date: $Date: 2005/08/31 15:54:51 $ + Version: $Revision: 1.29 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #ifndef __vtkGdcmReader_h #define __vtkGdcmReader_h +#include "gdcmCommon.h" // To avoid warnings concerning the std +#include "gdcmFile.h" + #include #include #include +#include + +typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, gdcm::File *); //----------------------------------------------------------------------------- class vtkLookupTable; @@ -19,18 +41,46 @@ public: void PrintSelf(ostream& os, vtkIndent indent); virtual void RemoveAllFileName(void); - virtual void AddFileName(const char* name); + virtual void AddFileName(const char *name); virtual void SetFileName(const char *name); - + + //BTX + void SetCoherentFileList( std::vector *cfl) { + CoherentFileList = cfl; } + //ETX + + vtkSetMacro(AllowLightChecking, bool); + vtkGetMacro(AllowLightChecking, bool); + vtkBooleanMacro(AllowLightChecking, bool); + + //BTX + void SetUserFunction (VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) + { UserFunction = userFunc; } + //ETX + // Description: // If this flag is set and the DICOM reader encounters a dicom file with // lookup table the data will be kept as unsigned chars and a lookuptable // will be exported and accessible through GetLookupTable() - vtkSetMacro(AllowLookupTable,int); - vtkGetMacro(AllowLookupTable,int); - vtkBooleanMacro(AllowLookupTable,int); + vtkSetMacro(AllowLookupTable, bool); + vtkGetMacro(AllowLookupTable, bool); + vtkBooleanMacro(AllowLookupTable, bool); + + vtkGetObjectMacro(LookupTable, vtkLookupTable); - vtkGetObjectMacro(LookupTable,vtkLookupTable); +// FIXME : HOW to doxygen a VTM macro? +/* + * \ brief Sets the LoadMode as a boolean string. + * gdcm.LD_NOSEQ, gdcm.LD_NOSHADOW, gdcm.LD_NOSHADOWSEQ... + * (nothing more, right now) + * WARNING : before using NO_SHADOW, be sure *all* your files + * contain accurate values in the 0x0000 element (if any) + * of *each* Shadow Group. The parser will fail if the size is wrong ! + * @param mode Load mode to be used + */ + vtkSetMacro(LoadMode, int); + vtkGetMacro(LoadMode, int); + vtkBooleanMacro(LoadMode, int); protected: vtkGdcmReader(); @@ -38,29 +88,51 @@ protected: virtual void ExecuteInformation(); virtual void ExecuteData(vtkDataObject *output); + + virtual void BuildData(vtkDataObject *output); virtual void BuildFileListFromPattern(); - virtual int CheckFileCoherence(); + virtual void LoadFileInformation(); + virtual void UpdateFileInformation(); + //BTX + virtual void GetFileInformation(gdcm::File *file); + virtual bool TestFileInformation(gdcm::File *file); + //ETX private: void RemoveAllInternalFileName(void); - void AddInternalFileName(const char* name); + void AddInternalFileName(const char *name); + void RemoveAllInternalFile(void); //BTX - size_t LoadImageInMemory(std::string FileName, unsigned char * Dest, - const unsigned long UpdateProgressTarget, - unsigned long & UpdateProgressCount); + void IncrementProgress(const unsigned long updateProgressTarget, + unsigned long &updateProgressCount); + /*void LoadImageInMemory(std::string fileName, unsigned char *dest, + const unsigned long updateProgressTarget, + unsigned long &updateProgressCount);*/ + + void LoadImageInMemory(gdcm::File *f, unsigned char *dest, + const unsigned long updateProgressTarget, + unsigned long &updateProgressCount); //ETX // Variables + //BTX + typedef std::vector gdcmFileList; + //ETX + vtkLookupTable *LookupTable; vtkTimeStamp fileTime; - int AllowLookupTable; + + bool AllowLookupTable; + bool AllowLightChecking; //BTX // Number of columns of the image/volume to be loaded int NumColumns; // Number of lines of the image/volume to be loaded int NumLines; + // Number of lines of the image/volume to be loaded + int NumPlanes; // Total number of planes (or images) of the stack to be build. int TotalNumberOfPlanes; // Number of scalar components of the image to be loaded (1=monochrome 3=rgb) @@ -72,6 +144,8 @@ private: // List of filenames to be read in order to build a stack of images // or volume. The order in the list shall be the order of the images. std::list FileNameList; + gdcmFileList *CoherentFileList; + bool OwnFile; // List of filenames created in ExecuteInformation and used in // ExecuteData. @@ -80,7 +154,21 @@ private: // Otherwise, InternalFileNameList correspond to the list of // files patterned std::list InternalFileNameList; + gdcmFileList InternalFileList; + bool Execution; + //ETX + + /// \brief Bit string integer (each one considered as a boolean) + /// Bit 0 : Skip Sequences, if possible + /// Bit 1 : Skip Shadow Groups if possible + /// Bit 2 : Skip Sequences inside a Shadow Group, if possible + /// Probabely (?), some more to add + int LoadMode; + + /// Pointer to a user suplied function to allow modification of pixel order + VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction; + }; //-----------------------------------------------------------------------------