i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-12 06:20:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed empty global map on ros (regression from #1698) (#1709)

Browse Source
This commit is contained in:
matlabbe
2026-05-23 13:36:15 -07:00
committed by GitHub
parent a9146f5be6
commit 49aa566613
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
corelib/include/rtabmap/core/Memory.h
+1 -1
View File
@@ -144,7 +144,7 @@ public:
void deleteLocation(int locationId, std::list<int> * deletedWords = 0);
void saveLocationData(int locationId);
void removeLink(int idA, int idB);
void removeRawData(int id, bool image = true, bool scan = true, bool userData = true);
void removeRawData(int id, bool image = true, bool scan = true, bool userData = true, bool occupancyGrid = true);
int reduceNode(int id, float maxDistance = 0.0f, bool keepLinkedInDb = false, int direction = 0);
//getters
corelib/src/Memory.cpp
+3 -2
View File
@@ -3176,7 +3176,7 @@ void Memory::removeLink(int oldId, int newId)
}
}
void Memory::removeRawData(int id, bool image, bool scan, bool userData)
void Memory::removeRawData(int id, bool image, bool scan, bool userData, bool occupancyGrid)
{
UDEBUG("id=%d image=%d scan=%d userData=%d", id, image?1:0, scan?1:0, userData?1:0);
Signature * s = this->_getSignature(id);
@@ -3185,7 +3185,8 @@ void Memory::removeRawData(int id, bool image, bool scan, bool userData)
s->sensorData().clearRawData(
image && (!_reextractLoopClosureFeatures || !_registrationPipeline->isImageRequired()),
scan && !_registrationPipeline->isScanRequired(),
userData && !_registrationPipeline->isUserDataRequired());
userData && !_registrationPipeline->isUserDataRequired(),
occupancyGrid);
}
}
corelib/src/Rtabmap.cpp
+1 -1
View File
@@ -4423,7 +4423,7 @@ bool Rtabmap::process(
}
if(!_rawDataKept)
{
_memory->removeRawData(signature->id(), true, !_neighborLinkRefining && !_proximityBySpace, true);
_memory->removeRawData(signature->id(), true, !_neighborLinkRefining && !_proximityBySpace, true, false);
}
// Localization mode and saving localization data: save odometry covariance in a prior link
corelib/src/SensorData.cpp
+16
View File
@@ -997,6 +997,14 @@ void SensorData::clearCompressedData(bool images, bool scan, bool userData, bool
_groundCellsCompressed=cv::Mat();
_emptyCellsCompressed=cv::Mat();
_obstacleCellsCompressed=cv::Mat();
if( _groundCellsCompressed.empty() && _groundCellsRaw.empty() &&
_obstacleCellsCompressed.empty() && _obstacleCellsRaw.empty() &&
_emptyCellsCompressed.empty() && _emptyCellsRaw.empty())
{
_cellSize = 0.0f;
_viewPoint = cv::Point3f();
}
}
}
void SensorData::clearRawData(bool images, bool scan, bool userData, bool occupancyGrid)
@@ -1024,6 +1032,14 @@ void SensorData::clearRawData(bool images, bool scan, bool userData, bool occupa
_groundCellsRaw=cv::Mat();
_emptyCellsRaw=cv::Mat();
_obstacleCellsRaw=cv::Mat();
if( _groundCellsCompressed.empty() && _groundCellsRaw.empty() &&
_obstacleCellsCompressed.empty() && _obstacleCellsRaw.empty() &&
_emptyCellsCompressed.empty() && _emptyCellsRaw.empty())
{
_cellSize = 0.0f;
_viewPoint = cv::Point3f();
}
}
}