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
103966da
Commit
103966da
authored
5 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Plain Diff
Merge branch 'devel' into 337-cleanup-frame-constructors-accepting-eigen-vectors-and-matrices
parents
4f39d8bc
846ff15f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!372
Resolve "Cleanup Frame constructors accepting Eigen vectors and matrices"
Pipeline
#5605
passed
5 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/capture/capture_base.cpp
+2
-3
2 additions, 3 deletions
src/capture/capture_base.cpp
src/capture/capture_motion.cpp
+1
-1
1 addition, 1 deletion
src/capture/capture_motion.cpp
with
3 additions
and
4 deletions
src/capture/capture_base.cpp
+
2
−
3
View file @
103966da
...
...
@@ -232,7 +232,7 @@ void CaptureBase::setProblem(ProblemPtr _problem)
void
CaptureBase
::
printHeader
(
int
_depth
,
bool
_constr_by
,
bool
_metric
,
bool
_state_blocks
,
std
::
ostream
&
_stream
,
std
::
string
_tabs
)
const
{
_stream
<<
_tabs
<<
"Cap"
<<
id
()
<<
" "
<<
getType
();
_stream
<<
_tabs
<<
"Cap"
<<
id
()
<<
" "
<<
getType
()
<<
" ts = "
<<
std
::
setprecision
(
3
)
<<
getTimeStamp
()
;
if
(
getSensor
()
!=
nullptr
)
{
...
...
@@ -261,8 +261,7 @@ void CaptureBase::printHeader(int _depth, bool _constr_by, bool _metric, bool _s
}
else
if
(
_metric
)
{
_stream
<<
_tabs
<<
(
isFixed
()
?
"Fix"
:
"Est"
)
<<
", ts="
<<
std
::
setprecision
(
5
)
<<
getTimeStamp
();
_stream
<<
_tabs
<<
(
isFixed
()
?
"Fix"
:
"Est"
);
_stream
<<
",
\t
x= ( "
<<
std
::
setprecision
(
2
)
<<
getStateVector
()
<<
" )"
;
_stream
<<
std
::
endl
;
}
...
...
This diff is collapsed.
Click to expand it.
src/capture/capture_motion.cpp
+
1
−
1
View file @
103966da
...
...
@@ -72,7 +72,7 @@ bool CaptureMotion::containsTimeStamp (const TimeStamp& _ts, double _time_tolera
void
CaptureMotion
::
printHeader
(
int
_depth
,
bool
_constr_by
,
bool
_metric
,
bool
_state_blocks
,
std
::
ostream
&
_stream
,
std
::
string
_tabs
)
const
{
_stream
<<
_tabs
<<
"CapM"
<<
id
()
<<
" "
<<
getType
();
_stream
<<
_tabs
<<
"CapM"
<<
id
()
<<
" "
<<
getType
()
<<
" ts = "
<<
std
::
setprecision
(
3
)
<<
getTimeStamp
()
;
if
(
getSensor
()
!=
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