X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGBoxController.cxx;h=ad8024df98fa1cea91c0aba25213f0ebd705ba9d;hb=10012627035234dfbe7a9028e393d1f912d15e8f;hp=da3336334faf938db197fb1e7bb2460779431642;hpb=92a55a7bc8ace3f27e6ebdaf56fb47938c97cced;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.cxx index da33363..ad8024d 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.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 +# +# 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: bbtk Module: $RCSfile$ @@ -61,7 +86,7 @@ namespace bbtk if ( _vtkInteractorStyleBaseView!=NULL) { int X,Y; - wxVTKRenderWindowInteractor *_wxVTKiren; + crea::wxVTKRenderWindowInteractor *_wxVTKiren; _wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); _wxVTKiren->GetEventPosition( X , Y ); @@ -103,8 +128,7 @@ namespace bbtk ok=false; _isLeftClickDown=true; _view->setState(SELECTED); -// _model->notifyObservers(getId(),ADD_TO_SELECTED); - _model->notifyObservers(getId()); + _model->notifyObservers(getId(),ADD_TO_SELECTED); } return ok; @@ -115,7 +139,7 @@ namespace bbtk bool GBoxController::OnLeftButtonUp() { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y);