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

fixed #279

Browse Source
This commit is contained in:
matlabbe
2018-10-17 11:43:38 -04:00
parent e9380ebf45
commit ead97cd1ad
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CoreNode.cpp
+3 -1
View File
@@ -50,7 +50,9 @@ int main(int argc, char** argv)
{ {
rtabmap::ParametersMap parameters = rtabmap::Parameters::getDefaultParameters(); rtabmap::ParametersMap parameters = rtabmap::Parameters::getDefaultParameters();
uInsert(parameters, rtabmap::ParametersPair(rtabmap::Parameters::kRGBDCreateOccupancyGrid(), "true")); // default true in ROS uInsert(parameters, rtabmap::ParametersPair(rtabmap::Parameters::kRGBDCreateOccupancyGrid(), "true")); // default true in ROS
uInsert(parameters, rtabmap::ParametersPair(rtabmap::Parameters::kRtabmapWorkingDirectory(), UDirectory::homeDir()+"/.ros")); // change default to ~/.ros char * rosHomePath = getenv("ROS_HOME");
std::string workingDir = rosHomePath?rosHomePath:UDirectory::homeDir()+"/.ros";
uInsert(parameters, rtabmap::ParametersPair(rtabmap::Parameters::kRtabmapWorkingDirectory(), workingDir)); // change default to ~/.ros
if(strcmp(argv[i], "--params") == 0) if(strcmp(argv[i], "--params") == 0)
{ {
src/CoreWrapper.cpp
+6 -2
View File
@@ -93,7 +93,6 @@ CoreWrapper::CoreWrapper() :
groundTruthFrameId_(""), // e.g., "world" groundTruthFrameId_(""), // e.g., "world"
groundTruthBaseFrameId_(""), // e.g., "base_link_gt" groundTruthBaseFrameId_(""), // e.g., "base_link_gt"
configPath_(""), configPath_(""),
databasePath_(UDirectory::homeDir()+"/.ros/"+rtabmap::Parameters::getDefaultDatabaseName()),
odomDefaultAngVariance_(1.0), odomDefaultAngVariance_(1.0),
odomDefaultLinVariance_(1.0), odomDefaultLinVariance_(1.0),
waitForTransform_(true), waitForTransform_(true),
@@ -117,6 +116,9 @@ CoreWrapper::CoreWrapper() :
previousStamp_(0), previousStamp_(0),
mbClient_(0) mbClient_(0)
{ {
char * rosHomePath = getenv("ROS_HOME");
std::string workingDir = rosHomePath?rosHomePath:UDirectory::homeDir()+"/.ros";
databasePath_ = workingDir+"/"+rtabmap::Parameters::getDefaultDatabaseName();
globalPose_.header.stamp = ros::Time(0); globalPose_.header.stamp = ros::Time(0);
} }
@@ -237,7 +239,9 @@ void CoreWrapper::onInit()
ParametersMap allParameters = Parameters::getDefaultParameters(); ParametersMap allParameters = Parameters::getDefaultParameters();
uInsert(allParameters, ParametersPair(Parameters::kRGBDCreateOccupancyGrid(), "true")); // default true in ROS uInsert(allParameters, ParametersPair(Parameters::kRGBDCreateOccupancyGrid(), "true")); // default true in ROS
uInsert(allParameters, ParametersPair(Parameters::kRtabmapWorkingDirectory(), UDirectory::homeDir()+"/.ros")); // change default to ~/.ros char * rosHomePath = getenv("ROS_HOME");
std::string workingDir = rosHomePath?rosHomePath:UDirectory::homeDir()+"/.ros";
uInsert(allParameters, ParametersPair(Parameters::kRtabmapWorkingDirectory(), workingDir)); // change default to ~/.ros
// load parameters // load parameters
loadParameters(configPath_, parameters_); loadParameters(configPath_, parameters_);
src/PreferencesDialogROS.cpp
+3 -1
View File
@@ -103,7 +103,9 @@ bool PreferencesDialogROS::readCoreSettings(const QString & filePath)
else else
{ {
// use default one // use default one
this->setParameter(rtabmap::Parameters::kRtabmapWorkingDirectory(), (QDir::homePath()+"/.ros").toStdString()); char * rosHomePath = getenv("ROS_HOME");
std::string workingDir = rosHomePath?rosHomePath:(QDir::homePath()+"/.ros").toStdString();
this->setParameter(rtabmap::Parameters::kRtabmapWorkingDirectory(), workingDir);
} }
settings.endGroup(); settings.endGroup();
} }