X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGBlackBoxController.cxx;h=e593fc27c6fc1ae8bdcb976ce219540604bf474c;hb=3cf9e69646c27f2c77bbf4ddb657d34deffbe386;hp=8c73675eeab4d6779ba589759cdc27d9bc297667;hpb=a9060eb4ac36b5ad914a88ef59d75710ca26b2d2;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
index 8c73675..e593fc2 100644
--- 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$
@@ -120,13 +145,18 @@ namespace bbtk
 		
 //		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 shiftkey            = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
 		int ctrlkey             = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
 		ctrlkey = ctrlkey + shiftkey;
@@ -173,11 +203,12 @@ namespace bbtk
 		ctrlkey = ctrlkey + shiftkey;
 		
 		
-		if ( (state==SELECTED) && (ctrlkey==0) && (_objHasBeenMoved==false))
-		{
-			_view->setState(NOTHING_HAPPENS);
-			_model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
-		}
+//EED 12/07/2012		
+//		if ( (state==SELECTED) && (ctrlkey==0) && (_objHasBeenMoved==false))
+//		{
+//			_view->setState(NOTHING_HAPPENS);
+//			_model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
+//		}