Merged pcl_integration branch to trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1014 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-12-11 00:12:44 +00:00
parent 97c70d394e
commit 8b8511e154
124 changed files with 21692 additions and 4458 deletions

View File

@@ -21,6 +21,7 @@
#include "rtabmap/core/Rtabmap.h"
#include "ui_aboutDialog.h"
#include <opencv2/core/version.hpp>
#include <pcl/pcl_config.h>
namespace rtabmap {
@@ -29,8 +30,13 @@ AboutDialog::AboutDialog(QWidget * parent) :
{
_ui = new Ui_aboutDialog();
_ui->setupUi(this);
_ui->label_version->setText(Rtabmap::getVersion().c_str());
QString version = Rtabmap::getVersion().c_str();
#if DEMO_BUILD
version.append(" [DEMO]");
#endif
_ui->label_version->setText(version);
_ui->label_opencv_version->setText(CV_VERSION);
_ui->label_pcl_version->setText(PCL_VERSION_PRETTY);
}
AboutDialog::~AboutDialog()