X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.cpp;h=830269a3bcc9154fcd7cb42fdc77038a371fd4a6;hb=f050938d3947f6b785289da6d58f8fec2da57421;hp=80eb7e54a1aedd06abdbb6ea08b32833ab45f7f9;hpb=d7d3ec17199e6b725bd375fdfe1085eeb35b34cc;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp index 80eb7e5..830269a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp @@ -1,33 +1,39 @@ #include "wxMaracasRenderTabbedPanel.h" -#include "HistogramDialogComboBox.h" +#include "HistogramDialogComboBox.h" #include "wxMaracasMultipleVolumeRendererPanel.h" #include "wxMaracasSurfaceRenderingPanel.h" #include "wxMaracasSurfaceRenderingProp3DMHD.h" -#include "wxMaracasMultipleVolumeRendererManagerData.h" +#include "volumerenderermanagerdata.h" #include "wxMaracasDialog_NViewers.h" +#include "wxVtkMPR3DViewCntrlPanel.h" #include #include - +#include #include + #include "Color.xpm" -#include "creaSystem.h" +//#include "creaSystem.h" -#include -#include "wxVtkMPR3DViewCntrlPanel.h" +#include "creaWx.h" + + BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel ) + EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView ) + //EVT_MENU( 12122, wxMaracasRenderTabbedPanel::OnDClickLeft ) + END_EVENT_TABLE( ); /** ** Class constructor **/ wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id, wxVtk3DBaseView* _baseView) -: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) + : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) { _id = id; baseView = _baseView; dialog = NULL; - volmanager = new wxMaracasMultipleVolumeRendererManager(); + volmanager = new VolumeRendererManager(); surrendmanager1 = new wxMaracasSurfaceRenderingManager(); surrendmanager2 = new wxMaracasSurfaceRenderingManager(); surrendmanager3 = new wxMaracasSurfaceRenderingManager(); @@ -42,12 +48,13 @@ wxMaracasRenderTabbedPanel::~wxMaracasRenderTabbedPanel() //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSA(_propid, false); //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false); //wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false); - if( vtkmpr3Ddataviewer ) { delete vtkmpr3Ddataviewer; } - if( mwxvtkmpr3Dview ) { delete mwxvtkmpr3Dview; } + addRemoveActorMPR(false); + if( vtkmpr3Ddataviewer ) { delete vtkmpr3Ddataviewer; } + if( mwxvtkmpr3Dview ) { delete mwxvtkmpr3Dview; } this->deleteVolume(_id); delete dialog; - delete wxtabs; + delete wxtabs; } /** @@ -104,12 +111,12 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string //vtkImageData* img3 = surrendmanager3->getImageData(pathfile); if(img!=NULL /*&& img1!=NULL && img2!=NULL && img3!=NULL*/) { - addVolume(img, filename); + addVolume(img, filename); addSurface1(img, filename); addSurface2(img, filename); addSurface3(img, filename); addMPROptions(); - volname = (wxString) filename; + volname = crea::std2wx(filename); wxtabs->Refresh(); } } @@ -259,23 +266,7 @@ void wxMaracasRenderTabbedPanel::addSurface3(vtkImageData* img, std::string data **/ void wxMaracasRenderTabbedPanel::addMPROptions() { - 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; - + //Panel Construction vtkMPRBaseData* mvtkmprbasedata = new vtkMPRBaseData(); marImageData* marimagedata = new marImageData( getVolImage() ); mvtkmprbasedata ->SetMarImageData(marimagedata); @@ -295,6 +286,24 @@ void wxMaracasRenderTabbedPanel::addMPROptions() panelControl->SetSize(400,350); panelControl->Layout(); + //Configure MPR + 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(); @@ -325,7 +334,9 @@ void wxMaracasRenderTabbedPanel::addMPROptions() } if (baseView!=NULL) + { baseView ->Configure(); + } if (vtkmpr3Ddataviewer !=NULL) { @@ -337,6 +348,8 @@ void wxMaracasRenderTabbedPanel::addMPROptions() mwxvtkmpr3Dview ->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer); mwxvtkmpr3Dview ->Configure(); mwxvtkmpr3Dview ->ResetCamera(ext,org,spc); + vtkInteractorStyleBaseView* vtkInteractorBV = (vtkInteractorStyleBaseView*)mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView(); + vtkInteractorBV->AddParentToReport(this); } int id = 4; @@ -435,7 +448,49 @@ void wxMaracasRenderTabbedPanel::addRemoveActorSC(int id, bool addremove) diag->ShowModal(); delete diag; } -} +} + +void wxMaracasRenderTabbedPanel::addRemoveActorMPR(bool addremove) +{ + int id = 4; + wxtabs->SetSelection(id); + if(addremove) + { + wxtabs->GetPage(id)->Enable(); + + bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX(); + bool valueY = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleY(); + bool valueZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleZ(); + bool valueXYZ = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleXYZ(); + bool valuePlane = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisiblePlane(); + + mwxvtkmpr3Dview->VisibleImageActor( 0, valueX ); + mwxvtkmpr3Dview->VisibleImageActor( 1, valueY ); + mwxvtkmpr3Dview->VisibleImageActor( 2, valueZ ); + mwxvtkmpr3Dview->VisiblePointWidget(valueXYZ); + mwxvtkmpr3Dview->VisiblePlaneWidget(valuePlane); + mwxvtkmpr3Dview->showOutlineActor(true); + + mwxvtkmpr3Dview->Refresh(); + + + } + else + { + wxtabs->GetPage(id)->Disable(); + + mwxvtkmpr3Dview->VisiblePointWidget(false); + mwxvtkmpr3Dview->VisiblePlaneWidget(false); + mwxvtkmpr3Dview->VisibleImageActor(0, false ); + mwxvtkmpr3Dview->VisibleImageActor(1, false ); + mwxvtkmpr3Dview->VisibleImageActor(2, false ); + mwxvtkmpr3Dview->showOutlineActor(false); + mwxvtkmpr3Dview->Refresh(); + + wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh + mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1); + } +} /** @@ -461,7 +516,6 @@ void wxMaracasRenderTabbedPanel::SetValuesPointsFunction(int volid, std::vector< diag->ShowModal(); delete diag; } - } /** @@ -700,10 +754,13 @@ void wxMaracasRenderTabbedPanel::onCheckBoxSCChange(wxCommandEvent& event) **/ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event) { + addRemoveActorMPR(checkboxViewer->IsChecked()); + /* int id = 4; wxtabs->SetSelection(id); if(checkboxViewer->IsChecked()) { + wxtabs->GetPage(id)->Enable(); bool valueX = ((wxVtkMPR3DViewCntrlPanel*) controlPanelMPR3D)->GetVisibleX(); @@ -721,8 +778,6 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event) mwxvtkmpr3Dview->Refresh(); - wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh - mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1); } else @@ -739,7 +794,16 @@ void wxMaracasRenderTabbedPanel::onMPROptions(wxCommandEvent& event) wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1); - } + }*/ +} + +void wxMaracasRenderTabbedPanel::OnRefreshView(wxCommandEvent & event) +{ + printf("CPR wxMaracasRenderTabbedPanel::OnRefreshView \n"); + mwxvtkmpr3Dview->RefreshView(); + + wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh + mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1); } /** @@ -766,20 +830,20 @@ void wxMaracasRenderTabbedPanel::onOpenCutter(wxCommandEvent& event) vtkImageData* img = getVolImage(); std::vector type; type.push_back(5); - type.push_back(0); type.push_back(1); - type.push_back(3); + type.push_back(2); + type.push_back(0); wxMaracasDialog_NViewers* dialog1 = new wxMaracasDialog_NViewers(this, img, &type, wxString(_T("Cut Module") )); - dialog1->SetSize(800, 700); + //dialog1->SetSize(800, 700); - std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll"); - cutter = CutModel2MainPanel::getInstance(dialog1->getinternalPanel(), path); + /**std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll"); + cutter = CutModelMainPanel::getInstance(dialog1->getinternalPanel(), path); cutter->setRenderer( dialog1->getViewer()->GetwxVtkBaseView(1)->GetRenderer() ); cutter->setInteractor( dialog1->getViewer()->GetwxVtkBaseView(1)->GetWxVTKRenderWindowInteractor() ); cutter->setImageData(getVolImage()); - - dialog1->AddPanel(cutter); + **/ + //dialog1->AddPanel(cutter); dialog1->Show(); } @@ -834,4 +898,4 @@ vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage() int wxMaracasRenderTabbedPanel::getPropIdV() { return _id; -} \ No newline at end of file +}