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
494ad174
Commit
494ad174
authored
3 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
remove commented code
parent
a10e6922
No related branches found
No related tags found
2 merge requests
!466
devel->main
,
!459
Resolve "Allow ProcessorMotion to produce more than one Feature and Factor"
Pipeline
#12792
failed
3 years ago
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/processor/processor_motion.cpp
+2
-17
2 additions, 17 deletions
src/processor/processor_motion.cpp
with
2 additions
and
17 deletions
src/processor/processor_motion.cpp
+
2
−
17
View file @
494ad174
...
@@ -119,9 +119,6 @@ void ProcessorMotion::mergeCaptures(CaptureMotionPtr cap_prev,
...
@@ -119,9 +119,6 @@ void ProcessorMotion::mergeCaptures(CaptureMotionPtr cap_prev,
// emplace new feature and factor (if origin has frame)
// emplace new feature and factor (if origin has frame)
if
(
cap_prev
->
getOriginCapture
()
and
cap_prev
->
getOriginCapture
()
->
getFrame
())
if
(
cap_prev
->
getOriginCapture
()
and
cap_prev
->
getOriginCapture
()
->
getFrame
())
{
{
// auto new_feature = emplaceFeature(cap_target);
// emplaceFactor(new_feature, cap_prev->getOriginCapture());
emplaceFeaturesAndFactors
(
cap_prev
->
getOriginCapture
(),
cap_target
);
emplaceFeaturesAndFactors
(
cap_prev
->
getOriginCapture
(),
cap_target
);
}
}
}
}
...
@@ -315,11 +312,7 @@ void ProcessorMotion::processCapture(CaptureBasePtr _incoming_ptr)
...
@@ -315,11 +312,7 @@ void ProcessorMotion::processCapture(CaptureBasePtr _incoming_ptr)
splitBuffer
(
capture_existing
,
timestamp_from_callback
,
capture_for_keyframe_callback
);
splitBuffer
(
capture_existing
,
timestamp_from_callback
,
capture_for_keyframe_callback
);
// // create motion feature and add it to the capture
// // create motion feature and add it to the capture
// auto feature_new = emplaceFeature(capture_for_keyframe_callback);
// // create motion factor and add it to the feature, and constrain to the other capture (origin)
// // create motion factor and add it to the feature, and constrain to the other capture (origin)
// emplaceFactor(feature_new, capture_origin );
emplaceFeaturesAndFactors
(
capture_origin
,
capture_for_keyframe_callback
);
emplaceFeaturesAndFactors
(
capture_origin
,
capture_for_keyframe_callback
);
// modify existing feature and factor (if they exist in the existing capture)
// modify existing feature and factor (if they exist in the existing capture)
...
@@ -330,10 +323,6 @@ void ProcessorMotion::processCapture(CaptureBasePtr _incoming_ptr)
...
@@ -330,10 +323,6 @@ void ProcessorMotion::processCapture(CaptureBasePtr _incoming_ptr)
assert
(
capture_existing
->
getFeatureList
().
empty
());
// there was only one feature!
assert
(
capture_existing
->
getFeatureList
().
empty
());
// there was only one feature!
// auto new_feature_existing = emplaceFeature(capture_existing);
// emplaceFactor(new_feature_existing, capture_for_keyframe_callback);
emplaceFeaturesAndFactors
(
capture_for_keyframe_callback
,
capture_existing
);
emplaceFeaturesAndFactors
(
capture_for_keyframe_callback
,
capture_existing
);
}
}
...
@@ -411,12 +400,8 @@ void ProcessorMotion::processCapture(CaptureBasePtr _incoming_ptr)
...
@@ -411,12 +400,8 @@ void ProcessorMotion::processCapture(CaptureBasePtr _incoming_ptr)
// and give the part of the buffer before the new keyframe to the capture for the KF callback
// and give the part of the buffer before the new keyframe to the capture for the KF callback
splitBuffer
(
capture_existing
,
timestamp_from_callback
,
capture_for_keyframe_callback
);
splitBuffer
(
capture_existing
,
timestamp_from_callback
,
capture_for_keyframe_callback
);
// // create motion feature and add it to the capture
// create motion feature and add it to the capture
// auto feature_for_keyframe_callback = emplaceFeature(capture_for_keyframe_callback);
// create motion factor and add it to the feature, and constrain to the other capture (origin)
// // create motion factor and add it to the feature, and constrain to the other capture (origin)
// emplaceFactor(feature_for_keyframe_callback, capture_origin );
emplaceFeaturesAndFactors
(
capture_origin
,
capture_for_keyframe_callback
);
emplaceFeaturesAndFactors
(
capture_origin
,
capture_for_keyframe_callback
);
// reset processor origin
// reset processor origin
...
...
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