X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=86642eedc29c069e2b420eb7a9a30617c9b5f01f;hb=241ec043d82df169705445f317b332207fd1b6b2;hp=d86fec0162637eb518d4b636c3e9561b9ed610c6;hpb=a9d9fb67805b906ffb5912f56eae5578a7c432ca;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 d86fec0..86642ee 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/04/01 08:41:35 $ - Version: $Revision: 1.6 $ + Date: $Date: 2009/12/01 21:22:12 $ + Version: $Revision: 1.21 $ Copyright: (c) 2002, 2003 License: @@ -30,7 +30,7 @@ //------------------------------------------------------------------------------------------------------------ - wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type) + wxMaracas_ViewerWidget::wxMaracas_ViewerWidget(wxWindow *parent, vtkImageData* imagedata, int type, vtkMPRBaseData *vtkmprbasedata) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) { wxPanel *panel = this; @@ -38,9 +38,18 @@ mType = type; - marImageData *marimagedata = new marImageData( imagedata ); - mvtkmprbasedata = new vtkMPRBaseData(); - mvtkmprbasedata->SetMarImageData(marimagedata); + + if (vtkmprbasedata==NULL) + { + minternalVtkmprbasedata = true; + mvtkmprbasedata = new vtkMPRBaseData(); + marImageData *marimagedata = new marImageData( imagedata ); + mvtkmprbasedata->SetMarImageData(marimagedata); + } else { + minternalVtkmprbasedata = false; + mvtkmprbasedata = vtkmprbasedata; + } + mvtk2Dbaseview = NULL; mvtkmpr2Dview_X = NULL; @@ -51,11 +60,10 @@ mwxsphereview = NULL; mwxvtkclipping3Dview = NULL; mwxvtk3Dbaseview_Clipping3D = NULL; - mwxvtkmpr3Dview = NULL; + mwxvtkmpr3Dview = NULL; + vtkmpr3Ddataviewer = NULL; - std::cout<<"mtype "<GetWxVTKRenderWindowInteractor(); wxPanel *panelControl = new wxPanel(panelClipping3D,-1); - wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl); + wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false); wxPanel *controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl); // mbtnCutImageData = new wxCheckBox(panelControl,-1,_T("Cut Module")); // Connect(_btnCutImageData->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxMPRWidget::OnCutImagaData ); @@ -146,15 +154,16 @@ mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); - vtkMPR3DDataViewer *vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); - vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); - vtkmpr3Ddataviewer->Configure(); - mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); + + + 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); @@ -166,10 +175,54 @@ panelClipping3D -> SetMinimumPaneSize( 5 ); panelClipping3D -> SplitHorizontally( panelControl , window3D , 10 ); wxwindow=panelClipping3D; + + + vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); + //vtkmpr3Ddataviewer->Configure(); + + mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); + } + if (type==7) + { + mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel ); + wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); + wxwindow=window3D; +/*Borrame + wxSplitterWindow *panelClipping3D = new wxSplitterWindow( panel , -1); + mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); + wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); + panelClipping3D ->SetMinimumPaneSize( 5 ); + panelClipping3D ->SplitHorizontally( new wxPanel(panelClipping3D,-1) , window3D , 10 ); + wxwindow=panelClipping3D; +*/ +/*Borrame + 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, wxGROW); panel->SetSizer(sizer); @@ -184,27 +237,23 @@ wxMaracas_ViewerWidget::~wxMaracas_ViewerWidget() { - - testDelete(mvtkmprbasedata); - testDelete(mvtk2Dbaseview); - testDelete(mvtkmpr2Dview_X); - testDelete(mvtkmpr2Dview_Y); - testDelete(mvtkmpr2Dview_Z); - testDelete(mwidgetMesure); - testDelete(mvtkplane2Dview); - testDelete(mwxsphereview); - testDelete(mwxvtkclipping3Dview); - testDelete(mwxvtk3Dbaseview_Clipping3D); - testDelete(mwxvtkmpr3Dview); - - } - - void wxMaracas_ViewerWidget::testDelete(void* point){ - if(point!=NULL){ - delete point; - } + + if (minternalVtkmprbasedata==true) + { + 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 (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview; } + if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview; } + if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;} } - //------------------------------------------------------------------------------------------------------------ // Methods //------------------------------------------------------------------------------------------------------------ @@ -214,6 +263,52 @@ 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; */ + + 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 ); + } + } + if ( mvtk2Dbaseview !=NULL ) { mvtk2Dbaseview -> Configure(); } if ( mvtkmpr2Dview_X !=NULL ) { mvtkmpr2Dview_X -> Configure(); } @@ -226,20 +321,33 @@ if ( mwidgetMesure !=NULL ) { mwidgetMesure -> SetMesureScale( 1 ); } if ( mwxsphereview !=NULL ) { mwxsphereview -> Configure(); } - if (mwxvtk3Dbaseview_Clipping3D !=NULL) { mwxvtk3Dbaseview_Clipping3D -> Configure(); } - if (mwxvtkmpr3Dview !=NULL) { mwxvtkmpr3Dview -> Configure(); } + if (mwxvtk3Dbaseview_Clipping3D !=NULL) { mwxvtk3Dbaseview_Clipping3D -> Configure(); + } + + if (vtkmpr3Ddataviewer !=NULL) { + vtkmpr3Ddataviewer->Configure(); + + } + if (mwxvtkmpr3Dview !=NULL) { + + mwxvtkmpr3Dview -> Configure(); + mwxvtkmpr3Dview ->ResetCamera(ext,org,spc); + + + } + if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview -> Configure(); } + + - if (mvtkmprbasedata!=NULL) - { - x = mvtkmprbasedata -> GetMaxPositionX()/2; - y = mvtkmprbasedata -> GetMaxPositionY()/2; - z = mvtkmprbasedata -> GetMaxPositionZ()/2; - mvtkmprbasedata->SetX( x ); - mvtkmprbasedata->SetY( y ); - mvtkmprbasedata->SetZ( z ); - } + + //if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();} // RefreshView(); + + //if (mwxvtkmpr3Dview !=NULL) { + // mwxvtkmpr3Dview->ResetCamera(); + //} + } //------------------------------------------------------------------------- @@ -271,42 +379,117 @@ 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 ) { - 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(); } + void wxMaracas_ViewerWidget::setColorTransferFunction(vtkColorTransferFunction* colortable){ + if(mvtkmpr2Dview_X!=NULL){ + mvtkmpr2Dview_X->setColorTransferFunction(colortable); + } + if(mvtkmpr2Dview_Y!=NULL){ + mvtkmpr2Dview_Y->setColorTransferFunction(colortable); + } + if(mvtkmpr2Dview_Z!=NULL){ + mvtkmpr2Dview_Z->setColorTransferFunction(colortable); + } + if(mwxvtkmpr3Dview!=NULL){ + mwxvtkmpr3Dview->setColorTransferFunction(colortable); + } + } + + void wxMaracas_ViewerWidget::setWindowLevel(double level){ + if(mvtkmpr2Dview_X!=NULL){ + mvtkmpr2Dview_X->setWindowLevel(level); + } + if(mvtkmpr2Dview_Y!=NULL){ + mvtkmpr2Dview_Y->setWindowLevel(level); + } + if(mvtkmpr2Dview_Z!=NULL){ + mvtkmpr2Dview_Z->setWindowLevel(level); + } + /*if(mwxvtkmpr3Dview!=NULL){ + mwxvtkmpr3Dview->setWindowLevel(level); + }*/ + } + + void wxMaracas_ViewerWidget::setColorLevel(double level){ + if(mvtkmpr2Dview_X!=NULL){ + mvtkmpr2Dview_X->setColorLevel(level); + } + if(mvtkmpr2Dview_Y!=NULL){ + mvtkmpr2Dview_Y->setColorLevel(level); + } + if(mvtkmpr2Dview_Z!=NULL){ + mvtkmpr2Dview_Z->setColorLevel(level); + } + /*if(mwxvtkmpr3Dview!=NULL){ + mwxvtkmpr3Dview->setColorLevel(level); + }*/ + } +