From 2c07f33bd1f79ad0237d02491a480913a488aa75 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Thu, 9 Jun 2011 08:40:26 +0000 Subject: [PATCH] *** empty log message *** --- .../volumerenderermanagerdata.h | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h index 8023728..cfa0c87 100644 --- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h +++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h @@ -2,6 +2,7 @@ #ifndef VolumeRendererManagerData_H_ #define VolumeRendererManagerData_H_ +#include "vtkCommand.h" #include #include #include @@ -13,11 +14,18 @@ #include #include #include + #include -#include + #include -#include -#include "vtkCommand.h" +#include + +#if (VTK_MAYOR_VERSION>=5 && VTK_MINOR_VERSION>=6) + #include +#endif + +#include + // Callback for moving the planes from the box widget to the mapper class vtkBoxWidgetCallback : public vtkCommand @@ -36,7 +44,7 @@ public: planes->Delete(); } } - void SetMapper(vtkGPUVolumeRayCastMapper* m) + void SetMapper(vtkAbstractMapper* m) { this->Mapper = m; } protected: @@ -44,7 +52,7 @@ protected: { this->Mapper = 0; } //vtkVolumeRayCastMapper *Mapper; - vtkGPUVolumeRayCastMapper *Mapper; + vtkAbstractMapper *Mapper; }; @@ -143,7 +151,7 @@ private: vtkVolumeRayCastCompositeFunction *_compositeFunction; vtkPlanes *_volumePlanes; vtkVolumeRayCastMapper *_volumeMapper; - vtkGPUVolumeRayCastMapper *_volumeMappergpu; + vtkGPUVolumeRayCastMapper *_volumeMappergpu; vtkVolumeProperty *_volumeProperty; vtkVolume *_newvol; vtkPiecewiseFunction* _tfun; -- 2.46.1