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
076a41a3
Commit
076a41a3
authored
5 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Rename origin_capture_ to origin_capture_ptr_
parent
7b66b981
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!318
CaptureMotion: replace origin_frame_ptr_ by capture_origin_ptr_.
Pipeline
#4264
passed
5 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/core/capture/capture_motion.h
+3
-3
3 additions, 3 deletions
include/core/capture/capture_motion.h
src/capture/capture_motion.cpp
+2
-2
2 additions, 2 deletions
src/capture/capture_motion.cpp
with
5 additions
and
5 deletions
include/core/capture/capture_motion.h
+
3
−
3
View file @
076a41a3
...
...
@@ -106,7 +106,7 @@ class CaptureMotion : public CaptureBase
Eigen
::
MatrixXs
data_cov_
;
///< Motion data covariance
Eigen
::
VectorXs
calib_preint_
;
///< Calibration parameters used during pre-integration
MotionBuffer
buffer_
;
///< Buffer of motions between this Capture and the next one.
CaptureBaseWPtr
origin_capture_
;
///< Pointer to the origin capture of the motion
CaptureBaseWPtr
origin_capture_
ptr_
;
///< Pointer to the origin capture of the motion
};
inline
const
Eigen
::
VectorXs
&
CaptureMotion
::
getData
()
const
...
...
@@ -160,12 +160,12 @@ inline Eigen::VectorXs CaptureMotion::correctDelta(const VectorXs& _delta, const
inline
wolf
::
CaptureBasePtr
CaptureMotion
::
getOriginCapture
()
{
return
origin_capture_
.
lock
();
return
origin_capture_
ptr_
.
lock
();
}
inline
void
CaptureMotion
::
setOriginCapture
(
CaptureBasePtr
_origin_capture
)
{
origin_capture_
=
_origin_capture
;
origin_capture_
ptr_
=
_origin_capture
;
}
inline
VectorXs
CaptureMotion
::
getCalibrationPreint
()
const
...
...
This diff is collapsed.
Click to expand it.
src/capture/capture_motion.cpp
+
2
−
2
View file @
076a41a3
...
...
@@ -21,7 +21,7 @@ CaptureMotion::CaptureMotion(const std::string & _type,
data_
(
_data
),
data_cov_
(
_sensor_ptr
?
_sensor_ptr
->
getNoiseCov
()
:
Eigen
::
MatrixXs
::
Zero
(
_data
.
rows
(),
_data
.
rows
())),
// Someone should test this zero and do something smart accordingly
buffer_
(),
origin_capture_
(
_origin_capture
)
origin_capture_
ptr_
(
_origin_capture
)
{
//
}
...
...
@@ -41,7 +41,7 @@ CaptureMotion::CaptureMotion(const std::string & _type,
data_
(
_data
),
data_cov_
(
_data_cov
),
buffer_
(),
origin_capture_
(
_origin_capture
)
origin_capture_
ptr_
(
_origin_capture
)
{
//
}
...
...
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