X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxSphereView.h;h=a99cb87bb99d79fac101b71fa37fb01c58ef7a02;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=8a022bd06023df9ea04430b6676bc103cd03bb46;hpb=ed6f960acce2ed63b0d6b964aee7ee243d8c6446;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSphereView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSphereView.h
index 8a022bd..a99cb87 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSphereView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSphereView.h
@@ -37,13 +37,17 @@ class wxMPRBaseData;
 class wxSphereView : public wxVtk2DBaseView
 {
 public:
-	wxSphereView( wxWindow *parent, vtkMPRBaseData *vtkmprbasedata, vtkImageData *imageData);
+	wxSphereView( wxWindow *parent, vtkMPRBaseData *vtkmprbasedata /*, vtkImageData *imageData*/);
 	~wxSphereView();
 	virtual void Configure();
+			void SetImage();
+
 	void RotationEnd();
 	void RotationStart(double vx, double vy, bool ok_v, bool ok_ang);
 	virtual void	RefreshView();
-	virtual void	SetVoxel(double i, double j, int delta, double id, unsigned short gris);
+	virtual void 	Refresh();
+
+	virtual void	SetVoxel(double i, double j, int delta, double id, double gris);
 			void	SetDeltaVoxel(int delta);
 			double	GetRadio();
 			void	SetRadio(double radio);
@@ -52,25 +56,19 @@ public:
 			void	RefreshPoint();
 
 private:	
-	std::vector<idAlBeRa*> _lstId;
-
+	std::vector<idAlBeRa*> 		_lstId;
 	int							_centerX;
 	int							_centerY;
 	int							_centerZ;
 	double						_radio;
-
 	double						_ang;
 	double						_vxb;
 	double						_vyb;
-
 	int							_delta;
-
 	vtkImageData				*_imageDataOriginal;
 	vtkImageData				*_imageSphere;
-
 	vtkMPRBaseData				*_vtkmprbasedata;
 	vtkInteractorStyleSphere	*_vtkinteractorstylesphere;
-
 	vtkTransform				*_transform; 
 	vtkTransform				*_transform1; 
 	vtkTransform				*_transform2; 
@@ -79,14 +77,12 @@ private:
 	void	FiltreImageB(int id, double radio, bool ok,int deltaTMP);
 	void	DefineImageSphere();
 	void	ResetlstId();
-
 	void	InitSphere(double points[4][3]);
 	double	SphereFindCenter(double P[4][3], double cc[3]);
 	double	determinant(double a[4][4], int n);
-
 	void	GetPointSphere(double p[3],double r1,double angA,double angB);
 	void	RotatePointOverTheSphere( double pp[3], double p[3],double cc[3]);
-	void	TransferePoints(double pp1[3],double pp2[3],double AngX,double AngY,vtkImageData *image);
+//	void	TransferePoints(double pp1[3],double pp2[3],double AngX,double AngY,vtkImageData *image);
 };
 
 #endif /*WXSPHEREVIEW_H_*/