X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.h;h=3fa2c0dddf544114fd9b6bf2242588346f6a88d4;hb=22b3a32e023370c44f812976adc4b45b88401c2f;hp=e520ddfe7ea247b6260fe614809ce17892014630;hpb=fa62829e9a53b389933687e6baea92c0a0dafa1b;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
index e520ddf..3fa2c0d 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
@@ -68,9 +68,9 @@ public:
 	boxSurfaceObserver		*GetObserverS(int idObserverS);
 	boxSurfaceObserver		*GetObserverV();
 
-	//void					ReadVolumeFunctions(char *namefile); 
-	void					ReadVolumeFunctions(); 
-	void					ReadMeshVTK(char *namefile); 
+	//void					ReadVolumeFunctions(char *namefile);
+	void					ReadVolumeFunctions();
+	void					ReadMeshVTK(char *namefile);
 
 
 	//-------------------
@@ -93,10 +93,16 @@ public:
 	vtkPiecewiseFunction				*GetTransferencefunction();
 	vtkColorTransferFunction			*GetColorTransferenceFunction();
 
+    void                        SetRayCasting(bool active);
+	void                        SetMIPActive(bool active);
+    void                        SetInterpolation(bool active);
+    void                        SetShade(bool active);
+    void                        updateVolume();
+
 
 
 private:
-	
+
 	vtkMarchingCubes					*_mCubes[ VTKMPRDATA_MAXTISSUE ];
 	vtkStripper							*_tissueStripper[ VTKMPRDATA_MAXTISSUE ];
 	vtkPolyDataMapper					*_tissueMapper[ VTKMPRDATA_MAXTISSUE ];
@@ -111,7 +117,7 @@ private:
 	/// Volume
 	vtkPiecewiseFunction				*_tfun;
 	vtkColorTransferFunction			*_ctfun;
-	vtkVolumeRayCastCompositeFunction	*_compositeFunction;
+//	vtkVolumeRayCastCompositeFunction	*_compositeFunction;
 	vtkPlanes							*_volumePlanes;
 	vtkVolumeRayCastMapper				*_volumeMapper;
 	vtkVolumeProperty					*_volumeProperty;
@@ -132,6 +138,14 @@ private:
 	std::vector<double>					greenColorsOfColorTransferenceFVector;
 	std::vector<double>					blueColorsOfColorTransferenceFVector;
 	std::vector<double>					greyValueColorsOfColorTransferenceFVector;
+
+	vtkVolumeRayCastCompositeFunction   *_compositeFunction;
+	vtkVolumeRayCastMIPFunction         *_compositeFunctionMIP ;
+
+	bool _isRayCasting;
+    bool _isMIP;
+	bool _interpolation;
+	bool _shade;
 };
 
 #endif /*VTKCLIPPING3DDATAVIEWER_H_*/