X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsVtkGUIEditorGraphic%2FGBlackBoxController.cxx;h=99c7d07bef0bc8fb3a6a7387d35b5aaf8e3cff19;hb=92a55a7bc8ace3f27e6ebdaf56fb47938c97cced;hp=8c73675eeab4d6779ba589759cdc27d9bc297667;hpb=30ec99c0060a1f69fe302da398730d7ceaae6be2;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx index 8c73675..99c7d07 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx @@ -120,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; @@ -173,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); +// }