X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_N_ViewersWidget.cxx;h=1c5c0e55a71aa3f2efd45ee621646bcde7df4ca8;hb=37319ea6defbf2dc5ddce23e0b65c2247543ae33;hp=e93c05d1ec4536f439234c4951dd8adac96d5e8a;hpb=e6b030ceb3ee4eea1f012e7d5c47503cf6322c61;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx index e93c05d..1c5c0e5 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracas_N_ViewersWidget.cxx,v $ Language: C++ - Date: $Date: 2009/03/24 10:49:21 $ - Version: $Revision: 1.3 $ + Date: $Date: 2009/09/15 11:25:07 $ + Version: $Revision: 1.12 $ Copyright: (c) 2002, 2003 License: @@ -45,12 +45,13 @@ wxMaracas_N_ViewersWidget::wxMaracas_N_ViewersWidget(wxWindow *parent, vtkImageData* imagedata, std::vector *nTypeView) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) { - wxwindow1 = NULL; - wxwindow2 = NULL; - wxwindow3 = NULL; - wxwindow4 = NULL; - currentwxwindow = NULL; - + wxwindow1 = NULL; + wxwindow2 = NULL; + wxwindow3 = NULL; + wxwindow4 = NULL; + _currentwxw = NULL; + mvtkmprbasedata = NULL; + wxSizer *sizer = new wxBoxSizer(wxVERTICAL); this->SetSizer(sizer); this->SetAutoLayout(true); @@ -67,6 +68,11 @@ wxMaracas_N_ViewersWidget::~wxMaracas_N_ViewersWidget() { + if (mvtkmprbasedata!=NULL) + { + delete mvtkmprbasedata; + } + } //------------------------------------------------------------------------------------------------------------ // Methods @@ -102,7 +108,7 @@ } void wxMaracas_N_ViewersWidget::RefreshView() - { + { if (wxwindow1!=NULL) {wxwindow1->RefreshView(); } if (wxwindow2!=NULL) {wxwindow2->RefreshView(); } if (wxwindow3!=NULL) {wxwindow3->RefreshView(); } @@ -142,47 +148,59 @@ } //------------------------------------------------------------------------- - void wxMaracas_N_ViewersWidget::Refresh(bool eraseBackground, const wxRect* rect ) - { - wxPanel::Refresh(false); - } + void wxMaracas_N_ViewersWidget::Refresh(bool eraseBackground, const wxRect* rect ) + { + wxPanel::Refresh(false); + } - void wxMaracas_N_ViewersWidget::UpdateLayout(vtkImageData* imagedata){ + //------------------------------------------------------------------------- + void wxMaracas_N_ViewersWidget::UpdateLayout(vtkImageData* imagedata) + { - wxPanel *panel = this; wxWindow *wxwindow = NULL; - wxSizer *sizer = panel->GetSizer(); - - if(currentwxwindow!=NULL){ - sizer->Remove(currentwxwindow); - delete currentwxwindow; + wxSizer *sizer = this->GetSizer(); + + if (mvtkmprbasedata!=NULL) + { + delete mvtkmprbasedata; + } + + marImageData *marimagedata = new marImageData( imagedata ); + mvtkmprbasedata = new vtkMPRBaseData(); + mvtkmprbasedata->SetMarImageData(marimagedata); + + if(_currentwxw != NULL){ + _currentwxw->Show(false); + delete _currentwxw; + //sizer->Remove(currentwxwindow); + //delete currentwxwindow; } //std::cout<<"size "<size()<size()==1) { + wxwindow1 = new wxMaracas_ViewerWidget(this, imagedata, (*nTypeView)[0],mvtkmprbasedata); - std::cout<<"type "<<(*nTypeView)[0]<ConfigureVTK(); wxwindow = wxwindow1; }else if (nTypeView->size()==2) { - - - wxSplitterWindow *spliter = new wxSplitterWindow( panel , -1); - wxwindow1 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[0]); - wxwindow2 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[1]); + wxSplitterWindow *spliter = new wxSplitterWindow( this , -1); + spliter->SetMinimumPaneSize(1); + wxwindow1 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[0],mvtkmprbasedata); + wxwindow2 = new wxMaracas_ViewerWidget(spliter, imagedata, (*nTypeView)[1],mvtkmprbasedata); wxwindow1->ConfigureVTK(); wxwindow2->ConfigureVTK(); spliter -> SplitVertically( wxwindow1 , wxwindow2 ); wxwindow = spliter; }else if (nTypeView->size()==3) { - wxSplitterWindow *spliter = new wxSplitterWindow( panel , -1); + wxSplitterWindow *spliter = new wxSplitterWindow( this , -1); wxSplitterWindow *spliterA = new wxSplitterWindow( spliter , -1); - wxwindow1 = new wxMaracas_ViewerWidget(spliter , imagedata, (*nTypeView)[0]); - wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1]); - wxwindow3 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[2]); + spliter->SetMinimumPaneSize(1); + spliterA->SetMinimumPaneSize(1); + wxwindow1 = new wxMaracas_ViewerWidget(spliter , imagedata, (*nTypeView)[0],mvtkmprbasedata); + wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1],mvtkmprbasedata); + wxwindow3 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[2],mvtkmprbasedata); wxwindow1->ConfigureVTK(); wxwindow2->ConfigureVTK(); wxwindow3->ConfigureVTK(); @@ -190,13 +208,16 @@ spliterA-> SplitHorizontally( wxwindow2 , wxwindow3 ); wxwindow = spliter; }else if (nTypeView->size()>=4){ - wxSplitterWindow *spliter = new wxSplitterWindow( panel , -1); + wxSplitterWindow *spliter = new wxSplitterWindow( this , -1); wxSplitterWindow *spliterA = new wxSplitterWindow( spliter , -1); wxSplitterWindow *spliterB = new wxSplitterWindow( spliter , -1); - wxwindow1 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[0]); - wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1]); - wxwindow3 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[2]); - wxwindow4 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[3]); + spliter->SetMinimumPaneSize(1); + spliterA->SetMinimumPaneSize(1); + spliterB->SetMinimumPaneSize(1); + wxwindow1 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[0],mvtkmprbasedata); + wxwindow2 = new wxMaracas_ViewerWidget(spliterA, imagedata, (*nTypeView)[1],mvtkmprbasedata); + wxwindow3 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[2],mvtkmprbasedata); + wxwindow4 = new wxMaracas_ViewerWidget(spliterB, imagedata, (*nTypeView)[3],mvtkmprbasedata); wxwindow1->ConfigureVTK(); wxwindow2->ConfigureVTK(); wxwindow3->ConfigureVTK(); @@ -208,19 +229,24 @@ } //panel->SetDimension() - sizer->Add( wxwindow , 1, wxGROW); + sizer->Add( wxwindow , 1, wxEXPAND); sizer->Layout(); - currentwxwindow = wxwindow; - currentwxwindow->Show(true); + _currentwxw = wxwindow; + _currentwxw->Show(true); this->Layout(); this->Refresh(); - } + +//----------------------------------------------------------------------------------- void wxMaracas_N_ViewersWidget::SetType(std::vector* type){ nTypeView = type; } + + + +//----------------------------------------------------------------------------------- void wxMaracas_N_ViewersWidget::SetImage( vtkImageData *image ) { if (wxwindow1!=NULL) { @@ -234,44 +260,69 @@ } - +//----------------------------------------------------------------------------------- double wxMaracas_N_ViewersWidget :: GetX() { - return wxwindow1->GetX(); + return mvtkmprbasedata->GetX(); +// return wxwindow1->GetX(); } +//----------------------------------------------------------------------------------- double wxMaracas_N_ViewersWidget :: GetY() { - return wxwindow1->GetY(); + return mvtkmprbasedata->GetY(); +// return wxwindow1->GetY(); } +//----------------------------------------------------------------------------------- double wxMaracas_N_ViewersWidget :: GetZ() { - return wxwindow1->GetZ(); + return mvtkmprbasedata->GetZ(); +// return wxwindow1->GetZ(); } +void wxMaracas_N_ViewersWidget::setColorTransferFunction(vtkColorTransferFunction* colortable){ + if (wxwindow1!=NULL) { + wxwindow1->setColorTransferFunction(colortable); + } + if (wxwindow2!=NULL) { + wxwindow2->setColorTransferFunction(colortable); + } + if (wxwindow3!=NULL) { + wxwindow3->setColorTransferFunction(colortable); + } + if (wxwindow4!=NULL) { + wxwindow4->setColorTransferFunction(colortable); + } +} -/* -double wxMaracas_N_ViewersWidget :: GetZ(int iWin) - { - double answerVal = 0.0; - if (iWin==1) - { - answerVal = wxwindow1->GetZ(); - } - if (iWin==2) - { - answerVal = wxwindow2->GetZ(); - } - if (iWin==3) - { - answerVal = wxwindow3->GetZ(); - } - if (iWin==4) - { - answerVal = wxwindow4->GetZ(); - } - return answerVal; +void wxMaracas_N_ViewersWidget::setWindowLevel(double level){ + if (wxwindow1!=NULL) { + wxwindow1->setWindowLevel(level); + } + if (wxwindow2!=NULL) { + wxwindow2->setWindowLevel(level); } -*/ + if (wxwindow3!=NULL) { + wxwindow3->setWindowLevel(level); + } + if (wxwindow4!=NULL) { + wxwindow4->setWindowLevel(level); + } +} +void wxMaracas_N_ViewersWidget::setColorLevel(double level){ + if (wxwindow1!=NULL) { + wxwindow1->setColorLevel(level); + } + if (wxwindow2!=NULL) { + wxwindow2->setColorLevel(level); + } + if (wxwindow3!=NULL) { + wxwindow3->setColorLevel(level); + } + if (wxwindow4!=NULL) { + wxwindow4->setColorLevel(level); + } +} +