X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.h;h=1461bebd4649e1e21839d6ab84bbb32224070f2a;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=33a3e74cefb8c6ecc881c5b45e555cf40b736c1c;hpb=f369752f86b8a540df6638ba87945e83c9498b4b;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
index 33a3e74..1461beb 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
@@ -59,7 +59,7 @@ public:
 //	vtkImageActor*			GetImageActor(int id);
 	vtkActor*				GetOutlineActor();
 	vtkClipPolyData*		GetTissueClipper(int id);
-	vtkPolyDataMapper*	GetTissueMapper(int id);
+	vtkPolyDataMapper*		GetTissueMapper(int id);
 	vtkPlanes*				GetTissuePlanes(int id);
 	vtkStripper*			GetTissueStripper(int id);
 //	vtkGlyph3D*				GetGlyph(int id);
@@ -68,56 +68,56 @@ public:
 	vtkMarchingCubes		*GetMCubes(int idTissue);
 
 	virtual void			Refresh();
-	void						RefreshSurface();
+	void					RefreshSurface();
 
 	virtual void			Configure();
-	void						Configure_Tissue();
-	void						Configure_Volume();
+	void					Configure_Tissue();
+	void					Configure_Volume();
 	
-	void						SetIsovalue(int idTissue, int isoValue);
+	void					SetIsovalue(int idTissue, int isoValue);
 	double					GetIsovalue(int idTissue);
 
 	vtkVolume				*GetVolumeActor();
 	vtkVolumeRayCastMapper  *GetVolumeMapper();
 	vtkPlanes				*GetVolumePlanes();
 
-	void						SetVtkMPRBaseData(vtkMPRBaseData *vtkmprbasedata);
-	vtkMPRBaseData*		GetVtkMPRBaseData();
+	void					SetVtkMPRBaseData(vtkMPRBaseData *vtkmprbasedata);
+	vtkMPRBaseData*			GetVtkMPRBaseData();
 
-	vtkActor					*GetTissueActor(int id);
-	void						SetVisibleTissue(int idTissue, bool visible);
-	bool						GetVisibleTissue(int idTissue);
-	bool						GetVisibleVolume();
-	void						SetVisibleVolume(bool visibleVolume);
+	vtkActor				*GetTissueActor(int id);
+	void					SetVisibleTissue(int idTissue, bool visible);
+	bool					GetVisibleTissue(int idTissue);
+	bool					GetVisibleVolume();
+	void					SetVisibleVolume(bool visibleVolume);
 
-   bool						GetVisibleVolumeBox();
-	void						SetVisibleVolumeBox(bool visibleBox);
+   	bool					GetVisibleVolumeBox();
+	void					SetVisibleVolumeBox(bool visibleBox);
 
-	void						SetRepresentationType(int idTissue, bool representationType);
-	bool						GetRepresentationType(int idTissue);
+	void					SetRepresentationType(int idTissue, bool representationType);
+	bool					GetRepresentationType(int idTissue);
 
-	boxSurfaceObserver	*GetObserverS(int idObserverS);
-	boxSurfaceObserver	*GetObserverV();
+	boxSurfaceObserver		*GetObserverS(int idObserverS);
+	boxSurfaceObserver		*GetObserverV();
 
 	//void					ReadVolumeFunctions(char *namefile);
-	void						ReadVolumeFunctions();
-	void						ReadMeshVTK(char *namefile);
+	void					ReadVolumeFunctions();
+	void					ReadMeshVTK(char *namefile);
 
 
-    void						Configure_VolumeBox();
-    void						SetInteractor(vtkRenderWindowInteractor* interactor);
-    void						SetRenderer(vtkRenderer* renderer);
+    void					Configure_VolumeBox();
+    void					SetInteractor(vtkRenderWindowInteractor* interactor);
+    void					SetRenderer(vtkRenderer* renderer);
 
 	//-------------------
 	//Getters Vectors
 	//-------------------
 
-	std::vector<double>*					GetGreyValuesTransferenceFVector();
-	std::vector<double>*					GetIntensityValuesTransferenceFVector();
-	std::vector<double>*					GetRedColorsOfColorTransferenceFVector();
-	std::vector<double>*					GetGreenColorsOfColorTransferenceFVector();
-	std::vector<double>*					GetBlueColorsOfColorTransferenceFVector();
-	std::vector<double>*					GetGreyValueColorsOfColorTransferenceFVector();
+	std::vector<double>*	GetGreyValuesTransferenceFVector();
+	std::vector<double>*	GetIntensityValuesTransferenceFVector();
+	std::vector<double>*	GetRedColorsOfColorTransferenceFVector();
+	std::vector<double>*	GetGreenColorsOfColorTransferenceFVector();
+	std::vector<double>*	GetBlueColorsOfColorTransferenceFVector();
+	std::vector<double>*	GetGreyValueColorsOfColorTransferenceFVector();
 
 	void setColorTransferFunction(vtkColorTransferFunction* colortable);
 
@@ -125,46 +125,45 @@ public:
 	//Getters transference function
 	//and color of the transference function
 	//---------------------------------------
-	vtkPiecewiseFunction			*GetTransferencefunction();
+	vtkPiecewiseFunction		*GetTransferencefunction();
 	vtkColorTransferFunction	*GetColorTransferenceFunction();
 
-	void                      SetRayCasting(bool active);
-	void                      SetMIPActive(bool active);
-   void                      SetInterpolation(bool active);
-   void                      SetShade(bool active);
-   void                      updateVolume();
-   void                      BoxActorChanged(bool changed);
-   void                      UpdateVolumeBox(vector<double> gf, vector<double> vf, vtkColorTransferFunction* ctfun);
+	void                    SetRayCasting(bool active);
+	void                    SetMIPActive(bool active);
+   	void                    SetInterpolation(bool active);
+   	void                    SetShade(bool active);
+   	void                    updateVolume();
+   	void					BoxActorChanged(bool changed);
+   	void                    UpdateVolumeBox(vector<double> gf, vector<double> vf, vtkColorTransferFunction* ctfun);
 
 
 
 private:
-
-	vtkMarchingCubes				*_mCubes[ VTKMPRDATA_MAXTISSUE ];
-	vtkStripper						*_tissueStripper[ VTKMPRDATA_MAXTISSUE ];
-	vtkPolyDataMapper				*_tissueMapper[ VTKMPRDATA_MAXTISSUE ];
-	vtkPlanes						*_tissuePlanes[ VTKMPRDATA_MAXTISSUE ];
-	vtkClipPolyData				*_tissueClipper[ VTKMPRDATA_MAXTISSUE ];
+	vtkMarchingCubes		*_mCubes[ VTKMPRDATA_MAXTISSUE ];
+	vtkStripper				*_tissueStripper[ VTKMPRDATA_MAXTISSUE ];
+	vtkPolyDataMapper		*_tissueMapper[ VTKMPRDATA_MAXTISSUE ];
+	vtkPlanes				*_tissuePlanes[ VTKMPRDATA_MAXTISSUE ];
+	vtkClipPolyData			*_tissueClipper[ VTKMPRDATA_MAXTISSUE ];
 
 	// outline
-	vtkOutlineFilter				*_outlineData;
-	vtkPolyDataMapper				*_mapOutline;
-	vtkActor							*_outline;
+	vtkOutlineFilter		*_outlineData;
+	vtkPolyDataMapper		*_mapOutline;
+	vtkActor				*_outline;
 
 	/// Volume
-	vtkPiecewiseFunction			*_tfun;
+	vtkPiecewiseFunction		*_tfun;
 	vtkColorTransferFunction	*_ctfun;
 //	vtkVolumeRayCastCompositeFunction	*_compositeFunction;
-	vtkPlanes						*_volumePlanes;
+	vtkPlanes					*_volumePlanes;
 	vtkVolumeRayCastMapper		*_volumeMapper;
-	vtkVolumeProperty				*_volumeProperty;
-	vtkVolume						*_newvol;
-	vtkMPRBaseData					*_vtkmprbasedata;
-	bool								_visibleVolume;
-   bool								_visibleVolumeBox;
-	bool								_representationType[VTKMPRDATA_MAXTISSUE];
-	bool								_visibleTissue[VTKMPRDATA_MAXTISSUE];
-	vtkActor							*_tissue[VTKMPRDATA_MAXTISSUE];
+	vtkVolumeProperty			*_volumeProperty;
+	vtkVolume					*_newvol;
+	vtkMPRBaseData				*_vtkmprbasedata;
+	bool						_visibleVolume;
+   	bool						_visibleVolumeBox;
+	bool						_representationType[VTKMPRDATA_MAXTISSUE];
+	bool						_visibleTissue[VTKMPRDATA_MAXTISSUE];
+	vtkActor					*_tissue[VTKMPRDATA_MAXTISSUE];
 	boxSurfaceObserver			*_observerV;
 	boxSurfaceObserver			*_observerS[VTKMPRDATA_MAXTISSUE];
 
@@ -179,7 +178,7 @@ private:
 	vtkVolumeRayCastMIPFunction         *_compositeFunctionMIP ;
 
 	bool _isRayCasting;
-   bool _isMIP;
+  	bool _isMIP;
 	bool _interpolation;
 	bool _shade;