X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FboxSurfaceObserver.h;h=21d8338973775204c94fae6f46791a107e7305ff;hb=255f774ce4100c0b84e6b5efa5c64d0db77f8a61;hp=11e4d591ac221ac662a473e05d0715761acd8199;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/boxSurfaceObserver.h
index 11e4d59..21d8338 100644
--- 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,29 +43,45 @@
 class boxSurfaceObserver : public vtkCommand
 {
 	public:
-		vtkPlanes					*_planes;
-		vtkProp						*_actor;
-		vtkVolumeRayCastMapper		*_vtkVolumeRayCastMapper;
+		vtkPlanes							*_planes;
+		vtkProp								*_actor;
+
+		vtkAlgorithm 						*_mCubes;
+		vtkAlgorithm 						*_tissueStripper;
+		vtkAlgorithm 						*_tissueClipper;
+#if (VTK_MAJOR_VERSION <= 7) 
+		vtkVolumeRayCastMapper				*_vtkVolumeRayCastMapper;
+#else 
+		vtkFixedPointVolumeRayCastMapper	*_vtkVolumeRayCastMapper;
+#endif
 
 		boxSurfaceObserver() 
 		{  
-			_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);
 };
 
 
-
 #endif /*BOXSURFACEOBSERVER_H_*/