BUG 1504

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

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
index bdec8ae4b6e14e5e24889e09c7ff789d0a6ccfd6..99c7d07bef0bc8fb3a6a7387d35b5aaf8e3cff19 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
@@ -75,6 +75,7 @@ namespace bbtk
                                {
                                        _view->setState(HIGHLIGHTED);
                                }
+                                               return true; // to avoid to redraw all if nothing
                        } // state
 
                        if( state==HIGHLIGHTED)
@@ -119,13 +120,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;
@@ -172,11 +178,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);
+//             }