+/*# ---------------------------------------------------------------------
+#
+# 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
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];
_renderer = renderer;
}
+void wxMaracasRendererView::setVtkBaseView(wxVtk3DBaseView* vbv)
+{
+ baseView = vbv;
+}
+
/**
** Called when an image file is opened
**/
**/
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);
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
**/
//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
+
+
this->Realize();