removed not used Odom rosparam set by rtabmap node

This commit is contained in:
matlabbe
2018-10-17 13:01:14 -04:00
parent ead97cd1ad
commit 1cb8ec38c9
2 changed files with 35 additions and 0 deletions
+23
View File
@@ -238,6 +238,18 @@ void CoreWrapper::onInit()
}
ParametersMap allParameters = Parameters::getDefaultParameters();
// remove Odom parameters
for(ParametersMap::iterator iter=allParameters.begin(); iter!=allParameters.end();)
{
if(iter->first.find("Odom") == 0)
{
allParameters.erase(iter++);
}
else
{
++iter;
}
}
uInsert(allParameters, ParametersPair(Parameters::kRGBDCreateOccupancyGrid(), "true")); // default true in ROS
char * rosHomePath = getenv("ROS_HOME");
std::string workingDir = rosHomePath?rosHomePath:UDirectory::homeDir()+"/.ros";
@@ -245,6 +257,17 @@ void CoreWrapper::onInit()
// load parameters
loadParameters(configPath_, parameters_);
for(ParametersMap::iterator iter=parameters_.begin(); iter!=parameters_.end();)
{
if(iter->first.find("Odom") == 0)
{
parameters_.erase(iter++);
}
else
{
++iter;
}
}
// update parameters with user input parameters (private)
for(ParametersMap::iterator iter=allParameters.begin(); iter!=allParameters.end(); ++iter)
+12
View File
@@ -88,6 +88,18 @@ bool PreferencesDialogROS::readCoreSettings(const QString & filePath)
bool validParameters = true;
int readCount = 0;
rtabmap::ParametersMap parameters = rtabmap::Parameters::getDefaultParameters();
// remove Odom parameters
for(ParametersMap::iterator iter=parameters.begin(); iter!=parameters.end();)
{
if(iter->first.find("Odom") == 0)
{
parameters.erase(iter++);
}
else
{
++iter;
}
}
for(rtabmap::ParametersMap::iterator i=parameters.begin(); i!=parameters.end(); ++i)
{
if(i->first.compare(rtabmap::Parameters::kRtabmapWorkingDirectory()) == 0)