X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.cxx;h=eb454c97a37b72c888c3602cf80790fc1277e944;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=00cfbdc7d2a6234530e8b69dbda8653005014ba5;hpb=66588eac91068d9b7f9d45bffc5e09c27511eaac;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx index 00cfbdc..eb454c9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.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. +# ------------------------------------------------------------------------ */ + //#include "vtkInteractorStyleBaseView.h" @@ -49,32 +74,28 @@ void wxVtkBaseView::Configure() // virtual void wxVtkBaseView::Refresh() // virtual { // EED 10 Oct 2007 - #if defined(WIN32) - _iren->Refresh(false); + _iren->Refresh(true); +// EED 27 sept 2016 + vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor(); + vri->vtkRenderWindowInteractor::Render(); #else - //EED 01Avril2009 // _iren->Render(); vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor(); vri->vtkRenderWindowInteractor::Render(); - - //_iren->Refresh(); #endif - } //------------------------------------------------------------------- void wxVtkBaseView::RefreshView() // virtual { // EED 10 Oct 2007 - #if defined(WIN32) GetRenWin()->Render(); #else //GetRenWin()->Render(); #endif - } //--------------------------------------------------------------------------- vtkRenderer* wxVtkBaseView::GetRenderer() // virtual @@ -184,6 +205,27 @@ void wxVtkBaseView::GetSpacing(double spc[3]) // virtual spc[2]=1; } + +//--------------------------------------------------------------------------- +int wxVtkBaseView::GetDirection() // virtual +{ + return -1; +} + +//------------------------------------------------------------------- +vtkBaseData *wxVtkBaseView::GetVtkBaseData() +{ + return _vtkbasedata; +} + +//------------------------------------------------------------------- +void wxVtkBaseView::SetVtkBaseData(vtkBaseData *vtkbasedata) +{ + _vtkbasedata=vtkbasedata; +} + + + //------------------------------------------------------------------- //------------------------------------------------------------------- //-------------------------------------------------------------------