#3138 creaMaracasVisu Feature New Normal - branch vtk7itk4wx3

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMPRWidget.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx
index bdbf0b50573dfc6513386a5699c9c0c0d6702032..67606299255f14f666ae5337dec6a3314de33f35 100644 (file)
--- 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);