Miscellaneous fixes

This commit is contained in:
jrheinlaender
2013-04-24 20:50:09 +04:30
committed by Stefan Tröger
parent 7330d4357e
commit 45af3e2a78
6 changed files with 73 additions and 59 deletions

View File

@@ -45,6 +45,9 @@ Gui::Document *ActiveGuiDoc =0;
App::Document *ActiveAppDoc =0;
Gui::ViewProviderDocumentObject *ActiveVp =0;
// The names of the base planes. Note: The user-visible label is different from this
const char* BaseplaneNames[3] = {"BaseplaneXY", "BaseplaneYZ", "BaseplaneXZ"};
}
static PyObject * setActivePart(PyObject *self, PyObject *args)
@@ -55,7 +58,9 @@ static PyObject * setActivePart(PyObject *self, PyObject *args)
// Should be set!
assert(Item);
if (PartDesignGui::ActivePartObject != NULL)
// Set old body inactive if we are activating another body in the same document
if ((PartDesignGui::ActivePartObject != NULL) &&
(PartDesignGui::ActivePartObject->getDocument() == Item->getDocument()))
PartDesignGui::ActivePartObject->IsActive.setValue(false);
PartDesignGui::ActivePartObject = Item;
PartDesignGui::ActiveAppDoc = Item->getDocument();
@@ -64,7 +69,7 @@ static PyObject * setActivePart(PyObject *self, PyObject *args)
Item->IsActive.setValue(true);
} else {
// This handles the case of deactivating the workbench
PartDesignGui::ActivePartObject = 0;
PartDesignGui::ActivePartObject=0;
PartDesignGui::ActiveGuiDoc =0;
PartDesignGui::ActiveAppDoc =0;
PartDesignGui::ActiveVp =0;