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

DBViewer: fixed disabled show/hide map option while map is available

Browse Source
This commit is contained in:
matlabbe
2017-07-12 21:26:14 -04:00
parent 78bdd4a087
commit c833af1ae6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guilib/src/DatabaseViewer.cpp
View File

@@ -4090,7 +4090,7 @@ void DatabaseViewer::sliderIterationsValueChanged(int value)
++iter; ++iter;
} }
} }
UINFO("Update local maps list... done"); UINFO("Update local maps list... done (%d local maps, graph size=%d)", (int)localMaps.size(), (int)graph.size());
} }
ui_->graphViewer->updateGTGraph(groundTruthPoses_); ui_->graphViewer->updateGTGraph(groundTruthPoses_);
@@ -4098,7 +4098,7 @@ void DatabaseViewer::sliderIterationsValueChanged(int value)
ui_->graphViewer->clearMap(); ui_->graphViewer->clearMap();
occupancyGridViewer_->clear(); occupancyGridViewer_->clear();
if(graph.size() && localMaps.size() && if(graph.size() && localMaps.size() &&
(ui_->graphViewer->isGridMapVisible() || ui_->dockWidget_occupancyGridView->isVisible())) (ui_->dockWidget_graphView->isVisible() || ui_->dockWidget_occupancyGridView->isVisible()))
{ {
QTime time; QTime time;
time.start(); time.start();
@@ -4129,7 +4129,7 @@ void DatabaseViewer::sliderIterationsValueChanged(int value)
#endif #endif
// Generate 2d grid map? // Generate 2d grid map?
if((ui_->dockWidget_graphView->isVisible() && ui_->graphViewer->isGridMapVisible()) || if(ui_->dockWidget_graphView->isVisible() ||
(ui_->dockWidget_occupancyGridView->isVisible() && ui_->checkBox_grid_2d->isChecked())) (ui_->dockWidget_occupancyGridView->isVisible() && ui_->checkBox_grid_2d->isChecked()))
{ {
float xMin, yMin; float xMin, yMin;
@@ -4152,7 +4152,7 @@ void DatabaseViewer::sliderIterationsValueChanged(int value)
if(!map.empty()) if(!map.empty())
{ {
cv::Mat map8U = rtabmap::util3d::convertMap2Image8U(map); cv::Mat map8U = rtabmap::util3d::convertMap2Image8U(map);
if(ui_->dockWidget_graphView->isVisible() && ui_->graphViewer->isGridMapVisible()) if(ui_->dockWidget_graphView->isVisible())
{ {
ui_->graphViewer->updateMap(map8U, cell, xMin, yMin); ui_->graphViewer->updateMap(map8U, cell, xMin, yMin);
} }

8
guilib/src/GraphViewer.cpp
View File

@@ -1176,19 +1176,19 @@ void GraphViewer::setMaxLinkLength(float value)
} }
void GraphViewer::setGraphVisible(bool visible) void GraphViewer::setGraphVisible(bool visible)
{ {
_graphRoot->setVisible(!_graphRoot->isVisible()); _graphRoot->setVisible(visible);
} }
void GraphViewer::setGlobalPathVisible(bool visible) void GraphViewer::setGlobalPathVisible(bool visible)
{ {
_globalPathRoot->setVisible(!_globalPathRoot->isVisible()); _globalPathRoot->setVisible(visible);
} }
void GraphViewer::setLocalPathVisible(bool visible) void GraphViewer::setLocalPathVisible(bool visible)
{ {
_localPathRoot->setVisible(!_localPathRoot->isVisible()); _localPathRoot->setVisible(visible);
} }
void GraphViewer::setGtGraphVisible(bool visible) void GraphViewer::setGtGraphVisible(bool visible)
{ {
_gtGraphRoot->setVisible(!_gtGraphRoot->isVisible()); _gtGraphRoot->setVisible(visible);
} }
void GraphViewer::restoreDefaults() void GraphViewer::restoreDefaults()