X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.cxx;h=ceffcafe4934f645e20586758ea77589b1945479;hb=2725f81fc97c9faa92749159bdbaf9cedeef7af4;hp=a786294da881208d53df4de3ead6388e777df961;hpb=2098cdccd2ed2c0593b36175bf67f4ee5230c327;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx index a786294..ceffcaf 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx @@ -80,7 +80,7 @@ std::string wxMaracasRendererView::getPath() wxMaracasRenderTabbedPanel* wxMaracasRendererView::getTabbedPanel(int id) throw(char*) { int i; - for(i = 0; i < (tabsVector.size()); i++) + for(i = 0; i < (int)tabsVector.size(); i++) { if(tabsVector[i]->getPropIdV() == id) return tabsVector[i]; @@ -98,6 +98,11 @@ void wxMaracasRendererView::setRenderer(vtkRenderer* renderer) _renderer = renderer; } +void wxMaracasRendererView::setVtkBaseView(wxVtk3DBaseView* vbv) +{ + baseView = vbv; +} + /** ** Called when an image file is opened **/ @@ -143,7 +148,7 @@ void wxMaracasRendererView::addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkIma **/ void wxMaracasRendererView::addVolumes(vtkImageData* img, std::string pathfile, std::string filename) { - wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this, _idCount); + wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this, _idCount, baseView); wxtabs->setRenderer(_renderer); tabsVector.push_back(wxtabs); @@ -160,38 +165,6 @@ void wxMaracasRendererView::deleteVolume(int volid) getTabbedPanel(volid)->deleteVolume(volid); } -/** -** Adds or removes a volume rendering actor -**/ -void wxMaracasRendererView::addRemoveActorVol(int id, bool addremove) -{ - //wxtabs->addRemoveActorV(id, addremove); -} - -/** -** Adds or removes a surface rendering actor -**/ -void wxMaracasRendererView::addRemoveSurf1Actor(int id, bool addremove) -{ - //wxtabs->addRemoveActorSA(id, addremove); -} - -/** -** Adds or removes a surface rendering actor -**/ -void wxMaracasRendererView::addRemoveSurf2Actor(int id, bool addremove) -{ - //wxtabs->addRemoveActorSB(id, addremove); -} - -/** -** Adds or removes a surface rendering actor -**/ -void wxMaracasRendererView::addRemoveSurf3Actor(int id, bool addremove) -{ - //wxtabs->addRemoveActorSC(id, addremove); -} - /** ** Gets opened file names **/