Skip to content
Snippets Groups Projects
Commit 7097619f authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge branch 'devel' into 9-adapt-to-state-block-map

parents aacc841b 77be90ad
No related branches found
No related tags found
3 merge requests!30Release after RAL,!29After 2nd RAL submission,!15Resolve "Adapt to state block map"
...@@ -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
......
...@@ -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())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment