X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FvtkGObjectView.cxx;h=50ca906694be2d90850ee69812c91d4c46b307e0;hb=0f60379c0e899055754c8a0be01a2649cc438bc8;hp=2466e2c62253a65f2e499cab03759ad4b806e405;hpb=910f9d7a7aecf26c88db3f595969a67ae5c27f78;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx index 2466e2c..50ca906 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx @@ -1,3 +1,29 @@ +/* +# --------------------------------------------------------------------- +# +# 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$ @@ -118,8 +144,8 @@ namespace bbtk bool vtkGObjectView::isPointInside(int X,int Y) //virtual { - // RaC In the actual version, always z=900 - double xx=X,yy=Y,zz=900; + // RaC In the actual version, always z=GPOSITION_Z + double xx=X,yy=Y,zz=GPOSITION_Z; _baseView->TransCoordScreenToWorld(xx,yy,zz); return _model->isPointInside(xx,yy,zz); } @@ -128,8 +154,8 @@ namespace bbtk void vtkGObjectView::moveObject(int X,int Y) //virtual { - // RaC In the actual version, always z=900 - double xx=X,yy=Y,zz=900; + // RaC In the actual version, always z=GPOSITION_Z + double xx=X,yy=Y,zz=GPOSITION_Z; _baseView->TransCoordScreenToWorld(xx,yy,zz); if(_isStartDragging)