mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 09:30:25 +08:00
Merge branch 'devel' of github.com:introlab/rtabmap into devel
This commit is contained in:
@@ -170,7 +170,7 @@ bool CameraModel::load(const std::string & filePath)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CameraModel::save(const std::string & filePath)
|
||||
bool CameraModel::save(const std::string & filePath) const
|
||||
{
|
||||
if(!filePath.empty() && !name_.empty() && !K_.empty() && !D_.empty() && !R_.empty() && !P_.empty())
|
||||
{
|
||||
@@ -368,7 +368,7 @@ bool StereoCameraModel::load(const std::string & directory, const std::string &
|
||||
}
|
||||
return false;
|
||||
}
|
||||
bool StereoCameraModel::save(const std::string & directory, const std::string & cameraName, bool ignoreStereoTransform)
|
||||
bool StereoCameraModel::save(const std::string & directory, const std::string & cameraName, bool ignoreStereoTransform) const
|
||||
{
|
||||
if(left_.save(directory+"/"+cameraName+"_left.yaml") && right_.save(directory+"/"+cameraName+"_right.yaml"))
|
||||
{
|
||||
|
||||
@@ -1278,9 +1278,9 @@ std::list<std::pair<int, Transform> > computePath(
|
||||
if(lookInDatabase)
|
||||
{
|
||||
// Faster to load all links in one query
|
||||
//UTimer t;
|
||||
UTimer t;
|
||||
allLinks = memory->getAllLinks(lookInDatabase);
|
||||
//UWARN("getting all %d links time = %f s", (int)allLinks.size(), t.ticks());
|
||||
UINFO("getting all %d links time = %f s", (int)allLinks.size(), t.ticks());
|
||||
}
|
||||
|
||||
//dijkstra
|
||||
|
||||
@@ -129,7 +129,7 @@ void OdometryThread::addData(const SensorData & data)
|
||||
_dataBuffer.push_back(data);
|
||||
while(_dataBufferMaxSize > 0 && _dataBuffer.size() > _dataBufferMaxSize)
|
||||
{
|
||||
ULOGGER_WARN("Data buffer is full, the oldest data is removed to add the new one.");
|
||||
UDEBUG("Data buffer is full, the oldest data is removed to add the new one.");
|
||||
_dataBuffer.pop_front();
|
||||
notify = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user