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

rviz MapCloud: Fixed Download graph action not calling the right service.

Browse Source
This commit is contained in:
matlabbe
2017-06-01 13:20:10 -04:00
parent ba7c4c50ca
commit af7f0b3b2b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rviz/MapCloudDisplay.cpp
+10 -10
View File
@@ -499,12 +499,12 @@ void MapCloudDisplay::downloadMap()
{ {
ROS_ERROR("MapCloudDisplay: Can't call \"%s\" service. " ROS_ERROR("MapCloudDisplay: Can't call \"%s\" service. "
"Tip: if rtabmap node is not in rtabmap namespace, you can remap the service " "Tip: if rtabmap node is not in rtabmap namespace, you can remap the service "
"to \"get_map\" in the launch " "to \"get_map_data\" in the launch "
"file like: <remap from=\"rtabmap/get_map_data\" to=\"get_map_data\"/>.", "file like: <remap from=\"rtabmap/get_map_data\" to=\"get_map_data\"/>.",
nh.resolveName("rtabmap/get_map_data").c_str()); nh.resolveName("rtabmap/get_map_data").c_str());
messageBox->setText(tr("MapCloudDisplay: Can't call \"%1\" service. " messageBox->setText(tr("MapCloudDisplay: Can't call \"%1\" service. "
"Tip: if rtabmap node is not in rtabmap namespace, you can remap the service " "Tip: if rtabmap node is not in rtabmap namespace, you can remap the service "
"to \"get_map\" in the launch " "to \"get_map_data\" in the launch "
"file like: <remap from=\"rtabmap/get_map_data\" to=\"get_map_data\"/>."). "file like: <remap from=\"rtabmap/get_map_data\" to=\"get_map_data\"/>.").
arg(nh.resolveName("rtabmap/get_map_data").c_str())); arg(nh.resolveName("rtabmap/get_map_data").c_str()));
} }
@@ -545,7 +545,7 @@ void MapCloudDisplay::downloadGraph()
ros::NodeHandle nh; ros::NodeHandle nh;
QMessageBox * messageBox = new QMessageBox( QMessageBox * messageBox = new QMessageBox(
QMessageBox::NoIcon, QMessageBox::NoIcon,
tr("Calling \"%1\" service...").arg(nh.resolveName("rtabmap/get_map").c_str()), tr("Calling \"%1\" service...").arg(nh.resolveName("rtabmap/get_map_data").c_str()),
tr("Downloading the graph... please wait (rviz could become gray!)"), tr("Downloading the graph... please wait (rviz could become gray!)"),
QMessageBox::NoButton); QMessageBox::NoButton);
messageBox->setAttribute(Qt::WA_DeleteOnClose, true); messageBox->setAttribute(Qt::WA_DeleteOnClose, true);
@@ -553,18 +553,18 @@ void MapCloudDisplay::downloadGraph()
QApplication::processEvents(); QApplication::processEvents();
uSleep(100); // hack make sure the text in the QMessageBox is shown... uSleep(100); // hack make sure the text in the QMessageBox is shown...
QApplication::processEvents(); QApplication::processEvents();
if(!ros::service::call("rtabmap/get_map", getMapSrv)) if(!ros::service::call("rtabmap/get_map_data", getMapSrv))
{ {
ROS_ERROR("MapCloudDisplay: Can't call \"%s\" service. " ROS_ERROR("MapCloudDisplay: Can't call \"%s\" service. "
"Tip: if rtabmap node is not in rtabmap namespace, you can remap the service " "Tip: if rtabmap node is not in rtabmap namespace, you can remap the service "
"to \"get_map\" in the launch " "to \"get_map_data\" in the launch "
"file like: <remap from=\"rtabmap/get_map\" to=\"get_map\"/>.", "file like: <remap from=\"rtabmap/get_map_data\" to=\"get_map_data\"/>.",
nh.resolveName("rtabmap/get_map").c_str()); nh.resolveName("rtabmap/get_map_data").c_str());
messageBox->setText(tr("MapCloudDisplay: Can't call \"%1\" service. " messageBox->setText(tr("MapCloudDisplay: Can't call \"%1\" service. "
"Tip: if rtabmap node is not in rtabmap namespace, you can remap the service " "Tip: if rtabmap node is not in rtabmap namespace, you can remap the service "
"to \"get_map\" in the launch " "to \"get_map_data\" in the launch "
"file like: <remap from=\"rtabmap/get_map\" to=\"get_map\"/>."). "file like: <remap from=\"rtabmap/get_map_data\" to=\"get_map_data\"/>.").
arg(nh.resolveName("rtabmap/get_map").c_str())); arg(nh.resolveName("rtabmap/get_map_data").c_str()));
} }
else else
{ {