X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget.cxx;h=67606299255f14f666ae5337dec6a3314de33f35;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=99fad9d0c4426b44050d5452c4c7294b7389dd8c;hpb=307866a8f06b14018ea832926bdf3d887bfffea8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index 99fad9d..6760629 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
@@ -81,7 +81,7 @@
 
 
 #include "wxMPRWidget.h"
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 #include "UtilVtk3DGeometriSelection.h"
 #include "../kernel/marDicomBase.h"
 
@@ -510,17 +510,17 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm
 	// view 0
 	_vtkmpr2Dview[0] = new wxVtkMPR2DView(panel,0);
 	_vtkmpr2Dview[0]->SetVtkBaseData(vtkmprbasedata);
-	wxVTKRenderWindowInteractor *iren0 = _vtkmpr2Dview[0]->GetWxVTKRenderWindowInteractor();	
+	crea::wxVTKRenderWindowInteractor *iren0 = _vtkmpr2Dview[0]->GetWxVTKRenderWindowInteractor();	
 
 	// view 1
 	_vtkmpr2Dview[1] = new wxVtkMPR2DView(panel,1);
 	_vtkmpr2Dview[1]->SetVtkBaseData(vtkmprbasedata);
-	wxVTKRenderWindowInteractor *iren1 = _vtkmpr2Dview[1]->GetWxVTKRenderWindowInteractor();	
+	crea::wxVTKRenderWindowInteractor *iren1 = _vtkmpr2Dview[1]->GetWxVTKRenderWindowInteractor();	
 
 	// view 2
 	_vtkmpr2Dview[2] = new wxVtkMPR2DView(panel,2);
 	_vtkmpr2Dview[2]->SetVtkBaseData(vtkmprbasedata);
-	wxVTKRenderWindowInteractor *iren2 = _vtkmpr2Dview[2]->GetWxVTKRenderWindowInteractor();	
+	crea::wxVTKRenderWindowInteractor *iren2 = _vtkmpr2Dview[2]->GetWxVTKRenderWindowInteractor();	
 
 	// view 3
 	wxNotebook *notebook = new wxNotebook( panel, -1 );
@@ -539,7 +539,7 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm
 // EED
 //	_wxsphereview = new wxSphereView( notebook , vtkmprbasedata, vtkmprbasedata->GetImageData());
 	_wxsphereview = new wxSphereView( notebook , vtkmprbasedata );
-	wxVTKRenderWindowInteractor *iren3B = _wxsphereview->GetWxVTKRenderWindowInteractor();	
+	crea::wxVTKRenderWindowInteractor *iren3B = _wxsphereview->GetWxVTKRenderWindowInteractor();	
 	notebook->AddPage( iren3B, _T("Sphere") );
 
 	 // view 3.2
@@ -560,21 +560,16 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm
 	_wxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer);
 
 
-	wxWindow	*window3D				= _wxvtk3Dbaseview_MPRClipping3D->GetWxVTKRenderWindowInteractor();
-
+	wxWindow	*window3D			= _wxvtk3Dbaseview_MPRClipping3D->GetWxVTKRenderWindowInteractor();
 	wxPanel		*panelControl			= new wxPanel(panelMPR3D,-1);
 	wxPanel		*controlPanelMPR3D		= _wxvtkmpr3Dview->CreateControlPanel(panelControl, false);
 	wxPanel		*controlPanelClipping3D = _wxvtkclipping3Dview->CreateSurfControlPanel(panelControl);
 
-
-
-
 //    wxBoxSizer	 *sizerCtrol             = new wxBoxSizer(wxVERTICAL);
 	wxFlexGridSizer  *sizerCtrol             = new wxFlexGridSizer(1);
 	sizerCtrol->Add(controlPanelMPR3D		, 1, wxALL|wxEXPAND, 2);
 	sizerCtrol->Add(controlPanelClipping3D	, 1, wxALL|wxEXPAND, 2);
 
-
 	panelControl->SetAutoLayout(true);
 	panelControl->SetSizer(sizerCtrol);
 	panelControl->SetSize(400,150);
@@ -585,12 +580,8 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm
 	//RaC Nov2012 Correctly resize internal panels with the window resize event
 	panelMPR3D->SetSashGravity(0.5);
 	panelMPR3D	-> SplitHorizontally( panelControl,window3D,200  );
-
 	notebook->AddPage( panelMPR3D, _T("MPR 3D - Clipping") );
-
-
 	Connect(notebook->GetId()	, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED  , (wxObjectEventFunction) &wxMPRWidget::OnPageBChanged	);
-
 	wxBoxSizer *sizerV = new wxBoxSizer(wxVERTICAL);
 	wxBoxSizer *sizerH1= new wxBoxSizer(wxHORIZONTAL);
 	wxBoxSizer *sizerH2= new wxBoxSizer(wxHORIZONTAL);
@@ -655,41 +646,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[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_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 (_wxsphereview!=NULL)		{ _wxsphereview->Configure();						}
 
+	if (_wxvtk3Dbaseview_MPRClipping3D!=NULL){_wxvtk3Dbaseview_MPRClipping3D->Configure();}
+	if (_wxvtkmpr3Dview!=NULL)		{ _wxvtkmpr3Dview->Configure();						}
+	if (_wxvtkclipping3Dview!=NULL)	{ _wxvtkclipping3Dview->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 (_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];