Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
3a4833d3
Commit
3a4833d3
authored
3 years ago
by
Joan Vallvé Navarro
Browse files
Options
Downloads
Plain Diff
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
!419
Resolve "Processor motion model"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/frame/frame_base.cpp
+10
-0
10 additions, 0 deletions
src/frame/frame_base.cpp
with
10 additions
and
0 deletions
src/frame/frame_base.cpp
+
10
−
0
View file @
3a4833d3
...
@@ -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
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment