X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget.cxx;h=218e4240f18ea96af58c714ae036269456e88e3a;hb=b80b4dcc301c1c2c63c0f76cd06b0a434350f7a7;hp=e1901a1c0dd4a619b2f33a78ce78646cb2b66275;hpb=97dee12beaba08089198ed7bab9544b8b4c4f240;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..218e424 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
@@ -191,38 +191,38 @@ wxMPRWidget::wxMPRWidget( wxWindow* parent,
 	_refreshBPage=0;
 
 }
-void wxMPRWidget::setImageData(vtkImageData * img, double voxelsize){
+
+//----------------------------------------------------------------------------
+void wxMPRWidget::setImageData(vtkImageData * img, double voxelsize)
+{
 
 	if(_marImageData!=NULL){
 		_marImageData->removeImageData(0);
 		_marImageData->AddImageData(img);		
 	}else{
-		_marImageData = new marImageData(img);
+		_marImageData 					= new marImageData(img);
 	}
 	
-	_voxelSize						= voxelsize;
+	_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 +388,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 +539,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") );