BUG 1505

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsVtkGUIEditorGraphic / GConnectorController.cxx

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx
index c9d8f74885f8781a412685a36860370ef1c46356..563d1d0574b9432da0b42a2e780fc15ce4fb5a08 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.cxx
@@ -1,4 +1,4 @@
-/*=========================================================================                                                                               
+/*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
 Language:  C++
@@ -11,31 +11,34 @@ Version:   $Revision$
 * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
 * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
 *
-*  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 
+*  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. 
+*  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.
-* ------------------------------------------------------------------------ */                                                                         
+* ------------------------------------------------------------------------ */
 
 /**
-*  \file 
-*  \brief Class bbtk::GConnectorController 
+*  \file
+*  \brief Class bbtk::GConnectorController
 */
 
 
 #include "GConnectorController.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace bbtk
 {
 
@@ -56,6 +59,11 @@ namespace bbtk
 
        bool GConnectorController::OnMouseMove()
        {
+
+               if (_view->getState() ==SELECTED)
+               {
+                       _controller->GetManualViewBaseContour()->SetSelected(true);
+               }
                
                if ( _vtkInteractorStyleBaseView!=NULL)
                {
@@ -64,27 +72,27 @@ namespace bbtk
                        _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        _wxVTKiren->GetEventPosition( X , Y );
 
-                       if ( (_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) &&(_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) ) 
+                       if ( (_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) &&(_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) )
                        {
                                _controller->MouseMove(X,Y);
                        }
-                       
+
                }
                return true;
        }
 
        //=========================================================================
-       
+
        bool GConnectorController::OnLeftButtonDown()
        {
-               
+
                if ( _vtkInteractorStyleBaseView!=NULL )
                {
                        int X,Y;
                        wxVTKRenderWindowInteractor *wxVTKiren;
                        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        wxVTKiren->GetEventPosition(X,Y);
-                       
+
                        _controller->SetKeyBoardMoving( false );
                        _controller->MouseClickLeft(X,Y);
 
@@ -109,14 +117,14 @@ namespace bbtk
                                _view->setState(SELECTED);
                                _model->notifyObservers(getId(),ADD_TO_SELECTED);
                        }
-                       
+
                }
                return true;
 
        }
-       
+
        //=========================================================================
-       
+
        bool GConnectorController::OnLeftDClick()
        {
 
@@ -132,9 +140,9 @@ namespace bbtk
                }
                return true;
        }
-       
+
        //=========================================================================
-       
+
        bool GConnectorController::OnRightButtonDown()
        {
                if( _vtkInteractorStyleBaseView!= NULL )
@@ -143,13 +151,13 @@ namespace bbtk
                        wxVTKRenderWindowInteractor *wxVTKiren;
                        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        wxVTKiren->GetEventPosition(X, Y);
-                       
+
                        _controller->MouseClickRight(X,Y);
-                                       
+
                }
                return true;
        }
-               
+
        //=========================================================================
 
        bool GConnectorController::OnRightButtonUp()
@@ -163,7 +171,7 @@ namespace bbtk
        {
                if ( _vtkInteractorStyleBaseView!=NULL )
                {
-                       int X,Y,Z=900;
+                       int X, Y, Z=GPOSITION_Z;
                        wxVTKRenderWindowInteractor *wxVTKiren;
                        wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        wxVTKiren->GetEventPosition(X, Y);
@@ -185,7 +193,7 @@ namespace bbtk
        }
 
        //=========================================================================
-       
+
        void GConnectorController::setManualContourController(manualConnectorContourController* controller)
        {
                _controller = controller;
@@ -193,7 +201,7 @@ namespace bbtk
        }
 
        //=========================================================================
-       
+
        void GConnectorController::removeFromScene()
        {
                GConnectorModel *conMod = (GConnectorModel*)_model;