X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.h;h=dc29361fed76782e4647e6b2f7777e3bbf35d69f;hb=fd5c14391627c6e42283ced90561271af2a161a2;hp=fd30e58bba9f028cbcd421076f9275ad61003eee;hpb=9cfc0e09d292826980e3d63728d46b5c6b185bf4;p=gdcm.git diff --git a/vtk/vtkGdcmReader.h b/vtk/vtkGdcmReader.h index fd30e58b..dc29361f 100644 --- a/vtk/vtkGdcmReader.h +++ b/vtk/vtkGdcmReader.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcmReader.h,v $ Language: C++ - Date: $Date: 2005/07/17 04:34:20 $ - Version: $Revision: 1.23 $ + Date: $Date: 2011/03/29 07:36:02 $ + Version: $Revision: 1.39 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,6 +27,8 @@ #include #include +typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, GDCM_NAME_SPACE::File *); + //----------------------------------------------------------------------------- class vtkLookupTable; @@ -41,29 +43,71 @@ public: virtual void RemoveAllFileName(void); virtual void AddFileName(const char *name); virtual void SetFileName(const char *name); - void SetCoherentFileList( std::vector *cfl) { - CoherentFileList = cfl; }; - void SetCheckFileCoherenceLight(); + + //BTX + void SetCoherentFileList( std::vector *cfl) { + CoherentFileList = cfl; } + //ETX + + //vtkSetMacro(AllowLightChecking, bool); + //vtkGetMacro(AllowLightChecking, bool); + //vtkBooleanMacro(AllowLightChecking, bool); + + //BTX + /// \todo fix possible problems around VTK pipelining + + 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); + // will be exported and accessible through GetLookupTable() + + vtkSetMacro(AllowLookupTable, bool); + vtkGetMacro(AllowLookupTable, bool); + vtkBooleanMacro(AllowLookupTable, bool); + + vtkSetMacro(KeepOverlays, bool); + vtkGetMacro(KeepOverlays, bool); + vtkBooleanMacro(KeepOverlays, bool); + +// Implementation note: when FileLowerLeft (gdcm2) is set to on the image is not flipped +// upside down as VTK would expect, use this option only if you know what you are doing. + // vtkSetMacro(FileLowerLeft, bool); + // vtkGetMacro(FileLowerLeft, bool); + // vtkBooleanMacro(FileLowerLeft, bool); + + vtkSetMacro(FlipY, bool); + vtkGetMacro(FlipY, bool); + vtkBooleanMacro(FlipY, bool); vtkGetObjectMacro(LookupTable, vtkLookupTable); -/** - * \brief Sets the LoadMode as a boolean string. - * NO_SEQ, NO_SHADOW, NO_SHADOWSEQ... (nothing more, right now) +// FIXME : HOW to doxygen a VTK 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 */ - void SetLoadMode (int mode) { LoadMode = mode; } + vtkSetMacro(LoadMode, int); + vtkGetMacro(LoadMode, int); + vtkBooleanMacro(LoadMode, int); + +/* + * \ brief drop images with duplicate position + * and therefore calculate ZSpacing for the whole file set + * @param mode user wants to drop images with duplicate position + */ + vtkSetMacro(DropDuplicatePositions, bool); + vtkGetMacro(DropDuplicatePositions, bool); + vtkBooleanMacro(DropDuplicatePositions, bool); protected: vtkGdcmReader(); @@ -71,40 +115,51 @@ protected: virtual void ExecuteInformation(); virtual void ExecuteData(vtkDataObject *output); + + //virtual void BuildData(vtkDataObject *output); // for VTK5.0 virtual void BuildFileListFromPattern(); - virtual int CheckFileCoherence(); - virtual int CheckFileCoherenceLight(); - virtual int CheckFileCoherenceAlreadyDone(); + virtual void LoadFileInformation(); + virtual void UpdateFileInformation(); + //BTX + virtual void GetFileInformation(GDCM_NAME_SPACE::File *file); + virtual bool TestFileInformation(GDCM_NAME_SPACE::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); - - size_t LoadImageInMemory(gdcm::File *f, unsigned char *dest, - const unsigned long updateProgressTarget, - unsigned long &updateProgressCount); - - size_t DoTheLoadingJob (gdcm::File *f, - 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_NAME_SPACE::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 LightChecking; + + 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) @@ -116,6 +171,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. @@ -124,16 +181,27 @@ private: // Otherwise, InternalFileNameList correspond to the list of // files patterned std::list InternalFileNameList; - std::vector *CoherentFileList; + gdcmFileList InternalFileList; + //bool Execution; // For VTK5.0 //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 + /// Bit 2 : Skip Sequences inside a Shadow Group, if possible /// Probabely (?), some more to add int LoadMode; + + bool DropDuplicatePositions; + + bool KeepOverlays; + + // bool FileLowerLeft; + bool FlipY; + + /// Pointer to a user suplied function to allow modification of pixel order + VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction; };