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
402729e0
Commit
402729e0
authored
6 years ago
by
PierreGtch
Browse files
Options
Downloads
Patches
Plain Diff
Buffer::add() change parameters order for consistency
parent
66198eff
No related branches found
No related tags found
1 merge request
!290
Resolve "ProcessorLoopClosureBase class"
Pipeline
#3657
passed
6 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/core/processor/processor_base.h
+2
-2
2 additions, 2 deletions
include/core/processor/processor_base.h
src/processor/processor_base.cpp
+3
-4
3 additions, 4 deletions
src/processor/processor_base.cpp
with
5 additions
and
6 deletions
include/core/processor/processor_base.h
+
2
−
2
View file @
402729e0
...
@@ -68,7 +68,7 @@ public:
...
@@ -68,7 +68,7 @@ public:
/**\brief Add a pack to the buffer
/**\brief Add a pack to the buffer
*
*
*/
*/
void
add
(
const
T
&
_element
,
const
TimeStamp
&
_time_stamp
);
//const Scalar& _time_tolerance);
void
add
(
const
TimeStamp
&
_time_stamp
,
const
T
&
_element
);
//const Scalar& _time_tolerance);
/** \brief returns the container with elements of the buffer
/** \brief returns the container with elements of the buffer
*
*
...
@@ -400,7 +400,7 @@ T Buffer<T>::selectFirstBefore(const TimeStamp& _time_stamp, const Scalar& _time
...
@@ -400,7 +400,7 @@ T Buffer<T>::selectFirstBefore(const TimeStamp& _time_stamp, const Scalar& _time
}
}
template
<
typename
T
>
template
<
typename
T
>
void
Buffer
<
T
>::
add
(
const
T
&
_element
,
const
TimeStamp
&
_time_stamp
)
void
Buffer
<
T
>::
add
(
const
TimeStamp
&
_time_stamp
,
const
T
&
_element
)
{
{
container_
.
emplace
(
_time_stamp
,
_element
);
container_
.
emplace
(
_time_stamp
,
_element
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/processor/processor_base.cpp
+
3
−
4
View file @
402729e0
...
@@ -54,14 +54,14 @@ void ProcessorBase::keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _
...
@@ -54,14 +54,14 @@ void ProcessorBase::keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _
{
{
WOLF_DEBUG
(
"P"
,
isMotion
()
?
"M "
:
"T "
,
getName
(),
": KF"
,
_keyframe_ptr
->
id
(),
" callback received with ts = "
,
_keyframe_ptr
->
getTimeStamp
());
WOLF_DEBUG
(
"P"
,
isMotion
()
?
"M "
:
"T "
,
getName
(),
": KF"
,
_keyframe_ptr
->
id
(),
" callback received with ts = "
,
_keyframe_ptr
->
getTimeStamp
());
if
(
_keyframe_ptr
!=
nullptr
)
if
(
_keyframe_ptr
!=
nullptr
)
buffer_pack_kf_
.
add
(
_keyframe_ptr
,
_time_tol_other
);
buffer_pack_kf_
.
add
(
_keyframe_ptr
,
_time_tol_other
);
}
}
void
ProcessorBase
::
captureCallback
(
CaptureBasePtr
_capture_ptr
)
void
ProcessorBase
::
captureCallback
(
CaptureBasePtr
_capture_ptr
)
{
{
WOLF_DEBUG
(
"P"
,
isMotion
()
?
"M "
:
"T "
,
getName
(),
": Capture"
,
_capture_ptr
->
id
(),
" callback received with ts = "
,
_capture_ptr
->
getTimeStamp
());
WOLF_DEBUG
(
"P"
,
isMotion
()
?
"M "
:
"T "
,
getName
(),
": Capture"
,
_capture_ptr
->
id
(),
" callback received with ts = "
,
_capture_ptr
->
getTimeStamp
());
if
(
_capture_ptr
!=
nullptr
)
if
(
_capture_ptr
!=
nullptr
)
buffer_capture_
.
add
(
_capture_ptr
,
_capture_ptr
->
getTimeStamp
());
buffer_capture_
.
add
(
_capture_ptr
->
getTimeStamp
()
,
_capture_ptr
);
}
}
void
ProcessorBase
::
remove
()
void
ProcessorBase
::
remove
()
...
@@ -104,8 +104,7 @@ void BufferPackKeyFrame::add(const FrameBasePtr& _key_frame, const Scalar& _time
...
@@ -104,8 +104,7 @@ void BufferPackKeyFrame::add(const FrameBasePtr& _key_frame, const Scalar& _time
{
{
TimeStamp
time_stamp
=
_key_frame
->
getTimeStamp
();
TimeStamp
time_stamp
=
_key_frame
->
getTimeStamp
();
PackKeyFramePtr
kfpack
=
std
::
make_shared
<
PackKeyFrame
>
(
_key_frame
,
_time_tolerance
);
PackKeyFramePtr
kfpack
=
std
::
make_shared
<
PackKeyFrame
>
(
_key_frame
,
_time_tolerance
);
//Buffer<PackKeyFramePtr>::add(kfpack, time_stamp);
Buffer
::
add
(
time_stamp
,
kfpack
);
Buffer
::
add
(
kfpack
,
time_stamp
);
}
}
PackKeyFramePtr
BufferPackKeyFrame
::
selectPack
(
const
TimeStamp
&
_time_stamp
,
const
Scalar
&
_time_tolerance
)
PackKeyFramePtr
BufferPackKeyFrame
::
selectPack
(
const
TimeStamp
&
_time_stamp
,
const
Scalar
&
_time_tolerance
)
...
...
This diff is collapsed.
Click to expand it.
Pierre Guetschel
@pguetschel
mentioned in commit
47cf5106
·
6 years ago
mentioned in commit
47cf5106
mentioned in commit 47cf5106c47bf5ccc190749d3f25c14444c8937d
Toggle commit list
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