Skip to content
Snippets Groups Projects
Commit 3a4833d3 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge remote-tracking branch 'origin/devel' into 407-processor-motion-model

parents b2cb547f c268927d
No related branches found
No related tags found
1 merge request!419Resolve "Processor motion model"
...@@ -205,6 +205,11 @@ FactorBasePtr FrameBase::getFactorOf(const ProcessorBasePtr _processor_ptr, cons ...@@ -205,6 +205,11 @@ FactorBasePtr FrameBase::getFactorOf(const ProcessorBasePtr _processor_ptr, cons
for (const FactorBasePtr& factor_ptr : getConstrainedByList()) for (const FactorBasePtr& factor_ptr : getConstrainedByList())
if (factor_ptr->getProcessor() == _processor_ptr && factor_ptr->getType() == type) if (factor_ptr->getProcessor() == _processor_ptr && factor_ptr->getType() == type)
return factor_ptr; return factor_ptr;
for (const FactorBasePtr& factor_ptr : getFactorList())
if (factor_ptr->getProcessor() == _processor_ptr && factor_ptr->getType() == type)
return factor_ptr;
return nullptr; return nullptr;
} }
...@@ -213,6 +218,11 @@ FactorBasePtr FrameBase::getFactorOf(const ProcessorBasePtr _processor_ptr) cons ...@@ -213,6 +218,11 @@ FactorBasePtr FrameBase::getFactorOf(const ProcessorBasePtr _processor_ptr) cons
for (const FactorBasePtr& factor_ptr : getConstrainedByList()) for (const FactorBasePtr& factor_ptr : getConstrainedByList())
if (factor_ptr->getProcessor() == _processor_ptr) if (factor_ptr->getProcessor() == _processor_ptr)
return factor_ptr; return factor_ptr;
for (const FactorBasePtr& factor_ptr : getFactorList())
if (factor_ptr->getProcessor() == _processor_ptr)
return factor_ptr;
return nullptr; return nullptr;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment