X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.cxx;h=ce9dfaa449db8a907803bbd7efa3ac9de19e57fc;hb=659bcd2c2a608cfb8c5854ffe84e9248871df9a1;hp=9ed39f0dd062afb368733c35627e031c98f863cf;hpb=28c74ab5eb531ce001260e9bc3fcb0151fcfc56b;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx index 9ed39f0..ce9dfaa 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + /*========================================================================= Program: wxMaracas @@ -6,6 +31,10 @@ =========================================================================*/ +#include +#include +#include + #include "wxMaracasRendererView.h" #include @@ -24,10 +53,9 @@ wxMaracasRendererView::wxMaracasRendererView(wxWindow* parent,std::string path) wxauimanager = new wxAuiManager(this); + _idCount = 0; _path = path; - wxtabs = new wxMaracasRenderTabbedPanel(this); - std::string iconsdir = path; iconsdir+="/data/Icons"; this->_toolb = new ToolBarRenderer(this,iconsdir); @@ -48,15 +76,7 @@ wxMaracasRendererView::~wxMaracasRendererView( ) } /** -** -**/ -std::string wxMaracasRendererView::getPath() -{ - return _path; -} - -/** -** +** Gets class instance correponding to given parameters **/ wxMaracasRendererView* wxMaracasRendererView::getInstance(wxWindow* parent,std::string path) { @@ -68,7 +88,7 @@ wxMaracasRendererView* wxMaracasRendererView::getInstance(wxWindow* parent,std:: } /** -** +** Gets class intance **/ wxMaracasRendererView* wxMaracasRendererView::getInstance() { @@ -76,43 +96,40 @@ wxMaracasRendererView* wxMaracasRendererView::getInstance() } /** -** +** Gets path for the given panel **/ -void wxMaracasRendererView::setRenderer(vtkRenderer* renderer) +std::string wxMaracasRendererView::getPath() { - wxtabs->setRenderer(renderer); + return _path; } /** -** Adds or removes a volume rendering actor +** Returns internal panel **/ -void wxMaracasRendererView::addRemoveActorVol(int id, bool addremove) +wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel(int id) throw(char*) { - wxtabs->addRemoveActorV(id, addremove); -} + int i; + for(i = 0; i < (int)tabsVector.size(); i++) + { + if(tabsVector[i]->getPropIdV() == id) + return tabsVector[i]; + } + throw "id not found"; -/** -** Adds or removes a surface rendering actor -**/ -void wxMaracasRendererView::addRemoveSurf1Actor(int id, bool addremove) -{ - wxtabs->addRemoveActorSA(id, addremove); + return NULL; } /** -** Adds or removes a surface rendering actor +** **/ -void wxMaracasRendererView::addRemoveSurf2Actor(int id, bool addremove) +void wxMaracasRendererView::setRenderer(vtkRenderer* renderer) { - wxtabs->addRemoveActorSB(id, addremove); + _renderer = renderer; } -/** -** Adds or removes a surface rendering actor -**/ -void wxMaracasRendererView::addRemoveSurf3Actor(int id, bool addremove) +void wxMaracasRendererView::setVtkBaseView(wxVtk3DBaseView* vbv) { - wxtabs->addRemoveActorSC(id, addremove); + baseView = vbv; } /** @@ -122,29 +139,34 @@ void wxMaracasRendererView::onLoadImageFile() { wxString mhd(_T("mhd")); - wxFileDialog* fildial = new wxFileDialog(this, wxString(_T("Select a MHD file")),wxString(_T("")), - wxString(_T("")),wxString(_T("MHD files (*.mhd)|*.mhd")) ); + wxFileDialog* fildial = new wxFileDialog(this, wxString(_T("Select a MHD file")), wxString(_T("")), + wxString(_T("")), wxString(_T("MHD files (*.mhd)|*.mhd")) ); if(fildial->ShowModal()==wxID_OK) { - wxString filename = fildial->GetFilename(); + wxString filename = fildial->GetFilename(); + files.push_back( std::string(filename.mb_str()) ); wxString pathfile(fildial->GetDirectory() + _T("/") + filename); + if(filename.EndsWith(mhd)) { - addPanels(pathfile, filename); + std::string sPath = std::string(pathfile.mb_str()); + std::string sFileName = std::string(filename.mb_str()); + printf("wxMaracasRendererView::onLoadImageFile->Opening file... \n"); + addVolumes(NULL, sPath, sFileName); } } delete fildial; } - /** ** Constructs and adds internal panel **/ -void wxMaracasRendererView::addPanels(wxString pathfile, wxString filename) +void wxMaracasRendererView::addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkImageData* img, std::string pathfile, std::string filename) { wxString s(filename.c_str(),wxConvUTF8); - wxtabs->createControls(pathfile, filename); + wxtabs->createControls(img, pathfile, filename); + wxAuiPaneInfo paneinfo; wxauimanager->AddPane(wxtabs, paneinfo.DefaultPane().Centre().DestroyOnClose().Caption(s)); wxauimanager->Update(); @@ -153,17 +175,31 @@ void wxMaracasRendererView::addPanels(wxString pathfile, wxString filename) /** ** Returns internal panel **/ -wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel() +void wxMaracasRendererView::addVolumes(vtkImageData* img, std::string pathfile, std::string filename) { - return wxtabs; -} + wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this, _idCount, baseView); + wxtabs->setRenderer(_renderer); + + tabsVector.push_back(wxtabs); + addPanels(wxtabs, img, pathfile, filename); + _idCount++; +} /** ** Deletes current volume **/ void wxMaracasRendererView::deleteVolume(int volid) { - wxtabs->deleteVolume(volid); + + getTabbedPanel(volid)->deleteVolume(volid); +} + +/** +** Gets opened file names +**/ +std::vector wxMaracasRendererView::getFiles() +{ + return files; } /** @@ -177,16 +213,14 @@ ToolBarRenderer::ToolBarRenderer(wxWindow * parent,std::string iconsdir) //iconfil+= "/OpenImage.png"; //wxBitmap* bitmap0 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG); wxBitmap bitmap0(OpenImage_xpm); +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 this->AddTool(1, wxString(_T("test")),bitmap0, NULL, wxITEM_NORMAL, wxString(_T("Open File"))); +#else + this->AddTool(1, wxString(_T("test")),bitmap0, wxString(_T("Open File")), wxITEM_NORMAL ); +#endif - /*iconfil+= "/Open.png"; - wxBitmap* bitmap2 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG); - this->AddTool(2, wxString(_T("test")),*bitmap2); */ - /*iconfil = iconsdir; - iconfil+= "/Open.png"; - wxBitmap* bitmap30 = new wxBitmap(wxString(iconfil.c_str(),wxConvUTF8), wxBITMAP_TYPE_PNG); - this->AddTool(30, wxString(_T("test")),*bitmap30);*/ this->Realize();