i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-10-08 11:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed https://github.com/introlab/rtabmap_ros/issues/1187

Browse Source
This commit is contained in:
matlabbe
2024-07-27 12:12:49 -07:00
parent 9ef94f5a71
commit cc5da376ec
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
corelib/src/Memory.cpp
+20 -8
View File
@@ -4546,7 +4546,7 @@ Signature * Memory::createSignature(const SensorData & inputData, const Transfor
float t; float t;
std::vector<cv::KeyPoint> keypoints; std::vector<cv::KeyPoint> keypoints;
cv::Mat descriptors; cv::Mat descriptors;
bool isIntermediateNode = data.id() < 0 || (data.imageRaw().empty() && data.keypoints().empty() && data.laserScanRaw().empty()); bool isIntermediateNode = data.id() < 0;
int id = data.id(); int id = data.id();
if(_generateIds) if(_generateIds)
{ {
@@ -5492,7 +5492,12 @@ Signature * Memory::createSignature(const SensorData & inputData, const Transfor
} }
Landmarks landmarks = data.landmarks(); Landmarks landmarks = data.landmarks();
if(_detectMarkers && !isIntermediateNode && !data.imageRaw().empty()) if(!landmarks.empty() && isIntermediateNode)
{
UDEBUG("Landmarks provided (size=%ld) are ignored because this signature is set as intermediate.", landmarks.size());
landmarks.clear();
}
else if(_detectMarkers && !isIntermediateNode && !data.imageRaw().empty())
{ {
UDEBUG("Detecting markers..."); UDEBUG("Detecting markers...");
if(landmarks.empty()) if(landmarks.empty())
@@ -5982,16 +5987,23 @@ Signature * Memory::createSignature(const SensorData & inputData, const Transfor
s->sensorData().setGPS(data.gps()); s->sensorData().setGPS(data.gps());
s->sensorData().setEnvSensors(data.envSensors()); s->sensorData().setEnvSensors(data.envSensors());
std::vector<GlobalDescriptor> globalDescriptors = data.globalDescriptors(); if(!isIntermediateNode)
if(_globalDescriptorExtractor)
{ {
GlobalDescriptor gdescriptor = _globalDescriptorExtractor->extract(inputData); std::vector<GlobalDescriptor> globalDescriptors = data.globalDescriptors();
if(!gdescriptor.data().empty()) if(_globalDescriptorExtractor)
{ {
globalDescriptors.push_back(gdescriptor); GlobalDescriptor gdescriptor = _globalDescriptorExtractor->extract(inputData);
if(!gdescriptor.data().empty())
{
globalDescriptors.push_back(gdescriptor);
}
} }
s->sensorData().setGlobalDescriptors(globalDescriptors);
}
else if(!data.globalDescriptors().empty())
{
UDEBUG("Global descriptors provided (size=%ld) are ignored because this signature is set as intermediate.", data.globalDescriptors().size());
} }
s->sensorData().setGlobalDescriptors(globalDescriptors);
t = timer.ticks(); t = timer.ticks();
if(stats) stats->addStatistic(Statistics::kTimingMemCompressing_data(), t*1000.0f); if(stats) stats->addStatistic(Statistics::kTimingMemCompressing_data(), t*1000.0f);