Skip to content
Snippets Groups Projects
Commit e072d03a authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

fixing rare clashes

parent 026af88d
No related branches found
No related tags found
2 merge requests!11new release,!10new release
...@@ -316,12 +316,12 @@ void PublisherGraph::publishFactors() ...@@ -316,12 +316,12 @@ void PublisherGraph::publishFactors()
// Iterate over the list of factors // Iterate over the list of factors
for (auto fac : fac_list) for (auto fac : fac_list)
{ {
std::string fac_str = factorString(fac);
// Try to fill marker // Try to fill marker
if (not fillFactorMarker(fac, factor_marker, factor_text_marker)) if (not fillFactorMarker(fac, factor_marker, factor_text_marker))
continue; continue;
std::string fac_str = factorString(fac);
// markers id // markers id
factor_marker.id = fac->id(); factor_marker.id = fac->id();
factor_text_marker.id = fac->id(); factor_text_marker.id = fac->id();
...@@ -740,6 +740,10 @@ bool PublisherGraph::fillFrameMarker(FrameBaseConstPtr frm, ...@@ -740,6 +740,10 @@ bool PublisherGraph::fillFrameMarker(FrameBaseConstPtr frm,
std::string PublisherGraph::factorString(FactorBaseConstPtr fac) const std::string PublisherGraph::factorString(FactorBaseConstPtr fac) const
{ {
std::string factor_string; std::string factor_string;
if (not fac or not fac->getCapture() or not fac->getCapture()->getFrame())
return "invalid factor" + std::to_string(fac->id());
factor_string = "F" + std::to_string(fac->getCapture()->getFrame()->id()); factor_string = "F" + std::to_string(fac->getCapture()->getFrame()->id());
// FRAME // FRAME
......
...@@ -47,7 +47,7 @@ PublisherPose::PublisherPose(const std::string& _unique_name, ...@@ -47,7 +47,7 @@ PublisherPose::PublisherPose(const std::string& _unique_name,
max_points_ = getParamWithDefault<int>(_server, max_points_ = getParamWithDefault<int>(_server,
prefix_ + "/max_points", prefix_ + "/max_points",
1e3); 1e4);
line_size_ = getParamWithDefault<double>(_server, line_size_ = getParamWithDefault<double>(_server,
prefix_ + "/line_size", prefix_ + "/line_size",
0.1); 0.1);
......
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