Feature #1771 Add licence terms for all files.

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
index 6cf2b9c99f7ed935144241ca40375a52a39dba0d..e593fc27c6fc1ae8bdcb976ce219540604bf474c 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.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 "GBlackBoxController.h"
 
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace bbtk
 {
 
@@ -55,8 +83,6 @@ namespace bbtk
        bool GBlackBoxController::OnMouseMove()
        {
 
-printf("EED GBlackBoxController::OnMouseMove START \n");
-
                if ( _vtkInteractorStyleBaseView!=NULL)
                {
                        int X,Y;
@@ -74,6 +100,7 @@ printf("EED GBlackBoxController::OnMouseMove START \n");
                                {
                                        _view->setState(HIGHLIGHTED);
                                }
+                                               return true; // to avoid to redraw all if nothing
                        } // state
 
                        if( state==HIGHLIGHTED)
@@ -90,7 +117,6 @@ printf("EED GBlackBoxController::OnMouseMove START \n");
                            _objHasBeenMoved=true;
                        } // state
 
-printf("EED GBlackBoxController::OnMouseMove state=%d\n", state);
                        _model->notifyObservers(getId());
 
                }
@@ -104,34 +130,45 @@ printf("EED GBlackBoxController::OnMouseMove state=%d\n", state);
                _objHasBeenMoved = false;
                _isLeftClickDown = true;
         bool ok=true;
+               
+               int X,Y;
+               wxVTKRenderWindowInteractor *_wxVTKiren;
+               _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
+               _wxVTKiren->GetEventPosition( X , Y );
+               
+               
+               
                int state  = _view->getState();
-printf("EED GBlackBoxController::OnLeftButtonDown state=%d \n", state);
                //Evaluate new state
-               if(state == HIGHLIGHTED)
+               
+               if(_view->isPointInside(X,Y))
+               
+//             if(state == HIGHLIGHTED)
 //EED3oct2010          if ( (state == HIGHLIGHTED) && (ctrlkey==1  ) )
+                       
+               if(state == SELECTED)
                {
+                       _view->setState(NOTHING_HAPPENS);
+                       _model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
+               } else {
                    ok=false;
                        _view->setState(SELECTED);
                        _model->notifyObservers(getId(),ADD_TO_SELECTED);
                }
-
-
-
-               int X,Y;
-               wxVTKRenderWindowInteractor *wxVTKiren;
-               wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
-               wxVTKiren->GetEventPosition(X,Y);
-        int ctrlkey=_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+               
+               
+               int shiftkey            = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
+               int ctrlkey             = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+               ctrlkey = ctrlkey + shiftkey;
+               
+               
                if ( (state==DRAG) && (ctrlkey==1) &&  (_view->isPointInside(X,Y)==true) )
                {
                        _view->setState(NOTHING_HAPPENS);
                        _model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
                }
 
-printf("EED GBlackBoxController::OnLeftButtonDown END\n" );
-
                return ok;
-
        }
 
        //=========================================================================
@@ -140,7 +177,6 @@ printf("EED GBlackBoxController::OnLeftButtonDown END\n" );
        {
         _isLeftClickDown    = false;
                int state           = _view->getState();
-printf("EED GBlackBoxController::OnLeftButtonUp START state=%d \n", state);
 
                //Evaluate new state
 
@@ -162,16 +198,19 @@ printf("EED GBlackBoxController::OnLeftButtonUp START state=%d \n", state);
 
 
 
-        int ctrlkey=_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
-
-               if ( (state==SELECTED) && (ctrlkey==0) && (_objHasBeenMoved==false))
-               {
-                       _view->setState(NOTHING_HAPPENS);
-                       _model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
-               }
+               int shiftkey            = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
+               int ctrlkey             = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+               ctrlkey = ctrlkey + shiftkey;
+               
+               
+//EED 12/07/2012               
+//             if ( (state==SELECTED) && (ctrlkey==0) && (_objHasBeenMoved==false))
+//             {
+//                     _view->setState(NOTHING_HAPPENS);
+//                     _model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
+//             }
 
 
-printf("EED GBlackBoxController::OnLeftButtonUp END state=%d \n", state);
 
                return true;
 
@@ -193,7 +232,7 @@ printf("EED GBlackBoxController::OnLeftButtonUp END state=%d \n", state);
                wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
                wxVTKiren->GetEventPosition(X,Y);
 
-               int state  = _view->getState();
+//             int state  = _view->getState();
 
                //Evaluate new state
                if(_view->isPointInside(X,Y))