This commit is contained in:
matlabbe
2020-03-01 16:59:46 -05:00
parent dceec711e0
commit cb80d85dd6
2 changed files with 1 additions and 38 deletions

View File

@@ -110,8 +110,7 @@ DatabaseViewer::DatabaseViewer(const QString & ini, QWidget * parent) :
iniFilePath_(ini),
infoReducedGraph_(false),
infoTotalOdom_(0.0),
infoSessions_(0),
useLastOptimizedGraphAsGuess_(false)
infoSessions_(0)
{
pathDatabase_ = QDir::homePath()+"/Documents/RTAB-Map"; //use home directory by default
@@ -1100,9 +1099,6 @@ bool DatabaseViewer::closeDatabase()
stereoViewer_->update();
ui_->toolBox_statistics->clear();
useLastOptimizedGraphAsGuess_ = false;
lastOptimizedGraph_.clear();
}
ui_->actionClose_database->setEnabled(dbDriver_ != 0);
@@ -1588,7 +1584,6 @@ void DatabaseViewer::updateIds()
weights_.clear();
wmStates_.clear();
odomPoses_.clear();
dbOptimizedPoses_.clear();
groundTruthPoses_.clear();
gpsPoses_.clear();
gpsValues_.clear();
@@ -1779,8 +1774,6 @@ void DatabaseViewer::updateIds()
uSleep(100);
QApplication::processEvents();
dbOptimizedPoses_ = dbDriver_->loadOptimizedPoses();
if(!groundTruthPoses_.empty() || !gpsPoses_.empty())
{
ui_->checkBox_alignPosesWithGroundTruth->setVisible(true);
@@ -6277,16 +6270,6 @@ void DatabaseViewer::updateGraphView()
.arg(odomPoses_.begin()->first)
.arg(odomPoses_.rbegin()->first));
return;
}
std::map<int, Transform> optimizedGraphGuess;
if(graphes_.size() && useLastOptimizedGraphAsGuess_)
{
optimizedGraphGuess = lastOptimizedGraph_;
}
else
{
optimizedGraphGuess = dbOptimizedPoses_;
}
graphes_.clear();
@@ -6516,22 +6499,6 @@ void DatabaseViewer::updateGraphView()
fromId,
poses,
links,
posesOut,
linksOut);
if(optimizedGraphGuess.size() == posesOut.size())
{
bool identical=true;
for(std::map<int, Transform>::iterator iter=posesOut.begin(); iter!=posesOut.end(); ++iter)
{
if(!uContains(optimizedGraphGuess, iter->first))
{
identical = false;
break;
}
}
if(identical)
{
posesOut = optimizedGraphGuess;
posesOut,
linksOut);
UINFO("Connected graph of %d poses and %d links", (int)posesOut.size(), (int)linksOut.size());