X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget.cxx;h=bdbf0b50573dfc6513386a5699c9c0c0d6702032;hb=688ca72c3097af56bc2a2cba126227b86d85262a;hp=e1901a1c0dd4a619b2f33a78ce78646cb2b66275;hpb=ed6f960acce2ed63b0d6b964aee7ee243d8c6446;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index e1901a1..bdbf0b5 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
@@ -118,7 +118,7 @@ END_EVENT_TABLE( );
 
 
 wxMPRWidget::wxMPRWidget( wxWindow* parent,
-                          marImageData *marimageData , double voxelSize)
+                          marImageData *marimageData )
 : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
 {
 
@@ -159,7 +159,6 @@ wxMPRWidget::wxMPRWidget( wxWindow* parent,
 
 	if(marimageData!=NULL){
 		_marImageData					= marimageData;
-		_voxelSize						= voxelSize;
 		_vtkmprbasedata					= new vtkMPRBaseData(); 
 		_vtkmprbasedata->SetMarImageData(_marImageData);
 		
@@ -191,38 +190,36 @@ wxMPRWidget::wxMPRWidget( wxWindow* parent,
 	_refreshBPage=0;
 
 }
-void wxMPRWidget::setImageData(vtkImageData * img, double voxelsize){
+
+//----------------------------------------------------------------------------
+void wxMPRWidget::setImageData(vtkImageData * img)
+{
 
 	if(_marImageData!=NULL){
 		_marImageData->removeImageData(0);
 		_marImageData->AddImageData(img);		
 	}else{
-		_marImageData = new marImageData(img);
+		_marImageData 					= new marImageData(img);
 	}
 	
-	_voxelSize						= voxelsize;
-
 	if(_vtkmprbasedata==NULL){
 		_vtkmprbasedata					= new vtkMPRBaseData(); 
 		_vtkmprbasedata->SetMarImageData(_marImageData);	
 
-		wxSplitterWindow	*pnlSplitter		= new wxSplitterWindow( this , -1);
+		wxSplitterWindow	*pnlSplitter= new wxSplitterWindow( this , -1);
 		pnlSplitter	-> SetMinimumPaneSize( 2 );
 		//RaC Nov2012 Correctly resize internal panels with the window resize event
 				pnlSplitter->SetSashGravity(0.5);
 
-		wxPanel				*MPRPanel	= CreateMPRPanel(pnlSplitter,_vtkmprbasedata);
+		wxPanel				*MPRPanel		= CreateMPRPanel(pnlSplitter,_vtkmprbasedata);
 		wxPanel				*controlPanel	= CreateControlPanel(pnlSplitter);	
 		pnlSplitter	-> SplitVertically( MPRPanel, controlPanel, 550 );
 
 		this->GetSizer()		-> Add( pnlSplitter ,1,wxGROW  ,0);
 	}	
-	
-
-	
 }
-//----------------------------------------------------------------------------
 
+//----------------------------------------------------------------------------
 wxMPRWidget::~wxMPRWidget( )
 {
 //EEDxx2.4 DELETE
@@ -388,7 +385,9 @@ wxPanel* wxMPRWidget::CreateView(int type,wxWindow *parent, vtkMPRBaseData *vtkm
 	}
 	if (type==4)
 	{
-		_wxsphereview_B		= new wxSphereView( panel , vtkmprbasedata, vtkmprbasedata->GetImageData() );
+//EED
+//		_wxsphereview_B		= new wxSphereView( panel , vtkmprbasedata, vtkmprbasedata->GetImageData() );
+		_wxsphereview_B		= new wxSphereView( panel , vtkmprbasedata  );
 		wxwindow=_wxsphereview_B->GetWxVTKRenderWindowInteractor();
 	}
 
@@ -537,7 +536,9 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm
 	notebook->AddPage( _widgetMesure, _T("Plane") );
 
 	 // view 3.1
-	_wxsphereview = new wxSphereView( notebook , vtkmprbasedata, vtkmprbasedata->GetImageData());
+// EED
+//	_wxsphereview = new wxSphereView( notebook , vtkmprbasedata, vtkmprbasedata->GetImageData());
+	_wxsphereview = new wxSphereView( notebook , vtkmprbasedata );
 	wxVTKRenderWindowInteractor *iren3B = _wxsphereview->GetWxVTKRenderWindowInteractor();	
 	notebook->AddPage( iren3B, _T("Sphere") );
 
@@ -654,42 +655,35 @@ void wxMPRWidget::ConfigureVTK(){
 	if (_vtkmprbasedata!=NULL)
 	{
 		_vtkmprbasedata->Configure();
-		x=_vtkmprbasedata			->	GetMaxPositionX()/2;
-		y=_vtkmprbasedata			->	GetMaxPositionY()/2;
-		z=_vtkmprbasedata			->	GetMaxPositionZ()/2;	
+		x = _vtkmprbasedata->GetMaxPositionX()/2;
+		y = _vtkmprbasedata->GetMaxPositionY()/2;
+		z = _vtkmprbasedata->GetMaxPositionZ()/2;	
 		_vtkmprbasedata->SetX( x );
 		_vtkmprbasedata->SetY( y );
 		_vtkmprbasedata->SetZ( z );
 	
 	}
 
-	if(_vtkmpr2Dview[0]!=NULL) {_vtkmpr2Dview[0]				->	Configure();}
-	if(_vtkmpr2Dview[1]!=NULL) {_vtkmpr2Dview[1]				->	Configure();}
-	if(_vtkmpr2Dview[2]!=NULL) {_vtkmpr2Dview[2]				->	Configure();}
-
-
-	if (_vtkmpr2Dview_B[0]!=NULL) {	_vtkmpr2Dview_B[0]				->	Configure(); }
-	if (_vtkmpr2Dview_B[1]!=NULL) {	_vtkmpr2Dview_B[1]				->	Configure(); }
-	if (_vtkmpr2Dview_B[2]!=NULL) { _vtkmpr2Dview_B[2]				->	Configure(); }
+	if(_vtkmpr2Dview[0]!=NULL) 		{ _vtkmpr2Dview[0]->Configure();					}
+	if(_vtkmpr2Dview[1]!=NULL) 		{ _vtkmpr2Dview[1]->Configure(); 					}
+	if(_vtkmpr2Dview[2]!=NULL) 		{ _vtkmpr2Dview[2]->Configure(); 					}
 
+	if (_vtkmpr2Dview_B[0]!=NULL) 	{ _vtkmpr2Dview_B[0]->Configure(); 					}
+	if (_vtkmpr2Dview_B[1]!=NULL) 	{ _vtkmpr2Dview_B[1]->Configure(); 					}
+	if (_vtkmpr2Dview_B[2]!=NULL) 	{ _vtkmpr2Dview_B[2]->Configure(); 					}
 
-	
-
-	if (_vtkplane2Dview!=NULL){_vtkplane2Dview				->	Configure();}
-	if (_widgetMesure!=NULL){_widgetMesure					->	ConfigureA(_vtkplane2Dview);}
-	if (_widgetMesure!=NULL){_widgetMesure					->	SetActiveLink(true);}
-	if (_widgetMesure!=NULL){_widgetMesure					->	SetMesureScale( _voxelSize );}
-	if (_wxsphereview!=NULL){_wxsphereview					->	Configure();}
+	if (_vtkplane2Dview!=NULL)		{ _vtkplane2Dview->Configure();						}
+	if (_widgetMesure!=NULL)		{ _widgetMesure->ConfigureA(_vtkplane2Dview);		}
+	if (_widgetMesure!=NULL)		{ _widgetMesure->SetActiveLink(true);				}
+	if (_wxsphereview!=NULL)		{ _wxsphereview->Configure();						}
 
-	if (_wxvtk3Dbaseview_MPRClipping3D!=NULL){_wxvtk3Dbaseview_MPRClipping3D	->  Configure();}
-	if (_wxvtkmpr3Dview!=NULL){
-		_wxvtkmpr3Dview					->	Configure();
-	}
-	if (_wxvtkclipping3Dview!=NULL){_wxvtkclipping3Dview		->	Configure();}
+	if (_wxvtk3Dbaseview_MPRClipping3D!=NULL){_wxvtk3Dbaseview_MPRClipping3D->Configure();}
+	if (_wxvtkmpr3Dview!=NULL)		{ _wxvtkmpr3Dview->Configure();						}
+	if (_wxvtkclipping3Dview!=NULL)	{ _wxvtkclipping3Dview->Configure();				}
 
-	if (_vtkplane2Dview_B!=NULL){	_vtkplane2Dview_B			->	Configure(); }
-	if (_widgetMesure_B!=NULL){		_widgetMesure_B				->	ConfigureA( _vtkplane2Dview_B ); }
-	if (_widgetMesure_B!=NULL){		_widgetMesure_B				->	SetActiveLink(true); }
+	if (_vtkplane2Dview_B!=NULL)	{ _vtkplane2Dview_B->Configure(); 					}
+	if (_widgetMesure_B!=NULL)		{ _widgetMesure_B->ConfigureA( _vtkplane2Dview_B ); }
+	if (_widgetMesure_B!=NULL)		{ _widgetMesure_B->SetActiveLink(true); 			}
 
 //EEDx3
 //	double spc[3];
@@ -698,8 +692,6 @@ void wxMPRWidget::ConfigureVTK(){
 //	imageData->GetSpacing(spc);
 //	_widgetMesure_B->SetMesureScale(spc[0]);
 
-	if (_widgetMesure_B!=NULL)					{_widgetMesure_B->SetMesureScale( _voxelSize );}
-
 
 	if (_wxsphereview_B!=NULL)					{_wxsphereview_B				->	Configure();}