#3207 creaMaracasVisu Feature New Normal branch vtk7itk4wx3-mingw

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / boxSurfaceObserver.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
index 92892da6461affbc389f52313b7d48ac5955ebd6..21d8338973775204c94fae6f46791a107e7305ff 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
@@ -28,7 +28,13 @@
 
 #include "vtkPlanes.h"
 #include "vtkProp.h"
-#include "vtkVolumeRayCastMapper.h"
+
+#if (VTK_MAJOR_VERSION <= 7) 
+       #include "vtkVolumeRayCastMapper.h"
+#else 
+       #include <vtkFixedPointVolumeRayCastMapper.h>
+#endif
+
 #include "vtkObject.h"
 #include "vtkCommand.h"
 
@@ -37,34 +43,43 @@
 class boxSurfaceObserver : public vtkCommand
 {
        public:
-               vtkPlanes                                       *_planes;
-               vtkProp                                         *_actor;
+               vtkPlanes                                                       *_planes;
+               vtkProp                                                         *_actor;
 
-               vtkAlgorithm                            *_mCubes;
-               vtkAlgorithm                            *_tissueStripper;
-               vtkAlgorithm                            *_tissueClipper;
-               vtkVolumeRayCastMapper          *_vtkVolumeRayCastMapper;
+               vtkAlgorithm                                            *_mCubes;
+               vtkAlgorithm                                            *_tissueStripper;
+               vtkAlgorithm                                            *_tissueClipper;
+#if (VTK_MAJOR_VERSION <= 7) 
+               vtkVolumeRayCastMapper                          *_vtkVolumeRayCastMapper;
+#else 
+               vtkFixedPointVolumeRayCastMapper        *_vtkVolumeRayCastMapper;
+#endif
 
                boxSurfaceObserver() 
                {  
-                       _mCubes                                 = NULL;
-                       _tissueStripper                 = NULL;
-                       _tissueClipper                  = NULL;
-                       _vtkVolumeRayCastMapper = NULL;
+                       _mCubes                                                         = NULL;
+                       _tissueStripper                                         = NULL;
+                       _tissueClipper                                          = NULL;
+                       _vtkVolumeRayCastMapper                         = NULL;
+                       
                }
 
                virtual char const *GetClassName() const { return "boxSurfaceObserver";}
 
                static boxSurfaceObserver *New(){
-                       boxSurfaceObserver * result;
-                       result = new boxSurfaceObserver();
+                       boxSurfaceObserver      *result;
+                       result                          = new boxSurfaceObserver();
                        return result;
                }
 
                virtual void Execute(vtkObject *wdg, unsigned long eventId, void* calldata) ;
                void SetPlanes(vtkPlanes *planes);
                void SetActor(vtkProp *actor);
+#if (VTK_MAJOR_VERSION <= 7) 
                void SetvtkVolumeRayCastMapper(vtkVolumeRayCastMapper *vtkvolumeraycastmapper);
+#else 
+               void SetvtkFixedPointVolumeRayCastMapper(vtkFixedPointVolumeRayCastMapper *vtkvolumeraycastmapper);
+#endif
                void SetFilters(vtkAlgorithm *_mCubes , vtkAlgorithm *_tissueStripper , vtkAlgorithm *_tissueClipper);
 };