Added screenshots for ProcessADataSet tutorial.

Updated default parameter "RawDataKept" in database to true.
Fixed a bug of showing rejected loop closure image in GUI when RawDataKept=false and the loop closure id is not set (only highestHypothesisId when the loop is rejected).

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@211 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2011-06-21 18:32:23 +00:00
parent fb48cce623
commit f7cf230c87
11 changed files with 11 additions and 11 deletions

View File

@@ -141,7 +141,7 @@ class RTABMAP_EXP Parameters
// Memory // Memory
RTABMAP_PARAM(Mem, SimilarityThr, float, 0.20); // Similarity between the last signature and neighbor RTABMAP_PARAM(Mem, SimilarityThr, float, 0.20); // Similarity between the last signature and neighbor
RTABMAP_PARAM(Mem, SimilarityOnlyLast, bool, false); // Only compare to the last signature in STM, otherwise it compares to all signatures in STM RTABMAP_PARAM(Mem, SimilarityOnlyLast, bool, false); // Only compare to the last signature in STM, otherwise it compares to all signatures in STM
RTABMAP_PARAM(Mem, RawDataKept, bool, false); // Keep raw data RTABMAP_PARAM(Mem, RawDataKept, bool, true); // Keep raw data
RTABMAP_PARAM(Mem, MaxStMemSize, unsigned int, 25); // Short-time memory size RTABMAP_PARAM(Mem, MaxStMemSize, unsigned int, 25); // Short-time memory size
RTABMAP_PARAM(Mem, CommonSignatureUsed, bool, true); // A common signature/virtual place is automatically updated with id -1 RTABMAP_PARAM(Mem, CommonSignatureUsed, bool, true); // A common signature/virtual place is automatically updated with id -1
RTABMAP_PARAM(Mem, IncrementalMemory, bool, true); RTABMAP_PARAM(Mem, IncrementalMemory, bool, true);

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

View File

@@ -425,11 +425,14 @@ void MainWindow::processStats(const rtabmap::Statistics & stat)
if(stat.loopClosureId()>0 || highestHypothesisId>0) if(stat.loopClosureId()>0 || highestHypothesisId>0)
{ {
int id = stat.loopClosureId()>0?stat.loopClosureId():highestHypothesisId; int id = stat.loopClosureId()>0?stat.loopClosureId():highestHypothesisId;
QByteArray ba; if(!_imagesMap.contains(id))
QBuffer buffer(&ba); {
buffer.open(QIODevice::WriteOnly); QByteArray ba;
lcImg.save(&buffer, "JPEG"); // writes image into JPEG format QBuffer buffer(&ba);
_imagesMap.insert(id, ba); buffer.open(QIODevice::WriteOnly);
lcImg.save(&buffer, "JPEG"); // writes image into JPEG format
_imagesMap.insert(id, ba);
}
} }
} }
} }
@@ -475,7 +478,8 @@ void MainWindow::processStats(const rtabmap::Statistics & stat)
{ {
if(lcImg.isNull()) if(lcImg.isNull())
{ {
QMap<int, QByteArray>::iterator iter = _imagesMap.find(stat.loopClosureId()); int id = stat.loopClosureId()>0?stat.loopClosureId():highestHypothesisId;
QMap<int, QByteArray>::iterator iter = _imagesMap.find(id);
if(iter != _imagesMap.end()) if(iter != _imagesMap.end())
{ {
if(!lcImg.loadFromData(iter.value(), "JPEG")) if(!lcImg.loadFromData(iter.value(), "JPEG"))
@@ -484,10 +488,6 @@ void MainWindow::processStats(const rtabmap::Statistics & stat)
lcImg = QImage(); lcImg = QImage();
} }
} }
else if(stat.loopClosureImage())
{
lcImg = Ipl2QImage(stat.loopClosureImage());
}
} }
if(!lcImg.isNull()) if(!lcImg.isNull())