suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix Python binding of 3d viewer

Browse Source
This commit is contained in:
wmayer 2014-10-19 18:59:05 +02:00
parent ab66d0a45f
commit 5ddb891bd3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Gui/View3DInventorViewer.cpp
View File

@ -300,18 +300,18 @@ public:
View3DInventorViewer::View3DInventorViewer(QWidget* parent, const QGLWidget* sharewidget) View3DInventorViewer::View3DInventorViewer(QWidget* parent, const QGLWidget* sharewidget)
: Quarter::SoQTQuarterAdaptor(parent, sharewidget), editViewProvider(0), navigation(0), : Quarter::SoQTQuarterAdaptor(parent, sharewidget), editViewProvider(0), navigation(0),
framebuffer(0), axisCross(0), axisGroup(0), editing(FALSE), redirected(FALSE), framebuffer(0), axisCross(0), axisGroup(0), editing(FALSE), redirected(FALSE),
allowredir(FALSE), overrideMode("As Is") allowredir(FALSE), overrideMode("As Is"), _viewerPy(0)
{ {
init(); init();
}; }
View3DInventorViewer::View3DInventorViewer(const QGLFormat& format, QWidget* parent, const QGLWidget* sharewidget) View3DInventorViewer::View3DInventorViewer(const QGLFormat& format, QWidget* parent, const QGLWidget* sharewidget)
: Quarter::SoQTQuarterAdaptor(format, parent, sharewidget), editViewProvider(0), navigation(0), : Quarter::SoQTQuarterAdaptor(format, parent, sharewidget), editViewProvider(0), navigation(0),
framebuffer(0), axisCross(0), axisGroup(0), editing(FALSE), redirected(FALSE), framebuffer(0), axisCross(0), axisGroup(0), editing(FALSE), redirected(FALSE),
allowredir(FALSE), overrideMode("As Is") allowredir(FALSE), overrideMode("As Is"), _viewerPy(0)
{ {
init(); init();
}; }
void View3DInventorViewer::init() void View3DInventorViewer::init()
{ {
@ -486,13 +486,18 @@ View3DInventorViewer::~View3DInventorViewer()
delete this->navigation; delete this->navigation;
// Note: When closing the application the main window doesn't exist any more. // Note: When closing the application the main window doesn't exist any more.
if(getMainWindow()) if (getMainWindow())
getMainWindow()->setPaneText(2, QLatin1String("")); getMainWindow()->setPaneText(2, QLatin1String(""));
Gui::Selection().Detach(this); Gui::Selection().Detach(this);
removeEventFilter(viewerEventFilter); removeEventFilter(viewerEventFilter);
delete viewerEventFilter; delete viewerEventFilter;
if (_viewerPy) {
static_cast<View3DInventorViewerPy*>(_viewerPy)->_viewer = 0;
Py_DECREF(_viewerPy);
}
} }
void View3DInventorViewer::setDocument(Gui::Document* pcDocument) void View3DInventorViewer::setDocument(Gui::Document* pcDocument)