Program: gdcm
Module: $RCSfile: vtkGdcmReader.h,v $
Language: C++
- Date: $Date: 2007/06/08 12:43:19 $
- Version: $Revision: 1.32 $
+ 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
#include <string>
#include <vector>
-typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, gdcm::File *);
+typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, GDCM_NAME_SPACE::File *);
//-----------------------------------------------------------------------------
class vtkLookupTable;
virtual void SetFileName(const char *name);
//BTX
- void SetCoherentFileList( std::vector<gdcm::File* > *cfl) {
+ void SetCoherentFileList( std::vector<GDCM_NAME_SPACE::File* > *cfl) {
CoherentFileList = cfl; }
//ETX
//BTX
- /// \TODO fix possible problems around VTK pipelining
+ /// \todo fix possible problems around VTK pipelining
void SetUserFunction (VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc )
{ UserFunction = userFunc; }
// 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()
+ // 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);
// FIXME : HOW to doxygen a VTK macro?
virtual void LoadFileInformation();
virtual void UpdateFileInformation();
//BTX
- virtual void GetFileInformation(gdcm::File *file);
- virtual bool TestFileInformation(gdcm::File *file);
+ virtual void GetFileInformation(GDCM_NAME_SPACE::File *file);
+ virtual bool TestFileInformation(GDCM_NAME_SPACE::File *file);
//ETX
private:
const unsigned long updateProgressTarget,
unsigned long &updateProgressCount);*/
- void LoadImageInMemory(gdcm::File *f, unsigned char *dest,
+ void LoadImageInMemory(GDCM_NAME_SPACE::File *f, unsigned char *dest,
const unsigned long updateProgressTarget,
unsigned long &updateProgressCount);
//ETX
// Variables
//BTX
- typedef std::vector<gdcm::File *> gdcmFileList;
+ typedef std::vector<GDCM_NAME_SPACE::File *> gdcmFileList;
//ETX
vtkLookupTable *LookupTable;
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;