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

prevent dangling pointers by clearing the active assembly after it was deleted

Browse Source
This commit is contained in:
Stefan Tröger 2013-10-21 21:49:54 +02:00
parent 64ec142d61
commit c1d799e831
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Mod/Assembly/Gui/AppAssemblyGuiPy.cpp
View File

@ -37,21 +37,21 @@
#include <Mod/Assembly/App/ItemPy.h> #include <Mod/Assembly/App/ItemPy.h>
// pointer to the active assembly object // pointer to the active assembly object
Assembly::Item *ActiveAsmObject =0; Assembly::Item* ActiveAsmObject =0;
Gui::Document *ActiveGuiDoc =0; Gui::Document* ActiveGuiDoc =0;
App::Document *ActiveAppDoc =0; App::Document* ActiveAppDoc =0;
Gui::ViewProviderDocumentObject *ActiveVp =0; Gui::ViewProviderDocumentObject* ActiveVp =0;
/* module functions */ /* module functions */
static PyObject * setActiveAssembly(PyObject *self, PyObject *args) static PyObject* setActiveAssembly(PyObject* self, PyObject* args)
{ {
if(ActiveAsmObject){ if(ActiveAsmObject) {
// check if the document not already closed // check if the document not already closed
std::vector<App::Document*> docs = App::GetApplication().getDocuments(); std::vector<App::Document*> docs = App::GetApplication().getDocuments();
for(std::vector<App::Document*>::const_iterator it=docs.begin();it!=docs.end();++it) for(std::vector<App::Document*>::const_iterator it=docs.begin(); it!=docs.end(); ++it)
if(*it == ActiveAppDoc){ if(*it == ActiveAppDoc) {
ActiveGuiDoc->signalHighlightObject(*ActiveVp,Gui::Blue,false); ActiveGuiDoc->signalHighlightObject(*ActiveVp,Gui::Blue,false);
break; break;
} }
@ -62,8 +62,8 @@ static PyObject * setActiveAssembly(PyObject *self, PyObject *args)
ActiveVp =0; ActiveVp =0;
} }
PyObject *object=0; PyObject* object=0;
if (PyArg_ParseTuple(args,"|O!",&(Assembly::ItemPy::Type), &object)&& object) { if(PyArg_ParseTuple(args,"|O!",&(Assembly::ItemPy::Type), &object)&& object) {
Assembly::Item* Item = static_cast<Assembly::ItemPy*>(object)->getItemPtr(); Assembly::Item* Item = static_cast<Assembly::ItemPy*>(object)->getItemPtr();
// Should be set! // Should be set!
assert(Item); assert(Item);
@ -72,17 +72,27 @@ static PyObject * setActiveAssembly(PyObject *self, PyObject *args)
ActiveAsmObject = Item; ActiveAsmObject = Item;
ActiveAppDoc = Item->getDocument(); ActiveAppDoc = Item->getDocument();
ActiveGuiDoc = Gui::Application::Instance->getDocument(ActiveAppDoc); ActiveGuiDoc = Gui::Application::Instance->getDocument(ActiveAppDoc);
ActiveVp = dynamic_cast<Gui::ViewProviderDocumentObject*> (ActiveGuiDoc->getViewProvider(Item)) ; ActiveVp = dynamic_cast<Gui::ViewProviderDocumentObject*>(ActiveGuiDoc->getViewProvider(Item)) ;
ActiveGuiDoc->signalHighlightObject(*ActiveVp,Gui::Blue,true); ActiveGuiDoc->signalHighlightObject(*ActiveVp,Gui::Blue,true);
} }
Py_Return; Py_Return;
} }
static PyObject* clearActiveAssembly(PyObject* self, PyObject* args) {
ActiveAsmObject = 0;
ActiveGuiDoc =0;
ActiveAppDoc =0;
ActiveVp =0;
Py_Return;
}
/* module functions */ /* module functions */
static PyObject * getActiveAssembly(PyObject *self, PyObject *args) static PyObject* getActiveAssembly(PyObject* self, PyObject* args)
{ {
if(ActiveAsmObject){ if(ActiveAsmObject) {
return ActiveAsmObject->getPyObject(); return ActiveAsmObject->getPyObject();
} }
@ -94,10 +104,15 @@ static PyObject * getActiveAssembly(PyObject *self, PyObject *args)
/* registration table */ /* registration table */
struct PyMethodDef AssemblyGui_Import_methods[] = { struct PyMethodDef AssemblyGui_Import_methods[] = {
{"setActiveAssembly" ,setActiveAssembly ,METH_VARARGS, { "setActiveAssembly" ,setActiveAssembly ,METH_VARARGS,
"setActiveAssembly(AssemblyObject) -- Set the Assembly object in work."}, "setActiveAssembly(AssemblyObject) -- Set the Assembly object in work."
{"getActiveAssembly" ,getActiveAssembly ,METH_VARARGS, },
"getActiveAssembly() -- Returns the Assembly object in work."}, { "getActiveAssembly" ,getActiveAssembly ,METH_VARARGS,
"getActiveAssembly() -- Returns the Assembly object in work."
},
{ "clearActiveAssembly" ,clearActiveAssembly ,METH_VARARGS,
"clearActiveAssembly() -- Removes the current active Assembly as object in work"
},
{NULL, NULL} /* end of table marker */ {NULL, NULL} /* end of table marker */
}; };

4
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
View File

@ -35,6 +35,8 @@
using namespace AssemblyGui; using namespace AssemblyGui;
extern Assembly::ItemAssembly* ActiveAsmObject;
PROPERTY_SOURCE(AssemblyGui::ViewProviderItemAssembly,AssemblyGui::ViewProviderItem) PROPERTY_SOURCE(AssemblyGui::ViewProviderItemAssembly,AssemblyGui::ViewProviderItem)
ViewProviderItemAssembly::ViewProviderItemAssembly() ViewProviderItemAssembly::ViewProviderItemAssembly()
@ -43,6 +45,8 @@ ViewProviderItemAssembly::ViewProviderItemAssembly()
ViewProviderItemAssembly::~ViewProviderItemAssembly() ViewProviderItemAssembly::~ViewProviderItemAssembly()
{ {
if(getObject() == ActiveAsmObject)
Gui::Command::doCommand(Gui::Command::Doc,"AssemblyGui.clearActiveAssembly()");
} }
bool ViewProviderItemAssembly::doubleClicked(void) bool ViewProviderItemAssembly::doubleClicked(void)