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

Merge branch 'master' of github.com:introlab/rtabmap_ros into ros2

Browse Source
This commit is contained in:
matlabbe
2026-01-31 12:14:05 -08:00
parent 8fbf9f7385 9c003ccae5
commit 9d41d998fd
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtabmap_slam/src/CoreWrapper.cpp
+32 -14
View File
@@ -3356,18 +3356,27 @@ void CoreWrapper::loadDatabaseCallback(
// Close old database // Close old database
RCLCPP_INFO(get_logger(), "LoadDatabase: Saving current map (%s)...", databasePath_.c_str()); RCLCPP_INFO(get_logger(), "LoadDatabase: Saving current map (%s)...", databasePath_.c_str());
bool saveDatabase = true;
if(rtabmap_.getMemory()) if(rtabmap_.getMemory())
{ {
// save the grid map if(!rtabmap_.getMemory()->isReadOnly())
float xMin=0.0f, yMin=0.0f, gridCellSize = 0.05f;
cv::Mat pixels = mapsManager_.getGridMap(xMin, yMin, gridCellSize);
if(!pixels.empty())
{ {
printf("rtabmap: 2D occupancy grid map saved.\n"); // save the grid map
rtabmap_.getMemory()->save2DMap(pixels, xMin, yMin, gridCellSize); float xMin=0.0f, yMin=0.0f, gridCellSize = 0.05f;
cv::Mat pixels = mapsManager_.getGridMap(xMin, yMin, gridCellSize);
if(!pixels.empty())
{
printf("rtabmap: 2D occupancy grid map saved.\n");
rtabmap_.getMemory()->save2DMap(pixels, xMin, yMin, gridCellSize);
}
}
else
{
printf("rtabmap: Database is read-only, the current state of the memory is not saved.\n");
saveDatabase = false;
} }
} }
rtabmap_.close(); rtabmap_.close(saveDatabase);
RCLCPP_INFO(get_logger(), "LoadDatabase: Saving current map (%s, %ld MB)... done!", databasePath_.c_str(), UFile::length(databasePath_)/(1024*1024)); RCLCPP_INFO(get_logger(), "LoadDatabase: Saving current map (%s, %ld MB)... done!", databasePath_.c_str(), UFile::length(databasePath_)/(1024*1024));
lastPoseMutex_.lock(); lastPoseMutex_.lock();
@@ -3512,18 +3521,27 @@ void CoreWrapper::backupDatabaseCallback(
std::shared_ptr<std_srvs::srv::Empty::Response>) std::shared_ptr<std_srvs::srv::Empty::Response>)
{ {
RCLCPP_INFO(this->get_logger(), "Backup: Saving memory..."); RCLCPP_INFO(this->get_logger(), "Backup: Saving memory...");
bool saveDatabase = true;
if(rtabmap_.getMemory()) if(rtabmap_.getMemory())
{ {
// save the grid map if(!rtabmap_.getMemory()->isReadOnly())
float xMin=0.0f, yMin=0.0f, gridCellSize = 0.05f;
cv::Mat pixels = mapsManager_.getGridMap(xMin, yMin, gridCellSize);
if(!pixels.empty())
{ {
printf("rtabmap: 2D occupancy grid map saved.\n"); // save the grid map
rtabmap_.getMemory()->save2DMap(pixels, xMin, yMin, gridCellSize); float xMin=0.0f, yMin=0.0f, gridCellSize = 0.05f;
cv::Mat pixels = mapsManager_.getGridMap(xMin, yMin, gridCellSize);
if(!pixels.empty())
{
printf("rtabmap: 2D occupancy grid map saved.\n");
rtabmap_.getMemory()->save2DMap(pixels, xMin, yMin, gridCellSize);
}
}
else
{
printf("rtabmap: Database is read-only, the current state of the memory is not saved.\n");
saveDatabase = false;
} }
} }
rtabmap_.close(); rtabmap_.close(saveDatabase);
RCLCPP_INFO(this->get_logger(), "Backup: Saving memory... done!"); RCLCPP_INFO(this->get_logger(), "Backup: Saving memory... done!");
lastPoseMutex_.lock(); lastPoseMutex_.lock();