X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxManualTree_MPRWidget.cxx;h=73e238e94eda97041ba2e32741dd5c954f8ece46;hb=dea0efc567d8332b2e7eb936e3ba4ac1c11b2542;hp=b3e42b198faf15b09e6880c9f2ac28151bbcb633;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx index b3e42b1..73e238e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx @@ -1,10 +1,35 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + /*========================================================================= Program: wxMaracas Module: $RCSfile: wxManualTree_MPRWidget.cxx,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:42 $ - Version: $Revision: 1.1 $ + Date: $Date: 2012/11/15 14:14:35 $ + Version: $Revision: 1.5 $ Copyright: (c) 2002, 2003 License: @@ -23,6 +48,7 @@ #include #include +#include "vtkInteractorStyle3DView.h" //------------------------------------------------------------------- @@ -36,12 +62,11 @@ END_EVENT_TABLE( ); wxManualTree_MPRWidget::wxManualTree_MPRWidget( wxWindow* parent, - marImageData *marimageData ,double voxelSize) + marImageData *marimageData ) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) { - _voxelSize = voxelSize; - _marimageData = marimageData; + _marimageData = marimageData; _wxvtk3Dbaseview_Clipping3D_C = NULL; _wxvtkmpr3Dview_C = NULL; @@ -50,7 +75,7 @@ wxManualTree_MPRWidget::wxManualTree_MPRWidget( wxWindow* parent, wxSplitterWindow *pnlSplitter = new wxSplitterWindow( this , -1); int ww,hh; - _MPRWidget2 = new wxMPRWidget2(pnlSplitter,_marimageData,voxelSize); + _MPRWidget2 = new wxMPRWidget2(pnlSplitter,_marimageData); wxPanel * contour3DView = Create3DViewContour( pnlSplitter , _MPRWidget2->GetVtkMPRBaseData()); this->GetSize(&ww,&hh); @@ -81,7 +106,7 @@ wxPanel* wxManualTree_MPRWidget::Create3DViewContour( wxWindow *parent, vtkMPRBa wxPanel *panel=new wxPanel(parent,-1); wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1); - _wxvtk3Dbaseview_Clipping3D_C = new wxVtk3DBaseView( panelClipping3D ); + _wxvtk3Dbaseview_Clipping3D_C = new wxVtk3DBaseView( panelClipping3D, vtkmprbasedata ); _wxvtkclipping3Dview_C = new wxVtkClipping3DView(_wxvtk3Dbaseview_Clipping3D_C); vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer(); @@ -98,8 +123,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); @@ -151,12 +176,11 @@ void wxManualTree_MPRWidget::ConfigureContour() _mViewContour_2->SetModel( _mContourModel_2 ); _mViewContour_2->SetWxVtkBaseView( wxvtkbaseview ); _mViewContour_2->SetRange( 1 ); - _mViewContour_2->SetMesureScale( _voxelSize ); //EED 3 oct 2006 _mViewContour_2->SetSpacing(spc); - wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_2 ); + ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_2 ); // wxvtkbaseview = _MPRWidget2->GetWxVtkBaseView(0,0); @@ -165,12 +189,11 @@ void wxManualTree_MPRWidget::ConfigureContour() _mViewContour_0->SetModel( _mContourModel_2 ); _mViewContour_0->SetWxVtkBaseView( wxvtkbaseview ); _mViewContour_0->SetRange( 1 ); - _mViewContour_0->SetMesureScale( _voxelSize ); //EED 3 oct 2006 _mViewContour_0->SetSpacing(spc); - wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_0 ); + ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_0 ); // wxvtkbaseview = _MPRWidget2->GetWxVtkBaseView(0,1); @@ -179,12 +202,11 @@ void wxManualTree_MPRWidget::ConfigureContour() _mViewContour_1->SetModel( _mContourModel_2 ); _mViewContour_1->SetWxVtkBaseView( wxvtkbaseview ); _mViewContour_1->SetRange( 1 ); - _mViewContour_1->SetMesureScale( _voxelSize ); //EED 3 oct 2006 _mViewContour_1->SetSpacing(spc); - wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manContourControl_1 ); + ((vtkInteractorStyleBaseView*)wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manContourControl_1 ); // perpendicular plane @@ -194,13 +216,12 @@ void wxManualTree_MPRWidget::ConfigureContour() _mViewContour_p -> SetModel( _mContourModel_2 ); _mViewContour_p -> SetWxVtkBaseView( wxvtkbaseview ); _mViewContour_p -> SetRange( 1 ); - _mViewContour_p->SetMesureScale( _voxelSize ); //EED 3 oct 2006 _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() ); @@ -212,7 +233,6 @@ void wxManualTree_MPRWidget::ConfigureContour() _mViewContour_3D->SetModel( _mContourModel_2 ); _mViewContour_3D->SetWxVtkBaseView( wxvtkbaseview ); _mViewContour_3D->SetRange( 1 ); - _mViewContour_3D->SetMesureScale(_voxelSize ); //EED 3 oct 2006 _mViewContour_3D->SetSpacing(spc); @@ -221,7 +241,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 +277,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 +289,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 +331,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(); }