rtabmap-pkg: PreferencesDialogROS, read all parameters even if some are not defined

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/ros-pkg@784 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-01-29 18:01:25 +00:00
parent e64f5a291f
commit 9c585fc4bc
+4 -3
View File
@@ -44,6 +44,7 @@ bool PreferencesDialogROS::readCoreSettings(const QString & filePath)
ros::NodeHandle nh("rtabmap");
ROS_INFO("%s", this->getParamMessage().toStdString().c_str());
bool validParameters = true;
int readCount = 0;
rtabmap::ParametersMap parameters = rtabmap::Parameters::getDefaultParameters();
for(rtabmap::ParametersMap::iterator i=parameters.begin(); i!=parameters.end(); ++i)
{
@@ -51,21 +52,22 @@ bool PreferencesDialogROS::readCoreSettings(const QString & filePath)
if(nh.getParam((*i).first,value))
{
PreferencesDialog::setParameter((*i).first, value);
++readCount;
}
else
{
validParameters = false;
break;
}
}
ROS_INFO("Parameters read = %d", readCount);
if(validParameters)
{
ROS_INFO("Parameters successfully read.");
}
else
{
validParameters = false;
if(this->isVisible())
{
QString warning = tr("Failed to get some RTAB-Map parameters from ROS server, the rtabmap node may be not started or some parameters won't work...");
@@ -94,7 +96,6 @@ void PreferencesDialogROS::writeSettings(const QString & filePath)
if(_parameters.size())
{
emit settingsChanged(_parameters);
}
if(_obsoletePanels)