X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.cxx;h=a786294da881208d53df4de3ead6388e777df961;hb=87b6a1645b4dd6293e9c6ed9b33731d82a8623af;hp=939a376cce0ed84f194a91d5fad0ec93672e4fcd;hpb=fde5fea23394507e29ff91d85748f6f77e994d5d;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx index 939a376..a786294 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.cxx @@ -24,6 +24,7 @@ wxMaracasRendererView::wxMaracasRendererView(wxWindow* parent,std::string path) wxauimanager = new wxAuiManager(this); + _idCount = 0; _path = path; std::string iconsdir = path; @@ -117,6 +118,7 @@ void wxMaracasRendererView::onLoadImageFile() { 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); } } @@ -141,11 +143,13 @@ void wxMaracasRendererView::addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkIma **/ void wxMaracasRendererView::addVolumes(vtkImageData* img, std::string pathfile, std::string filename) { - wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this); + wxMaracasRenderTabbedPanel* wxtabs = new wxMaracasRenderTabbedPanel(this, _idCount); wxtabs->setRenderer(_renderer); tabsVector.push_back(wxtabs); addPanels(wxtabs, img, pathfile, filename); + + _idCount++; } /** ** Deletes current volume @@ -209,15 +213,6 @@ ToolBarRenderer::ToolBarRenderer(wxWindow * parent,std::string iconsdir) wxBitmap bitmap0(OpenImage_xpm); this->AddTool(1, wxString(_T("test")),bitmap0, NULL, wxITEM_NORMAL, wxString(_T("Open File"))); - /*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(); _evthand = new ToolBarEventHandlerRenderer();