X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=f10eac6739610d3869fdadfd54997eeb4dcdabf2;hb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;hp=66b0d25091c7412de0035091e5f08e603a61a20f;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;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 66b0d25..f10eac6 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: 2008/10/31 16:32:42 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/05/14 13:54:35 $ + Version: $Revision: 1.12 $ Copyright: (c) 2002, 2003 License: @@ -38,7 +38,7 @@ mType = type; - marImageData *marimagedata = new marImageData( imagedata ); + marImageData *marimagedata = new marImageData( imagedata ); mvtkmprbasedata = new vtkMPRBaseData(); mvtkmprbasedata->SetMarImageData(marimagedata); @@ -51,7 +51,9 @@ mwxsphereview = NULL; mwxvtkclipping3Dview = NULL; mwxvtk3Dbaseview_Clipping3D = NULL; - mwxvtkmpr3Dview = NULL; + mwxvtkmpr3Dview = NULL; + vtkmpr3Ddataviewer = NULL; + if (type==-1) { @@ -63,19 +65,20 @@ if (type==0) { - mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,0); + mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2); mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata); wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor(); } if (type==1) { - mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,1); + mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0); mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata); wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor(); } + if (type==2) { - mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,2); + mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1); mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata); wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor(); } @@ -136,11 +139,51 @@ wxwindow=panelClipping3D; } + if (type==6) + { + wxSplitterWindow *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); + + wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1); + sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2); + + panelControl->SetAutoLayout(true); + panelControl->SetSizer(sizerCtrol); + panelControl->SetSize(400,350); + panelControl->Layout(); + panelClipping3D -> SetMinimumPaneSize( 5 ); + panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 ); + wxwindow=panelClipping3D; + + + vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); + //vtkmpr3Ddataviewer->Configure(); + + mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); + + } + + + wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add( wxwindow , 1, wxEXPAND, 0); + sizer->Add( wxwindow , 1, wxGROW); panel->SetSizer(sizer); panel->SetAutoLayout(true); + sizer->Layout(); panel->Layout(); + panel->Refresh(); // mbbtkViewerMaracas= NULL; } @@ -148,9 +191,19 @@ wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget() { + if (mvtkmprbasedata) { delete mvtkmprbasedata; } + if (mvtk2Dbaseview) { delete mvtk2Dbaseview; } + if (mvtkmpr2Dview_X) { delete mvtkmpr2Dview_X; } + if (mvtkmpr2Dview_Y) { delete mvtkmpr2Dview_Y; } + if (mvtkmpr2Dview_Z) { delete mvtkmpr2Dview_Z; } + if (mwidgetMesure) { delete mwidgetMesure; } + if (mvtkplane2Dview) { delete mvtkplane2Dview; } + if (mwxsphereview) { delete mwxsphereview; } + if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview; } + if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; } + if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview; } } - //------------------------------------------------------------------------------------------------------------ // Methods //------------------------------------------------------------------------------------------------------------ @@ -160,6 +213,44 @@ void wxMaracas_ViewerWidget::ConfigureVTK() { int x=0,y=0,z=0; + int ext[6]; + ext[0]=0; + ext[1]=0; + ext[2]=0; + ext[3]=0; + ext[4]=0; + ext[5]=0; + double org[3],spc[3]; + org[0]=0; + org[1]=0; + org[2]=0; + spc[0]=0; + spc[1]=0; + spc[2]=0; + + + + if (mvtkmprbasedata!=NULL) + { + mvtkmprbasedata->Configure(); + /*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 ( mvtk2Dbaseview !=NULL ) { mvtk2Dbaseview -> Configure(); } if ( mvtkmpr2Dview_X !=NULL ) { mvtkmpr2Dview_X -> Configure(); } @@ -173,19 +264,32 @@ if ( mwxsphereview !=NULL ) { mwxsphereview -> Configure(); } if (mwxvtk3Dbaseview_Clipping3D !=NULL) { mwxvtk3Dbaseview_Clipping3D -> Configure(); } - if (mwxvtkmpr3Dview !=NULL) { mwxvtkmpr3Dview -> Configure(); } + + if (vtkmpr3Ddataviewer !=NULL) { + vtkmpr3Ddataviewer->Configure(); + + } + if (mwxvtkmpr3Dview !=NULL) { + + mwxvtkmpr3Dview -> Configure(); + mwxvtkmpr3Dview ->ResetCamera(ext,org,spc); + + + } + if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview -> Configure(); } + + + + + + //if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();} +// RefreshView(); + + //if (mwxvtkmpr3Dview !=NULL) { + // mwxvtkmpr3Dview->ResetCamera(); + //} - if (mvtkmprbasedata!=NULL) - { - x = mvtkmprbasedata -> GetMaxPositionX()/2; - y = mvtkmprbasedata -> GetMaxPositionY()/2; - z = mvtkmprbasedata -> GetMaxPositionZ()/2; - mvtkmprbasedata->SetX( x ); - mvtkmprbasedata->SetY( y ); - mvtkmprbasedata->SetZ( z ); - } - RefreshView(); } //------------------------------------------------------------------------- @@ -198,6 +302,7 @@ //------------------------------------------------------------------------- void wxMaracas_ViewerWidget::RefreshView() { + if (mvtk2Dbaseview !=NULL ){ mvtk2Dbaseview -> Refresh(); } if (mvtkmpr2Dview_X !=NULL ){ mvtkmpr2Dview_X -> Refresh(); } if (mvtkmpr2Dview_Y !=NULL ){ mvtkmpr2Dview_Y -> Refresh(); } @@ -208,6 +313,7 @@ if (mwxvtkmpr3Dview !=NULL ){ mwxvtkmpr3Dview -> RefreshView(); } if (mwxvtkclipping3Dview !=NULL ){ mwxvtkclipping3Dview -> Refresh(); } if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D -> Refresh(); } + } //------------------------------------------------------------------------- @@ -215,19 +321,41 @@ wxVtkBaseView *wxMaracas_ViewerWidget::GetwxVtkBaseView() { wxVtkBaseView *wxvtkbaseview=NULL; - if (mvtk2Dbaseview!=NULL) { wxvtkbaseview = mvtk2Dbaseview; } - if (mvtkmpr2Dview_X!=NULL) { wxvtkbaseview = mvtkmpr2Dview_X; } - if (mvtkmpr2Dview_Y!=NULL) { wxvtkbaseview = mvtkmpr2Dview_Y; } - if (mvtkmpr2Dview_Z!=NULL) { wxvtkbaseview = mvtkmpr2Dview_Z; } - if (mvtkplane2Dview!=NULL) { wxvtkbaseview = mvtkplane2Dview; } - if (mwxsphereview!=NULL) { wxvtkbaseview = mwxsphereview; } - if (mwxvtk3Dbaseview_Clipping3D!=NULL) { wxvtkbaseview = mwxvtk3Dbaseview_Clipping3D;} + if (mvtk2Dbaseview!=NULL) { + wxvtkbaseview = mvtk2Dbaseview; + } + if (mvtkmpr2Dview_X!=NULL){ + wxvtkbaseview = mvtkmpr2Dview_X; + } + if (mvtkmpr2Dview_Y!=NULL){ + wxvtkbaseview = mvtkmpr2Dview_Y; + } + if (mvtkmpr2Dview_Z!=NULL){ + wxvtkbaseview = mvtkmpr2Dview_Z; + } + if (mvtkplane2Dview!=NULL){ + wxvtkbaseview = mvtkplane2Dview; + } + if (mwxsphereview!=NULL){ + wxvtkbaseview = mwxsphereview; + } + if (mwxvtk3Dbaseview_Clipping3D!=NULL) { + wxvtkbaseview = mwxvtk3Dbaseview_Clipping3D; + } return wxvtkbaseview ; } void wxMaracas_ViewerWidget::SetImage( vtkImageData *image ) { - printf("EED wxMaracas_ViewerWidget::SetImage IMPORTANT this methode is missing \n"); + marImageData* mar = mvtkmprbasedata->GetMarImageData(); + mar->removeImageData(0); + mar->AddImageData(image); + + ConfigureVTK(); + RefreshView(); + + + } double wxMaracas_ViewerWidget :: GetX()