From: perez Date: Fri, 16 Oct 2009 17:01:37 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~135 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=inline;h=8e28248048ebb13908702adb87a319047af16939;p=creaMaracasVisu.git *** empty log message *** --- diff --git a/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx b/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx index e45a883..f029d80 100644 --- a/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx +++ b/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx @@ -2,6 +2,7 @@ #include "bbcreaMaracasVisuPackage.h" #include "wxMaracasRendererView.h" +#include "wxMaracasRenderTabbedPanel.h" namespace bbcreaMaracasVisu { @@ -29,23 +30,25 @@ void RenderingViewer::Process() { if(_img1 !=NULL) { - view->addVolume(_img1, "INPUT 1"); + ((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img1, "INPUT 1"); + ((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface1(_img1, "INPUT 1"); + ((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface2(_img1, "INPUT 1"); + ((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface3(_img1, "INPUT 1"); } if(_img2 !=NULL) { - view->addVolume(_img2, "INPUT 2"); + ((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img2, "INPUT 2"); } if(_img3 !=NULL) { - view->addVolume(_img3, "INPUT 3"); + ((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img3, "INPUT 3"); } if(_img4 !=NULL) { - view->addVolume(_img4, "INPUT 4"); + ((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img4, "INPUT 4"); } } } - } void RenderingViewer::CreateWidget(wxWindow* parent) { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx index 83b1063..06bd49b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracasMultipleVolumeRendererView.cxx,v $ Language: C++ - Date: $Date: 2009/10/15 11:56:43 $ - Version: $Revision: 1.3 $ + Date: $Date: 2009/10/16 17:01:42 $ + Version: $Revision: 1.4 $ Copyright: (c) 2002, 2003 License: @@ -52,7 +52,6 @@ wxMaracasMultipleVolumeRendererView::wxMaracasMultipleVolumeRendererView( wxWind wxMaracasMultipleVolumeRendererView::~wxMaracasMultipleVolumeRendererView( ){ delete _toolb; - } std::string wxMaracasMultipleVolumeRendererView::getPath(){ @@ -60,7 +59,8 @@ std::string wxMaracasMultipleVolumeRendererView::getPath(){ } wxMaracasMultipleVolumeRendererView* wxMaracasMultipleVolumeRendererView::getInstance(wxWindow* parent,std::string path){ - if(instance==NULL){ + if(instance==NULL) +{ instance = new wxMaracasMultipleVolumeRendererView(parent,path); } return instance; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp index 5c4202a..457a2ab 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp @@ -8,23 +8,26 @@ /** ** **/ -wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, wxMaracasMultipleVolumeRendererManager* img1, wxMaracasSurfaceRenderingManager* img2, wxMaracasSurfaceRenderingManager* img3, - wxMaracasSurfaceRenderingManager* img4, wxString filename, wxString dataname) +wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, wxMaracasMultipleVolumeRendererManager* _volmanager, wxMaracasSurfaceRenderingManager* _surrendmanager1, wxMaracasSurfaceRenderingManager* _surrendmanager2, + wxMaracasSurfaceRenderingManager* _surrendmanager3, wxString filename, wxString dataname) : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize) { //_propid = propid; + volmanager = _volmanager; + surrendmanager1 = _surrendmanager1; + surrendmanager2 = _surrendmanager2; + surrendmanager3 = _surrendmanager3; - createControls(img1, img2, img3, img4, filename, dataname); + createControls(filename, dataname); } /** ** **/ -void wxMaracasRenderTabbedPanel::createControls(wxMaracasMultipleVolumeRendererManager* volmanager, wxMaracasSurfaceRenderingManager* surrendmanager1, wxMaracasSurfaceRenderingManager* surrendmanager2, - wxMaracasSurfaceRenderingManager* surrendmanager3, wxString filename, wxString dataname) +void wxMaracasRenderTabbedPanel::createControls(wxString filename, wxString dataname) { - wxPanel* up = new wxPanel(this, wxID_ANY); - wxFlexGridSizer* sizerup = new wxFlexGridSizer(2,2,1); + //wxPanel* up = new wxPanel(this, wxID_ANY); + wxFlexGridSizer* sizerrenderprop = new wxFlexGridSizer(2,3,1); wxString choices[2]; choices[0] = wxString(_T("On")); @@ -33,7 +36,7 @@ void wxMaracasRenderTabbedPanel::createControls(wxMaracasMultipleVolumeRendererM Connect(checkboxVol->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasRenderTabbedPanel::onCheckBoxVChange); checkboxVol->SetValue(true); - sizerup->Add(checkboxVol, wxFIXED_MINSIZE); + sizerrenderprop->Add(checkboxVol, wxFIXED_MINSIZE); //wxString choices[2]; //choices[0] = wxString(_T("On")); @@ -42,7 +45,7 @@ void wxMaracasRenderTabbedPanel::createControls(wxMaracasMultipleVolumeRendererM Connect(checkboxSA->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasRenderTabbedPanel::onCheckBoxSAChange); checkboxSA->SetValue(true); - sizerup->Add(checkboxSA, wxFIXED_MINSIZE); + sizerrenderprop->Add(checkboxSA, wxFIXED_MINSIZE); //wxString choices[2]; //choices[0] = wxString(_T("On")); @@ -51,7 +54,7 @@ void wxMaracasRenderTabbedPanel::createControls(wxMaracasMultipleVolumeRendererM Connect(checkboxSB->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasRenderTabbedPanel::onCheckBoxSBChange); checkboxSB->SetValue(true); - sizerup->Add(checkboxSB, wxFIXED_MINSIZE); + sizerrenderprop->Add(checkboxSB, wxFIXED_MINSIZE); //wxString choices[2]; //choices[0] = wxString(_T("On")); @@ -60,19 +63,13 @@ void wxMaracasRenderTabbedPanel::createControls(wxMaracasMultipleVolumeRendererM Connect(checkboxSC->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasRenderTabbedPanel::onCheckBoxSCChange); checkboxSC->SetValue(true); - sizerup->Add(checkboxSC, wxFIXED_MINSIZE); + sizerrenderprop->Add(checkboxSC, wxFIXED_MINSIZE); - up->SetSizer(sizerup, true); - up->SetAutoLayout( true ); - - - wxPanel* down = new wxPanel(this, wxID_ANY); - down->SetSize(100, 100); - wxFlexGridSizer* sizerdown = new wxFlexGridSizer(1,1,1); + //up->SetSizer(sizerup, true); + //up->SetAutoLayout( true ); wxtabs = new wxNotebook(this, -1); - wxtabs->SetSize(100, 100); - //wxtabs-> + std::string s = std::string(filename.mb_str()); vtkImageData* img1 = volmanager->getImageData(s); vtkImageData* img2 = surrendmanager1->getImageData(s); @@ -81,10 +78,10 @@ void wxMaracasRenderTabbedPanel::createControls(wxMaracasMultipleVolumeRendererM if(img1!=NULL) { s = std::string(dataname.mb_str()); - wxMaracasMultipleVolumeRendererPanel* controlpan1 = addVolume(volmanager, img1, s); - wxMaracasSurfaceRenderingPanel* controlpan2 = addSurface1(surrendmanager1, img2, s); - wxMaracasSurfaceRenderingPanel* controlpan3 = addSurface2(surrendmanager2, img3, s); - wxMaracasSurfaceRenderingPanel* controlpan4 = addSurface3(surrendmanager3, img4, s); + wxMaracasMultipleVolumeRendererPanel* controlpan1 = addVolume(img1, s); + wxMaracasSurfaceRenderingPanel* controlpan2 = addSurface1(img2, s); + wxMaracasSurfaceRenderingPanel* controlpan3 = addSurface2(img3, s); + wxMaracasSurfaceRenderingPanel* controlpan4 = addSurface3(img4, s); wxtabs->AddPage(controlpan1, _T("Volume Rendering"), true); wxtabs->AddPage(controlpan2, _T("Surf Rend A")); @@ -92,16 +89,11 @@ void wxMaracasRenderTabbedPanel::createControls(wxMaracasMultipleVolumeRendererM wxtabs->AddPage(controlpan4, _T("Surf Rend C")); wxtabs->Refresh(); - sizerdown->Add(wxtabs, wxFIXED_MINSIZE); - - down->SetSizer(sizerdown, true); - down->SetAutoLayout( true ); - } - wxFlexGridSizer* sizerrenderprop = new wxFlexGridSizer(2,1,5); - sizerrenderprop->Add(up, wxFIXED_MINSIZE); - sizerrenderprop->Add(down, wxFIXED_MINSIZE); + //wxFlexGridSizer* sizerrenderprop = new wxFlexGridSizer(2,1,5); + //sizerrenderprop->Add(up, wxFIXED_MINSIZE); + sizerrenderprop->Add(wxtabs, wxFIXED_MINSIZE); this->SetSizer(sizerrenderprop, true); this->SetAutoLayout( true ); @@ -121,7 +113,7 @@ wxMaracasRenderTabbedPanel::~wxMaracasRenderTabbedPanel() /* * */ -wxMaracasMultipleVolumeRendererPanel* wxMaracasRenderTabbedPanel::addVolume(wxMaracasMultipleVolumeRendererManager* volmanager, vtkImageData* img, std::string dataname) +wxMaracasMultipleVolumeRendererPanel* wxMaracasRenderTabbedPanel::addVolume(vtkImageData* img, std::string dataname) { try @@ -143,7 +135,7 @@ wxMaracasMultipleVolumeRendererPanel* wxMaracasRenderTabbedPanel::addVolume(wxMa } } -wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface1(wxMaracasSurfaceRenderingManager* surrendmanager1, vtkImageData* img, std::string dataname) +wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface1(vtkImageData* img, std::string dataname) { try { @@ -166,7 +158,7 @@ wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface1(wxMaraca } } -wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface2(wxMaracasSurfaceRenderingManager* surrendmanager2, vtkImageData* img, std::string dataname) +wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface2(vtkImageData* img, std::string dataname) { try { @@ -188,7 +180,7 @@ wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface2(wxMaraca } } -wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface3(wxMaracasSurfaceRenderingManager* surrendmanager3, vtkImageData* img, std::string dataname) +wxMaracasSurfaceRenderingPanel* wxMaracasRenderTabbedPanel::addSurface3(vtkImageData* img, std::string dataname) { try { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h index 35efe8d..492e456 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h @@ -17,12 +17,11 @@ public: wxMaracasRenderTabbedPanel(wxWindow* parent, wxMaracasMultipleVolumeRendererManager* img1, wxMaracasSurfaceRenderingManager* img2, wxMaracasSurfaceRenderingManager* img3, wxMaracasSurfaceRenderingManager* img4, wxString filename, wxString dataname); ~wxMaracasRenderTabbedPanel(); - void createControls(wxMaracasMultipleVolumeRendererManager* volmanager, wxMaracasSurfaceRenderingManager* surrendmanager1, wxMaracasSurfaceRenderingManager* surrendmanager2, - wxMaracasSurfaceRenderingManager* surrendmanager3, wxString filename, wxString dataname); - wxMaracasMultipleVolumeRendererPanel* addVolume(wxMaracasMultipleVolumeRendererManager* volmanager, vtkImageData* img, std::string dataname); - wxMaracasSurfaceRenderingPanel* addSurface1(wxMaracasSurfaceRenderingManager* surrendmanager, vtkImageData* img, std::string dataname); - wxMaracasSurfaceRenderingPanel* addSurface2(wxMaracasSurfaceRenderingManager* surrendmanager, vtkImageData* img, std::string dataname); - wxMaracasSurfaceRenderingPanel* addSurface3(wxMaracasSurfaceRenderingManager* surrendmanager, vtkImageData* img, std::string dataname); + void createControls(wxString filename, wxString dataname); + wxMaracasMultipleVolumeRendererPanel* addVolume(vtkImageData* img, std::string dataname); + wxMaracasSurfaceRenderingPanel* addSurface1(vtkImageData* img, std::string dataname); + wxMaracasSurfaceRenderingPanel* addSurface2(vtkImageData* img, std::string dataname); + wxMaracasSurfaceRenderingPanel* addSurface3(vtkImageData* img, std::string dataname); void onCheckBoxVChange(wxCommandEvent& event); void onCheckBoxSAChange(wxCommandEvent& event); void onCheckBoxSBChange(wxCommandEvent& event); @@ -49,10 +48,10 @@ private: bool first; - //wxMaracasMultipleVolumeRendererPanel* _irmview; - //wxMaracasSurfaceRenderingPanel* _surview1; - //wxMaracasSurfaceRenderingPanel* _surview2; - //wxMaracasSurfaceRenderingPanel* _surview3; + wxMaracasMultipleVolumeRendererManager* volmanager; + wxMaracasSurfaceRenderingManager* surrendmanager1; + wxMaracasSurfaceRenderingManager* surrendmanager2; + wxMaracasSurfaceRenderingManager* surrendmanager3; }; #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/ diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx index f0436e8..4ed1749 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx @@ -157,10 +157,15 @@ void wxMaracasRendererView::addPanels(wxString filename, wxString dataname) wxauimanager->Update(); } + +wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel() +{ + return wxtabs; +} /* * */ -wxMaracasMultipleVolumeRendererPanel* wxMaracasRendererView::addVolume(vtkImageData* img, std::string dataname) +/*wxMaracasMultipleVolumeRendererPanel* wxMaracasRendererView::addVolume(vtkImageData* img, std::string dataname) { try @@ -248,7 +253,7 @@ wxMaracasSurfaceRenderingPanel* wxMaracasRendererView::addSurface3(vtkImageData* diag->ShowModal(); } } - +*/ void wxMaracasRendererView::loadVolume(wxString filename, wxString dataname) { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h index 0291312..2ea03f3 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h @@ -19,8 +19,8 @@ #include "wxMaracasRendererView.h" #include "wxMaracasRenderTabbedPanel.h" #include "wxMaracasMultipleVolumeRendererManager.h" -#include "wxMaracasMultipleVolumeRendererPanel.h" -#include "wxMaracasSurfaceRenderingProp3DMHD.h" +//#include "wxMaracasMultipleVolumeRendererPanel.h" +//#include "wxMaracasSurfaceRenderingProp3DMHD.h" #include "wxMaracasSurfaceRenderingManager.h" @@ -32,27 +32,14 @@ public: ~wxMaracasRendererView( ); static wxMaracasRendererView* getInstance(wxWindow* parent,std::string path=""); - static wxMaracasRendererView* getInstance(); - void setRenderer(vtkRenderer* renderer); - - wxMaracasMultipleVolumeRendererPanel* addVolume(vtkImageData* img, std::string dataname=""); - - wxMaracasSurfaceRenderingPanel* addSurface1(vtkImageData* img, std::string dataname=""); - - wxMaracasSurfaceRenderingPanel* addSurface2(vtkImageData* img, std::string dataname=""); - - wxMaracasSurfaceRenderingPanel* addSurface3(vtkImageData* img, std::string dataname=""); void loadVolume(wxString filename, wxString dataname); - void onLoadImageFile(); - void addPanels(wxString filename, wxString dataname = _T("")); - + wxMaracasRenderTabbedPanel* getTabbedPanel(); std::string getPath(); - void deleteVolume(int volid); void addRemoveActorVol(int id, bool remove); @@ -72,15 +59,11 @@ private: static wxMaracasRendererView* instance; wxMaracasMultipleVolumeRendererManager* volmanager; - wxMaracasSurfaceRenderingManager* surrendmanager1; - wxMaracasSurfaceRenderingManager* surrendmanager2; - wxMaracasSurfaceRenderingManager* surrendmanager3; - + wxMaracasRenderTabbedPanel* wxtabs; - wxAuiManager* wxauimanager; std::string _path;