X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_ViewerWidget.cxx;h=62d2fc75cca10a1575da22cc933ffb45f1d7a693;hb=f050938d3947f6b785289da6d58f8fec2da57421;hp=bf749e6620b70d7eced6ca83f1921234ade995b7;hpb=c6481486861a91e8ead2033566097c502488670e;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 bf749e6..62d2fc7 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx @@ -3,14 +3,14 @@ Program: wxMaracas Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $ Language: C++ - Date: $Date: 2010/04/29 16:05:34 $ - Version: $Revision: 1.28 $ + Date: $Date: 2012/05/30 17:23:12 $ + Version: $Revision: 1.35 $ Copyright: (c) 2002, 2003 License: - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notice for more information. =========================================================================*/ @@ -23,7 +23,6 @@ //------------------------------------------------------------------------------------------------------------ // Other includes //------------------------------------------------------------------------------------------------------------ - //------------------------------------------------------------------------------------------------------------ // Constructors & Destructors //------------------------------------------------------------------------------------------------------------ @@ -35,7 +34,7 @@ wxWindow *wxwindow = NULL, *window3D = 0; wxSplitterWindow *panelClipping3D= 0; // wxPanel *panelControl = 0; -// wxFlexGridSizer *sizerCtrol = 0; +// wxFlexGridSizer *sizerCtrol = 0; wxPanel *controlPanelMPR3D = 0; wxPanel *controlPanelClippingSurf3D = 0; //RaC 03-2010 Adding a tab @@ -47,13 +46,13 @@ if (vtkmprbasedata==NULL) { - minternalVtkmprbasedata = true; - mvtkmprbasedata = new vtkMPRBaseData(); - marImageData *marimagedata = new marImageData( imagedata ); + minternalVtkmprbasedata = true; + mvtkmprbasedata = new vtkMPRBaseData(); + marImageData *marimagedata = new marImageData( imagedata ); mvtkmprbasedata->SetMarImageData(marimagedata); } else { minternalVtkmprbasedata = false; - mvtkmprbasedata = vtkmprbasedata; + mvtkmprbasedata = vtkmprbasedata; } mvtk2Dbaseview = NULL; @@ -72,22 +71,22 @@ { mvtk2Dbaseview = new wxVtk2DBaseView(panel); mvtk2Dbaseview->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtk2Dbaseview->GetWxVTKRenderWindowInteractor(); }else if (type==0) { mvtkmpr2Dview_Z = new wxVtkMPR2DView(panel,2); mvtkmpr2Dview_Z->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtkmpr2Dview_Z->GetWxVTKRenderWindowInteractor(); }else if (type==1) { mvtkmpr2Dview_X = new wxVtkMPR2DView(panel,0); mvtkmpr2Dview_X->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtkmpr2Dview_X->GetWxVTKRenderWindowInteractor(); }else if (type==2) { mvtkmpr2Dview_Y = new wxVtkMPR2DView(panel,1); mvtkmpr2Dview_Y->SetVtkBaseData(mvtkmprbasedata); - wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor(); + wxwindow = mvtkmpr2Dview_Y->GetWxVTKRenderWindowInteractor(); }else if (type==3) { mwidgetMesure = new wxWidgetMesure2D_Plane_in_MPR(panel); @@ -106,13 +105,13 @@ mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D); - vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer(); - vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); + vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer(); + vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); vtkclipping3Ddataviewer->Configure(); mwxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer); mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); - vtkMPR3DDataViewer *vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); + vtkMPR3DDataViewer *vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); vtkmpr3Ddataviewer->Configure(); mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); @@ -127,9 +126,9 @@ notebook->AddPage(controlPanelMPR3D, _T("Planes") ); // Second Tab - controlPanelClippingSurf3D = mwxvtkclipping3Dview->CreateSurfControlPanel(notebook); + 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); @@ -137,10 +136,10 @@ panelClipping3D->SplitHorizontally( notebook , window3D , 10 ); //panelClipping3D->SetMinimumPaneSize( 15 ); - panelClipping3D->SetMinimumPaneSize( 70 ); // JPR - + panelClipping3D->SetMinimumPaneSize( 70 ); // JPR + /* EED 04 / Febrary / 2010 - panelControl = new wxPanel(panelClipping3D,-1); + panelControl = new wxPanel(panelClipping3D,-1); controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false); controlPanelClipping3D = mwxvtkclipping3Dview->CreateControlPanel(panelControl); // mbtnCutImageData = new wxCheckBox(panelControl,-1,_T("Cut Module")); @@ -157,19 +156,19 @@ panelClipping3D -> SetMinimumPaneSize( 5 ); */ wxwindow=panelClipping3D; - + } else if (type==6) { panelClipping3D = new wxSplitterWindow( panel , -1); mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panelClipping3D ); mwxvtkmpr3Dview = new wxVtkMPR3DView( mwxvtk3Dbaseview_Clipping3D ); - vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); - + vtkmpr3Ddataviewer = new vtkMPR3DDataViewer(); + wxWindow *window3D = mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); - wxPanel *panelControl = new wxPanel(panelClipping3D,-1); - wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, false); + wxPanel *panelControl = new wxPanel(panelClipping3D,-1); + wxPanel *controlPanelMPR3D = mwxvtkmpr3Dview->CreateControlPanel(panelControl, true); wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1); sizerCtrol->Add(controlPanelMPR3D, 1, wxALL|wxEXPAND, 2); @@ -179,24 +178,25 @@ panelControl->SetSize(400,350); panelControl->Layout(); //panelClipping3D->SetMinimumPaneSize( 5 ); - panelClipping3D->SetMinimumPaneSize( 100 ); // JPR - - panelClipping3D->SplitHorizontally( panelControl , window3D , 10 ); + panelClipping3D->SetMinimumPaneSize( 130 ); // FCY + panelClipping3D->SplitHorizontally( panelControl , window3D , 0 ); + //panelClipping3D->SetSashSize(10); + panelClipping3D->UpdateSize(); //FCY wxwindow=panelClipping3D; - vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); + vtkmpr3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); //vtkmpr3Ddataviewer->Configure(); mwxvtkmpr3Dview->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); - + }else if (type==7) { - mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel ); + mwxvtk3Dbaseview_Clipping3D = new wxVtk3DBaseView( panel ); wxwindow = (wxWindow*) mwxvtk3Dbaseview_Clipping3D->GetWxVTKRenderWindowInteractor(); } sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add( wxwindow, 1, wxGROW); + sizer->Add( wxwindow, 1, wxGROW); panel->SetSizer(sizer); panel->SetAutoLayout(true); sizer->Layout(); @@ -212,8 +212,8 @@ if (minternalVtkmprbasedata==true) { if (mvtkmprbasedata) { delete mvtkmprbasedata;} - } - + } + if (mvtk2Dbaseview) { delete mvtk2Dbaseview; } if (mvtkmpr2Dview_X) { delete mvtkmpr2Dview_X;} if (mvtkmpr2Dview_Y) { delete mvtkmpr2Dview_Y;} @@ -224,6 +224,7 @@ if (mwxvtkmpr3Dview) { delete mwxvtkmpr3Dview;} if (mwxvtkclipping3Dview) { delete mwxvtkclipping3Dview;} if (mwxvtk3Dbaseview_Clipping3D){ delete mwxvtk3Dbaseview_Clipping3D; mwxvtk3Dbaseview_Clipping3D=NULL;} + if (vtkmpr3Ddataviewer) { delete vtkmpr3Ddataviewer;} } //------------------------------------------------------------------------------------------------------------ // Methods @@ -244,7 +245,7 @@ ext[5]=0; */ int ext[] = {0, 0, 0, 0, 0, 0}; //JPR - + /*double org[3],spc[3]; org[0]=0; org[1]=0; @@ -261,8 +262,8 @@ /* x = mvtkmprbasedata->GetMaxPositionX()/2; y = mvtkmprbasedata->GetMaxPositionY()/2; - z = mvtkmprbasedata->GetMaxPositionZ()/2; - */ + z = mvtkmprbasedata->GetMaxPositionZ()/2; + */ if(mvtkmprbasedata->GetImageData() != NULL) { @@ -285,7 +286,7 @@ mvtkmprbasedata->SetZ( 0 ); } } - + if ( mvtk2Dbaseview !=NULL ) { mvtk2Dbaseview->Configure(); } if ( mvtkmpr2Dview_X !=NULL ) { mvtkmpr2Dview_X->Configure(); } if ( mvtkmpr2Dview_Y !=NULL ) { mvtkmpr2Dview_Y->Configure(); } @@ -297,30 +298,37 @@ 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) { + if (vtkmpr3Ddataviewer !=NULL) + { vtkmpr3Ddataviewer->Configure(); - + } - if (mwxvtkmpr3Dview !=NULL) { - + + if (mwxvtkmpr3Dview !=NULL) + { mwxvtkmpr3Dview->Configure(); - mwxvtkmpr3Dview->ResetCamera(ext,org,spc); +printf("EED wxMaracas_ViewerWidget::ConfigureVTK \n"); +//EED??? mwxvtkmpr3Dview->ResetCamera(ext,org,spc); + } + if (mwxvtkclipping3Dview !=NULL) + { + mwxvtkclipping3Dview->Configure(); } - if (mwxvtkclipping3Dview !=NULL) { mwxvtkclipping3Dview->Configure(); } - //if(vtkmpr3Ddataviewer!=NULL){vtkmpr3Ddataviewer->Configure();} // RefreshView(); //if (mwxvtkmpr3Dview !=NULL) { // mwxvtkmpr3Dview->ResetCamera(); //} + } //------------------------------------------------------------------------- @@ -333,7 +341,6 @@ //------------------------------------------------------------------------- void wxMaracas_ViewerWidget::RefreshView() { - if (mvtk2Dbaseview !=NULL ){ mvtk2Dbaseview->Refresh(); } if (mvtkmpr2Dview_X !=NULL ){ mvtkmpr2Dview_X->Refresh(); } if (mvtkmpr2Dview_Y !=NULL ){ mvtkmpr2Dview_Y->Refresh(); } @@ -351,25 +358,25 @@ wxVtkBaseView *wxMaracas_ViewerWidget::GetwxVtkBaseView() { wxVtkBaseView *wxvtkbaseview=NULL; - if (mvtk2Dbaseview!=NULL){ - wxvtkbaseview = mvtk2Dbaseview; + if (mvtk2Dbaseview!=NULL){ + wxvtkbaseview = mvtk2Dbaseview; } - if (mvtkmpr2Dview_X!=NULL){ + if (mvtkmpr2Dview_X!=NULL){ wxvtkbaseview = mvtkmpr2Dview_X; } - if (mvtkmpr2Dview_Y!=NULL){ + if (mvtkmpr2Dview_Y!=NULL){ wxvtkbaseview = mvtkmpr2Dview_Y; } - if (mvtkmpr2Dview_Z!=NULL){ - wxvtkbaseview = mvtkmpr2Dview_Z; + if (mvtkmpr2Dview_Z!=NULL){ + wxvtkbaseview = mvtkmpr2Dview_Z; } if (mvtkplane2Dview!=NULL){ - wxvtkbaseview = mvtkplane2Dview; + wxvtkbaseview = mvtkplane2Dview; } - if (mwxsphereview!=NULL){ + if (mwxsphereview!=NULL){ wxvtkbaseview = mwxsphereview; } - if (mwxvtk3Dbaseview_Clipping3D!=NULL){ + if (mwxvtk3Dbaseview_Clipping3D!=NULL){ wxvtkbaseview = mwxvtk3Dbaseview_Clipping3D; } return wxvtkbaseview ; @@ -420,7 +427,7 @@ // return mvtk2Dbaseview->GetVtkBaseData()->GetZ(); } - void wxMaracas_ViewerWidget::setColorTransferFunction(vtkColorTransferFunction* colortable){ + void wxMaracas_ViewerWidget::setColorTransferFunction(vtkColorTransferFunction* colortable){ if(mvtkmpr2Dview_X!=NULL){ mvtkmpr2Dview_X->setColorTransferFunction(colortable); }