merged master to velodyne

This commit is contained in:
matlabbe
2015-11-26 13:37:37 -05:00
3 changed files with 18 additions and 8 deletions

View File

@@ -773,6 +773,8 @@ void MainWindow::processOdometry(const rtabmap::OdometryEvent & odom)
if(_ui->dockWidget_cloudViewer->isVisible())
{
bool cloudUpdated = false;
bool scanUpdated = false;
if(!pose.isNull())
{
// 3d cloud
@@ -798,11 +800,8 @@ void MainWindow::processOdometry(const rtabmap::OdometryEvent & odom)
_ui->widget_cloudViewer->setCloudVisibility("cloudOdom", true);
_ui->widget_cloudViewer->setCloudOpacity("cloudOdom", _preferencesDialog->getCloudOpacity(1));
_ui->widget_cloudViewer->setCloudPointSize("cloudOdom", _preferencesDialog->getCloudPointSize(1));
}
else
{
UWARN("Empty cloudOdom!");
_ui->widget_cloudViewer->setCloudVisibility("cloudOdom", false);
cloudUpdated = true;
}
}
@@ -827,8 +826,18 @@ void MainWindow::processOdometry(const rtabmap::OdometryEvent & odom)
_ui->widget_cloudViewer->setCloudVisibility("scanOdom", true);
_ui->widget_cloudViewer->setCloudOpacity("scanOdom", _preferencesDialog->getScanOpacity(1));
_ui->widget_cloudViewer->setCloudPointSize("scanOdom", _preferencesDialog->getScanPointSize(1));
scanUpdated = true;
}
}
if(!cloudUpdated && _ui->widget_cloudViewer->getAddedClouds().contains("cloudOdom"))
{
_ui->widget_cloudViewer->setCloudVisibility("cloudOdom", false);
}
if(!scanUpdated && _ui->widget_cloudViewer->getAddedClouds().contains("scanOdom"))
{
_ui->widget_cloudViewer->setCloudVisibility("scanOdom", false);
}
}
if(!odom.pose().isNull())