From: davila <> Date: Sun, 3 Jun 2012 13:45:06 +0000 (+0000) Subject: v1.1.0 BUG: 1402 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e67542bad05cebe7467b41564f0207d7e7efef74;p=bbtkGEditor.git v1.1.0 BUG: 1402 - Erase all selected boxes --- diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx index 7a3498b..cd6e443 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx @@ -1059,6 +1059,7 @@ bool wxVtkSceneManager::OnLeftDClick() { bool wxVtkSceneManager::OnChar() { bool ok=false; + bool oktmp; char keyCode = _vtkInteractorStyleBaseView->GetInteractor()-> GetKeyCode(); int ctrlkey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey(); @@ -1069,11 +1070,12 @@ bool wxVtkSceneManager::OnChar() for (int i = 0; i < (int) _selectedObjects.size(); i++) { int id = _selectedObjects[i]; - printf("EED wxVtkSceneManager::OnChar %d %d\n", i, id); std::map::iterator it; it = _controllers.find(id); - if (it != _controllers.end()) { - ok=ok||deleteObject(id); + if (it != _controllers.end()) + { + oktmp = deleteObject(id); + ok = ok||oktmp; } // if }// for selected objects if (ok) _selectedObjects.clear(); @@ -1127,7 +1129,6 @@ bool wxVtkSceneManager::deleteObject(int id) bool result=true; GObjectController *control = _controllers[id]; std::vector controllersToRemove; - if (control->getGObjectType() == GBLACKBOX || control->getGObjectType() == GCOMPLEXINPUTPORT || control->getGObjectType() == GCOMPLEXOUTPUTPORT) {