BUG 1505

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.cxx
index bd3b65237c0d544c340da634ef8803912a2e6f96..f5d9e7b29881fecfd7602fdb2c14815f71103d1b 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.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::GBoxController 
+*  \file
+*  \brief Class bbtk::GBoxController
 */
 
 
 #include "GBoxController.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace bbtk
 {
 
@@ -43,7 +46,7 @@ namespace bbtk
        //=========================================================================
        GBoxController::GBoxController()
        {
-               
+
        }
 
        //=========================================================================
@@ -54,24 +57,24 @@ namespace bbtk
 
        bool GBoxController::OnMouseMove()
        {
-               
+
                if ( _vtkInteractorStyleBaseView!=NULL)
                {
                        int X,Y;
                        wxVTKRenderWindowInteractor *_wxVTKiren;
-                       _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
+                       _wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                        _wxVTKiren->GetEventPosition( X , Y );
 
                        int state  = _view->getState();
-                       
+
                        //Evaluate new state
-                       
+
                        if(state == NOTHING_HAPPENS)
                        {
                                if(_view->isPointInside(X,Y))
                                {
-                                       _view->setState(HIGHLIGHTED);   
-                               }                       
+                                       _view->setState(HIGHLIGHTED);
+                               }
                        }
                        if( state==HIGHLIGHTED)
                        {
@@ -80,32 +83,34 @@ namespace bbtk
                                        _view->setState(NOTHING_HAPPENS);
                                }
                        }
-                       
+
                        _model->notifyObservers(getId());
-                       
+
                }
                return true;
        }
 
        //=========================================================================
-       
+
        bool GBoxController::OnLeftButtonDown()
        {
+           bool ok=true;
                int state  = _view->getState();
-                       
+
                //Evaluate new state
                if(state == HIGHLIGHTED)
                {
+                   ok=false;
                        _isLeftClickDown=true;
                        _view->setState(SELECTED);
                        _model->notifyObservers(getId(),ADD_TO_SELECTED);
                }
-               return true;
+               return ok;
 
        }
 
        //=========================================================================
-       
+
        bool GBoxController::OnLeftButtonUp()
        {
                int X,Y;
@@ -126,9 +131,9 @@ namespace bbtk
                        }
                }
        return true;
-               
+
        }
-       
+
        //=========================================================================
 
        bool GBoxController::OnRightButtonUp()