X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGConnectorController.cxx;h=8a97cb419196e1f3997fbdaa40a01d32624381c9;hb=8e6a8a638f2b03db8e34234b6e02d71cda913f9d;hp=c97055f814ef5b80ae9563b953c152e233abe76d;hpb=56cbba59d070c955c4aab46e59908ab82f5e390d;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx index c97055f..8a97cb4 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.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$ @@ -36,6 +61,9 @@ Version: $Revision$ #include "GConnectorController.h" +#ifdef _DEBUG +#define new DEBUG_NEW +#endif namespace bbtk { @@ -57,6 +85,11 @@ namespace bbtk bool GConnectorController::OnMouseMove() { + if (_view->getState() ==SELECTED) + { + _controller->GetManualViewBaseContour()->SetSelected(true); + } + if ( _vtkInteractorStyleBaseView!=NULL) { int X,Y; @@ -137,7 +170,6 @@ namespace bbtk bool GConnectorController::OnRightButtonDown() { -printf ("GConnectorController::OnRightButtonDown 1 \n" ); if( _vtkInteractorStyleBaseView!= NULL ) { int X,Y; @@ -148,7 +180,6 @@ printf ("GConnectorController::OnRightButtonDown 1 \n" ); _controller->MouseClickRight(X,Y); } -printf ("GConnectorController::OnRightButtonDown 2 \n" ); return true; } @@ -165,7 +196,7 @@ printf ("GConnectorController::OnRightButtonDown 2 \n" ); { if ( _vtkInteractorStyleBaseView!=NULL ) { - int X,Y,Z=900; + int X, Y, Z=GPOSITION_Z; wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X, Y);