i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-03 16:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

icp_odometry: fixed plugin unloading warning on exit

Browse Source
This commit is contained in:
matlabbe
2019-12-11 16:03:50 -05:00
parent 6d49e7196a
commit f242e1879b
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nodelets/icp_odometry.cpp
+20 -16
View File
@@ -73,6 +73,7 @@ public:
virtual ~ICPOdometry()
{
plugins_.clear();
}
private:
@@ -103,6 +104,13 @@ private:
boost::shared_ptr<rtabmap_ros::PluginInterface> plugin = plugin_loader_.createInstance(type);
plugins_.push_back(plugin);
plugin->initialize(pluginName, pnh);
if(!plugin->isEnabled())
{
NODELET_WARN("Plugin: %s is not enabled, filtering will not occur. \"enabled_\" member "
"should be managed in subclasses. This can be ignored if the "
"plugin should really be initialized as disabled.",
plugin->getName().c_str());
}
}
catch(pluginlib::PluginlibException & ex) {
ROS_ERROR("Failed to load plugin %s. Error: %s", pluginName.c_str(), ex.what());
@@ -347,29 +355,25 @@ private:
if (plugins_[0]->isEnabled())
{
cloudMsg = plugins_[0]->filterPointCloud(*pointCloudMsg);
} else
{
NODELET_WARN("Plugin: %s is not enabled, filtering will not occur."
" Make sure to set enabled_ to true once initialization is done.",
plugins_[0]->getName().c_str());
cloudMsg = *pointCloudMsg;
}
}
else
{
cloudMsg = *pointCloudMsg;
}
if (plugins_.size() > 1)
{
for (int i = 1; i < plugins_.size(); i++) {
if (plugins_[i]->isEnabled())
if (plugins_[i]->isEnabled()) {
cloudMsg = plugins_[i]->filterPointCloud(cloudMsg);
else
NODELET_WARN("Plugin: %s is not enabled, filtering will not occur."
" Make sure to set enabled_ to true once initialization is done.",
plugins_[i]->getName().c_str());
}
}
}
} else
{
cloudMsg = *pointCloudMsg;
}
}
else
{
cloudMsg = *pointCloudMsg;
}
cv::Mat scan;
bool containNormals = false;