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

Centralize the check for valid external geometry to ensure consistency

Browse Source
This commit is contained in:
jrheinlaender
2013-09-11 19:46:27 +02:00
committed by Stefan Tröger
parent 2c37723217
commit be9365679f
3 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
View File

@@ -4474,33 +4474,15 @@ namespace SketcherGui {
bool allow(App::Document *pDoc, App::DocumentObject *pObj, const char *sSubName)
{
// Selection outside of the Document is NOT allowed
Sketcher::SketchObject *sketch = static_cast<Sketcher::SketchObject*>(object);
if (sketch->getDocument() != pDoc)
if (!sketch->isExternalAllowed(pDoc, pObj))
return false;
App::DocumentObject *support = sketch->Support.getValue();
Part::BodyBase* body = Part::BodyBase::findBodyOf(support);
if (body != NULL) {
if (Part::BodyBase::findBodyOf(pObj) == body) {
// Don't allow selection after the Tip feature in the same body
if (body->isAfterTip(pObj))
return false;
} else {
// Selection outside of body not allowed if flag is not set
if (!sketch->allowOtherBody)
return false;
}
// Datum features are always allowed
if(pObj->getTypeId().isDerivedFrom(App::Plane::getClassTypeId()) ||
pObj->getTypeId().isDerivedFrom(Part::Datum::getClassTypeId()))
return true;
} else {
// Legacy parts - don't allow selection outside of the support
if (pObj != support)
return false;
}
if ((body != NULL) && (Part::BodyBase::findBodyOf(pObj) == body) && body->isAfterTip(pObj))
// Don't allow selection after the Tip feature in the same body
return false;
if (!sSubName || sSubName[0] == '\0')
return false;