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

make nonrigid subbassemblys work when they hold subassemblys themself

Browse Source
This commit is contained in:
Stefan Tröger 2013-12-22 20:31:35 +01:00
parent 4441d9d2c7
commit 894249473b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/Assembly/App/ItemAssembly.cpp
View File

@ -248,7 +248,7 @@ void ItemAssembly::initSolver(boost::shared_ptr<Solver> parent, Base::Placement&
if(parent) {
if(Rigid.getValue() || stopped) {
m_solver = parent->createSubsystem();
m_solver->setTransformation(this->Placement.getValue());
m_solver->setTransformation(PL_downstream*this->Placement.getValue());
stopped = true; //all below belongs to this rigid group
//connect the recalculated signal in case we need to update the placement
@ -257,9 +257,12 @@ void ItemAssembly::initSolver(boost::shared_ptr<Solver> parent, Base::Placement&
else {
m_solver = parent;
PL_downstream *= this->Placement.getValue();
m_downstream_placement = PL_downstream;
}
}
//we always need to store the downstream placement as we may be a subassembly in a
//non-rigid subassembly
m_downstream_placement = PL_downstream;
typedef std::vector<App::DocumentObject*>::const_iterator iter;
const std::vector<App::DocumentObject*>& vector = Items.getValues();
@ -305,7 +308,7 @@ void ItemAssembly::finish(boost::shared_ptr<Solver> subsystem) {
//assert(subsystem == m_solver);
Base::Placement p = m_solver->getTransformation<Base::Placement>();
this->Placement.setValue(p);
this->Placement.setValue(m_downstream_placement.inverse()*p);
};
} //assembly