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

Attacher: make positionBySupport return if attached or not

Browse Source 
Needed as reliable way of testing if attachment is working or not.
This commit is contained in:
DeepSOIC
2016-05-06 00:29:03 +03:00
committed by wmayer
parent 03b974246c
commit 78bed4bb78
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Part/App/AttachableObject.cpp
View File

@@ -70,15 +70,17 @@ void AttachableObject::setAttacher(AttachEngine* attacher)
updateAttacherVals();
}
void AttachableObject::positionBySupport()
bool AttachableObject::positionBySupport()
{
if (!_attacher)
throw Base::Exception("AttachableObject: can't positionBySupport, because no AttachEngine is set.");
updateAttacherVals();
try{
this->Placement.setValue(_attacher->calculateAttachedPlacement(this->Placement.getValue()));
return true;
} catch (ExceptionCancel) {
//disabled, don't do anything
return false;
};
}
@@ -107,6 +109,7 @@ void setReadonlyness(App::Property &prop, bool on)
void AttachableObject::onChanged(const App::Property* prop)
{
if(! this->isRestoring()){
bool bAttached = false;
try{
if ((prop == &Support
|| prop == &MapMode
@@ -114,11 +117,7 @@ void AttachableObject::onChanged(const App::Property* prop)
|| prop == &MapReversed
|| prop == &superPlacement)){
eMapMode mmode = eMapMode(this->MapMode.getValue());
setReadonlyness(this->superPlacement, mmode == mmDeactivated);
setReadonlyness(this->Placement, mmode != mmDeactivated && mmode != mmTranslate);
positionBySupport();
bAttached = positionBySupport();
}
} catch (Base::Exception &e) {
this->setError();
@@ -128,6 +127,11 @@ void AttachableObject::onChanged(const App::Property* prop)
this->setError();
Base::Console().Error("PositionBySupport: %s",e.GetMessageString());
}
eMapMode mmode = eMapMode(this->MapMode.getValue());
setReadonlyness(this->superPlacement, !bAttached);
setReadonlyness(this->Placement, bAttached && mmode != mmTranslate); //for mmTranslate, orientation should remain editable even when attached.
}
Part::Feature::onChanged(prop);
}