X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=66d647ef5e373504159a2ea02fb2bf8b52938438;hb=00a6c465c4e2fd1111dbb10cc0d70846fa03eeaa;hp=4e2e626b3ac071286f4ca25c087fda2733b110b0;hpb=6a3077638c3045db3888c8c5641d141ff078c8dc;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx index 4e2e626..66d647e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $ Language: C++ - Date: $Date: 2009/09/15 11:25:07 $ - Version: $Revision: 1.17 $ + Date: $Date: 2010/03/17 16:52:51 $ + Version: $Revision: 1.24 $ Copyright: (c) 2002, 2003 License: @@ -19,7 +19,7 @@ // Definition includes //------------------------------------------------------------------------------------------------------------ #include "wxMaracas_ViewerWidget.h" - +#include //------------------------------------------------------------------------------------------------------------ // Other includes //------------------------------------------------------------------------------------------------------------ @@ -34,7 +34,17 @@ : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) { wxPanel *panel = this; - wxWindow *wxwindow = NULL; + wxWindow *wxwindow = NULL, *window3D = 0; + wxSplitterWindow *panelClipping3D = 0; +// wxPanel *panelControl = 0; +// wxFlexGridSizer *sizerCtrol = 0; + wxPanel *controlPanelMPR3D = 0; + wxPanel *controlPanelClippingSurf3D = 0; + //RaC 03-2010 Adding a tab + wxPanel *controlPanelClippingVol3D = 0; + + wxBoxSizer *sizer = 0; + mType = type; @@ -69,31 +79,22 @@ mvtk2Dbaseview = new wxVtk2DBaseView(panel); mvtk2Dbaseview->SetVtkBaseData(mvtkmprbasedata); wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor(); - } - - - if (type==0) + }else if (type==0) { mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2); mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata); wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor(); - } - if (type==1) + }else if (type==1) { mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0); mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata); wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor(); - } - - if (type==2) + }else if (type==2) { mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1); mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata); wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor(); - } - - - if (type==3) + }else if (type==3) { mwidgetMesure = new wxWidgetMesure2D_Plane_in_MPR(panel); mvtkplane2Dview = new vtkPlane2DView( mwidgetMesure->GetWindow2()); @@ -101,17 +102,13 @@ mvtkplane2Dview -> SetImgSize( 200 ); mvtkplane2Dview -> SetVtkBaseData(mvtkmprbasedata); wxwindow = mwidgetMesure; - } - if (type==4) + }else if (type==4) { mwxsphereview = new wxSphereView( panel , mvtkmprbasedata, mvtkmprbasedata->GetImageData() ); wxwindow=mwxsphereview->GetWxVTKRenderWindowInteractor(); - } - - - if (type==5) + }else if (type==5) { - wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1); + panelClipping3D = new wxSplitterWindow( panel , -1); mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D); @@ -126,44 +123,60 @@ vtkmpr3Ddataviewer->Configure(); mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); - wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); + window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); - wxPanel *panelControl = new wxPanel(panelClipping3D,-1); - wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl); - wxPanel *controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl); + +//-- + wxNotebook *notebook = new wxNotebook(panelClipping3D, -1); + + // First tab + controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(notebook, true); + notebook->AddPage(controlPanelMPR3D, _T("Planes") ); + + // Second Tab + controlPanelClippingSurf3D = mwxvtkclipping3Dview->CreateSurfControlPanel(notebook); + notebook->AddPage(controlPanelClippingSurf3D, _T("Surface") ); + + //Third tab + //RaC 03-2010 Moving the volume functionnality to other tab. The changes were realized only in the wxVtkClipping3DViewCntrlPanel class + controlPanelClippingVol3D = mwxvtkclipping3Dview->CreateVolControlPanel(notebook); + notebook->AddPage(controlPanelClippingVol3D, _T("Volume") ); + + + panelClipping3D -> SplitHorizontally( notebook , window3D , 10 ); + panelClipping3D -> SetMinimumPaneSize( 15 ); + + /* EED 04 / Febrary / 2010 + panelControl = new wxPanel(panelClipping3D,-1); + controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false); + controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl); // mbtnCutImageData = new wxCheckBox(panelControl,-1,_T("Cut Module")); // Connect(_btnCutImageData->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxMPRWidget::OnCutImagaData ); - - wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1); + sizerCtrol = new wxFlexGridSizer(1); sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2); sizerCtrol->Add(controlPanelClipping3D , 1, wxALL|wxEXPAND, 2); // sizerCtrol->Add( mbtnCutImageData , 1, wxALL, 2); - panelControl->SetAutoLayout(true); panelControl->SetSizer(sizerCtrol); panelControl->SetSize(400,350); panelControl->Layout(); - panelClipping3D -> SetMinimumPaneSize( 5 ); panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 ); + panelClipping3D -> SetMinimumPaneSize( 5 ); + */ wxwindow=panelClipping3D; - } - - if (type==6) - { - wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1); + + } else if (type==6) { + panelClipping3D = new wxSplitterWindow( panel , -1); mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); - vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); - - wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); wxPanel *panelControl = new wxPanel(panelClipping3D,-1); - wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl); + wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false); wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1); sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2); @@ -182,11 +195,17 @@ mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); - } - + }else if (type==7) + { + + mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel ); + wxwindow = (wxWindow*) mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); + + } - wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); + + sizer = new wxBoxSizer(wxVERTICAL); sizer->Add( wxwindow , 1, wxGROW); panel->SetSizer(sizer); panel->SetAutoLayout(true); @@ -215,13 +234,14 @@ if (mwxsphereview) { delete mwxsphereview; } if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview; } if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview; } - if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; } + if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;} } //------------------------------------------------------------------------------------------------------------ // Methods //------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------- + void wxMaracas_ViewerWidget::ConfigureVTK() { @@ -249,19 +269,27 @@ /*x = mvtkmprbasedata -> GetMaxPositionX()/2; y = mvtkmprbasedata -> GetMaxPositionY()/2; z = mvtkmprbasedata -> GetMaxPositionZ()/2; */ - - mvtkmprbasedata->GetImageData()->GetExtent(ext); - mvtkmprbasedata->GetImageData()->GetOrigin(org); - mvtkmprbasedata->GetImageData()->GetSpacing(spc); - - x = (ext[0]+ext[1])/2; - y = (ext[2]+ext[3])/2; - z = (ext[4]+ext[5])/2; - - mvtkmprbasedata->SetX( x ); - mvtkmprbasedata->SetY( y ); - mvtkmprbasedata->SetZ( z ); - + + if(mvtkmprbasedata->GetImageData() != NULL) + { + mvtkmprbasedata->GetImageData()->GetExtent(ext); + mvtkmprbasedata->GetImageData()->GetOrigin(org); + mvtkmprbasedata->GetImageData()->GetSpacing(spc); + + x = (ext[0]+ext[1])/2; + y = (ext[2]+ext[3])/2; + z = (ext[4]+ext[5])/2; + + mvtkmprbasedata->SetX( x ); + mvtkmprbasedata->SetY( y ); + mvtkmprbasedata->SetZ( z ); + } + else + { + mvtkmprbasedata->SetX( 0 ); + mvtkmprbasedata->SetY( 0 ); + mvtkmprbasedata->SetZ( 0 ); + } } @@ -276,7 +304,10 @@ if ( mwidgetMesure !=NULL ) { mwidgetMesure -> SetMesureScale( 1 ); } if ( mwxsphereview !=NULL ) { mwxsphereview -> Configure(); } - if (mwxvtk3Dbaseview_Clipping3D !=NULL) { mwxvtk3Dbaseview_Clipping3D -> Configure(); } + if (mwxvtk3Dbaseview_Clipping3D !=NULL) { + mwxvtk3Dbaseview_Clipping3D -> Configure(); + + } if (vtkmpr3Ddataviewer !=NULL) { vtkmpr3Ddataviewer->Configure(); @@ -292,7 +323,10 @@ if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview -> Configure(); } - + + + + @@ -360,30 +394,46 @@ void wxMaracas_ViewerWidget::SetImage( vtkImageData *image ) { - marImageData* mar = mvtkmprbasedata->GetMarImageData(); - mar->removeImageData(0); - mar->AddImageData(image); - - ConfigureVTK(); - RefreshView(); - - + if(mvtkmprbasedata !=NULL) + { + marImageData* mar = mvtkmprbasedata->GetMarImageData(); + mar->removeImageData(0); + mar->AddImageData(image); + } +//EED 26/11/2009 +// ConfigureVTK(); +// RefreshView(); } double wxMaracas_ViewerWidget :: GetX() { - return mvtkmprbasedata->GetX(); + double value = -1; + if(mvtkmprbasedata !=NULL) + { + value = mvtkmprbasedata->GetX(); + } + return value; } double wxMaracas_ViewerWidget :: GetY() { - return mvtkmprbasedata->GetY(); + double value = -1; + if(mvtkmprbasedata !=NULL) + { + value = mvtkmprbasedata->GetY(); + } + return value; } double wxMaracas_ViewerWidget :: GetZ() { - return mvtkmprbasedata->GetZ(); + double value = -1; + if(mvtkmprbasedata !=NULL) + { + value = mvtkmprbasedata->GetZ(); + } + return value; // return mvtk2Dbaseview->GetVtkBaseData()->GetZ(); } @@ -430,4 +480,7 @@ /*if(mwxvtkmpr3Dview!=NULL){ mwxvtkmpr3Dview->setColorLevel(level); }*/ - } \ No newline at end of file + } + + +