mirror of
https://github.com/introlab/rtabmap_ros.git
synced 2026-10-06 17:57:45 +08:00
MERGE branch STM 325:449 into trunk
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
@@ -24,9 +24,8 @@
|
||||
namespace rtabmap
|
||||
{
|
||||
|
||||
Parameters * Parameters::instance_ = 0;
|
||||
UDestroyer<Parameters> Parameters::destroyer_;
|
||||
ParametersMap Parameters::parameters_;
|
||||
Parameters Parameters::instance_;
|
||||
|
||||
Parameters::Parameters()
|
||||
{
|
||||
@@ -37,30 +36,10 @@ Parameters::~Parameters()
|
||||
}
|
||||
|
||||
const ParametersMap & Parameters::getDefaultParameters()
|
||||
{
|
||||
return Parameters::getInstance()->getParameters();
|
||||
}
|
||||
|
||||
Parameters * Parameters::getInstance()
|
||||
{
|
||||
if(!instance_)
|
||||
{
|
||||
instance_ = new Parameters();
|
||||
destroyer_.setDoomed(instance_);
|
||||
}
|
||||
return instance_;
|
||||
}
|
||||
|
||||
const ParametersMap & Parameters::getParameters() const
|
||||
{
|
||||
return parameters_;
|
||||
}
|
||||
|
||||
void Parameters::addParameter(const std::string & key, const std::string & value)
|
||||
{
|
||||
parameters_.insert(ParametersPair(key, value));
|
||||
}
|
||||
|
||||
std::string Parameters::getDefaultWorkingDirectory()
|
||||
{
|
||||
std::string path = UDirectory::homeDir();
|
||||
|
||||
Reference in New Issue
Block a user