Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
laser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
plugins
laser
Commits
7097619f
Commit
7097619f
authored
5 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Plain Diff
Merge branch 'devel' into 9-adapt-to-state-block-map
parents
aacc841b
77be90ad
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!30
Release after RAL
,
!29
After 2nd RAL submission
,
!15
Resolve "Adapt to state block map"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/laser/landmark/landmark_polyline_2D.h
+1
-1
1 addition, 1 deletion
include/laser/landmark/landmark_polyline_2D.h
src/landmark/landmark_polyline_2D.cpp
+1
-1
1 addition, 1 deletion
src/landmark/landmark_polyline_2D.cpp
with
2 additions
and
2 deletions
include/laser/landmark/landmark_polyline_2D.h
+
1
−
1
View file @
7097619f
...
@@ -200,7 +200,7 @@ class LandmarkPolyline2D : public LandmarkBase
...
@@ -200,7 +200,7 @@ class LandmarkPolyline2D : public LandmarkBase
/** \brief Adds all stateBlocks of the frame to the wolfProblem list of new stateBlocks
/** \brief Adds all stateBlocks of the frame to the wolfProblem list of new stateBlocks
**/
**/
virtual
void
registerNewStateBlocks
();
virtual
void
registerNewStateBlocks
()
const
;
virtual
void
removeStateBlocks
();
virtual
void
removeStateBlocks
();
/** Factory method to create new landmarks from YAML nodes
/** Factory method to create new landmarks from YAML nodes
...
...
This diff is collapsed.
Click to expand it.
src/landmark/landmark_polyline_2D.cpp
+
1
−
1
View file @
7097619f
...
@@ -907,7 +907,7 @@ void LandmarkPolyline2D::mergeLandmark(const LandmarkPolyline2DPtr _merged_lmk,
...
@@ -907,7 +907,7 @@ void LandmarkPolyline2D::mergeLandmark(const LandmarkPolyline2DPtr _merged_lmk,
//std::cout << "\tLandmark deleted\n";
//std::cout << "\tLandmark deleted\n";
}
}
void
LandmarkPolyline2D
::
registerNewStateBlocks
()
void
LandmarkPolyline2D
::
registerNewStateBlocks
()
const
{
{
LandmarkBase
::
registerNewStateBlocks
();
LandmarkBase
::
registerNewStateBlocks
();
if
(
getProblem
())
if
(
getProblem
())
...
...
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