v1.0.3 BUG 1404

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
index b3e42b198faf15b09e6880c9f2ac28151bbcb633..2df266f8300cabad55b8d5155d8b68d2c4b22f8a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxManualTree_MPRWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/31 16:32:42 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/03/17 16:52:51 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -23,6 +23,7 @@
 #include <wx/notebook.h>
 #include <wx/colordlg.h>
 
+#include "vtkInteractorStyle3DView.h"
 
 
 //-------------------------------------------------------------------
@@ -98,8 +99,8 @@ wxPanel* wxManualTree_MPRWidget::Create3DViewContour( wxWindow *parent, vtkMPRBa
        wxWindow        *window3D                               = _wxvtk3Dbaseview_Clipping3D_C->GetWxVTKRenderWindowInteractor();
 
        wxPanel         *panelControl                   = new wxPanel(panelClipping3D,-1);      
-       wxPanel         *controlPanelMPR3D              = _wxvtkmpr3Dview_C->CreateControlPanel(panelControl);
-       wxPanel         *controlPanelClipping3D = _wxvtkclipping3Dview_C->CreateControlPanel(panelControl);
+       wxPanel         *controlPanelMPR3D              = _wxvtkmpr3Dview_C->CreateControlPanel(panelControl, false);
+       wxPanel         *controlPanelClipping3D = _wxvtkclipping3Dview_C->CreateSurfControlPanel(panelControl);
 
 //     wxBoxSizer  *sizerCtrol             = new wxBoxSizer(wxVERTICAL);
        wxFlexGridSizer  *sizerCtrol             = new wxFlexGridSizer(1);
@@ -156,7 +157,7 @@ void wxManualTree_MPRWidget::ConfigureContour()
 //EED 3 oct 2006
        _mViewContour_2->SetSpacing(spc);
 
-       wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_2 );
+       ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_2 );
 
        //
        wxvtkbaseview                   = _MPRWidget2->GetWxVtkBaseView(0,0);
@@ -170,7 +171,7 @@ void wxManualTree_MPRWidget::ConfigureContour()
 //EED 3 oct 2006
        _mViewContour_0->SetSpacing(spc);
 
-       wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_0 );
+       ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_0 );
 
        //
        wxvtkbaseview                   = _MPRWidget2->GetWxVtkBaseView(0,1);
@@ -184,7 +185,7 @@ void wxManualTree_MPRWidget::ConfigureContour()
 //EED 3 oct 2006
        _mViewContour_1->SetSpacing(spc);
 
-       wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_1 );
+       ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_1 );
 
 
        // perpendicular plane
@@ -200,7 +201,7 @@ void wxManualTree_MPRWidget::ConfigureContour()
        _mViewContour_p->SetSpacing(spc);
 
 //     wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_p );
-       wxvtkbaseview->GetInteractorStyleBaseView()->InsertInteractorStyleMaracas( 0, _manContourControl_p );
+       ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->InsertInteractorStyleMaracas( 0, _manContourControl_p );
 
        vtkPlane2DView *vtkplane2Dview = (vtkPlane2DView*)wxvtkbaseview;
        _manContourControl_p->SetVtkInteractorStylePlane2D( vtkplane2Dview->GetInteractorstyleplane2D() );
@@ -221,7 +222,7 @@ void wxManualTree_MPRWidget::ConfigureContour()
        this->_marimageData->GetImageData()->GetDimensions( dim );  // image t=0
        _mViewContour_3D->SetDimensions( dim[0],dim[1],dim[2] );
        _mViewContour_3D->SetVtkMPRBaseData( _wxvtkmpr3Dview_C->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData() );
-       wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_3V3D );
+       ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_3V3D );
 
        //
        _manContourControl_0    -> SetVtkMPRBaseData( _MPRWidget2->GetVtkMPRBaseData() );
@@ -257,7 +258,7 @@ void wxManualTree_MPRWidget::ConfigureContour()
        _manContourControl_3V   -> AddManualViewBaseContour( _mViewContour_0    );
        _manContourControl_3V   -> AddManualViewBaseContour( _mViewContour_1    );
        _manContourControl_3V   -> AddManualViewBaseContour( _mViewContour_p    );
-       _manContourControl_3V   -> SetVtkInteractorStyleBaseView (wxvtkbaseview->GetInteractorStyleBaseView() );
+       _manContourControl_3V   -> SetVtkInteractorStyleBaseView ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView() );
        _manContourControl_3V3D -> SetManualContour3VControler( _manContourControl_3V );
        _manContourControl_3V3D -> SetModelView( _mContourModel_2 , _mViewContour_3D );
 
@@ -269,7 +270,7 @@ void wxManualTree_MPRWidget::ConfigureContour()
        _manContourControl_3V_p -> AddManualViewBaseContour( _mViewContour_0    );
        _manContourControl_3V_p -> AddManualViewBaseContour( _mViewContour_1    );
        _manContourControl_3V_p -> AddManualViewBaseContour( _mViewContour_3D   );
-       _manContourControl_3V_p -> SetVtkInteractorStyleBaseView (wxvtkbaseview->GetInteractorStyleBaseView() );
+       _manContourControl_3V_p -> SetVtkInteractorStyleBaseView ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView() );
        _manContourControl_p    -> SetManualContour3VControler( _manContourControl_3V_p );
        _manContourControl_p    -> SetModelView( _mContourModel_2 , _mViewContour_p );
 
@@ -311,7 +312,7 @@ void wxManualTree_MPRWidget::ConfigureVTK(){
        vtkInteractorStyle3DView *vtkinteractorstyle3Dview      = new vtkInteractorStyle3DView();
        vtkinteractorstyle3Dview->SetWxVtkMPR3DView(_wxvtkmpr3Dview_C);
        vtkinteractorstyle3Dview->SetWxVtkClipping3DView(_wxvtkclipping3Dview_C);
-       _wxvtk3Dbaseview_Clipping3D_C->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( vtkinteractorstyle3Dview );
+       ((vtkInteractorStyleBaseView*)_wxvtk3Dbaseview_Clipping3D_C->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( vtkinteractorstyle3Dview );
 
        ConfigureContour();
 }