kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

avoid changing scenegraph while traversing it

Browse Source
This commit is contained in:
wmayer
2017-01-13 22:01:47 +01:00
parent 09d80342d6
commit 8924cb194e
3 changed files with 77 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Gui/ViewProvider.cpp
View File

@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QPixmap>
# include <QTimer>
# include <Inventor/SoPickedPoint.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoSwitch.h>
@@ -44,6 +45,7 @@
#include "ViewProvider.h"
#include "Application.h"
#include "ActionFunction.h"
#include "Document.h"
#include "ViewProviderPy.h"
#include "BitmapFactory.h"
@@ -52,6 +54,8 @@
#include "SoFCDB.h"
#include "ViewProviderExtension.h"
#include <boost/bind.hpp>
using namespace std;
using namespace Gui;
@@ -171,10 +175,16 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node)
const SbBool press = ke->getState() == SoButtonEvent::DOWN ? true : false;
switch (ke->getKey()) {
case SoKeyboardEvent::ESCAPE:
if (self->keyPressed (press, ke->getKey()))
if (self->keyPressed (press, ke->getKey())) {
node->setHandled();
else
Gui::Application::Instance->activeDocument()->resetEdit();
}
else {
Gui::TimerFunction* func = new Gui::TimerFunction();
func->setAutoDelete(true);
Gui::Document* doc = Gui::Application::Instance->activeDocument();
func->setFunction(boost::bind(&Document::resetEdit, doc));
QTimer::singleShot(0, func, SLOT(timeout()));
}
break;
default:
// call the virtual method