fixed delete database action when memory is not yet initialized, enabled gpu SURF option when available

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1055 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-12-14 02:43:26 +00:00
parent a3c0158650
commit 4a150e3215
7 changed files with 73 additions and 64 deletions

View File

@@ -49,6 +49,8 @@
#include <rtabmap/utilite/UEventsManager.h>
#include "utilite/UPlot.h"
#include <opencv2/gpu/gpu.hpp>
using namespace rtabmap;
namespace rtabmap {
@@ -115,6 +117,14 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
_ui->label_space2->setEnabled(false);
_ui->label_space3->setEnabled(false);
_ui->loopClosure_icpType->setEnabled(false);
_ui->surf_checkBox_gpuVersion->setEnabled(false);
_ui->label_surf_checkBox_gpuVersion->setEnabled(false);
#else
if(cv::gpu::getCudaEnabledDeviceCount() == 0)
{
_ui->surf_checkBox_gpuVersion->setEnabled(false);
_ui->label_surf_checkBox_gpuVersion->setEnabled(false);
}
#endif
_ui->predictionPlot->showLegend(false);
@@ -824,6 +834,11 @@ QString PreferencesDialog::getWorkingDirectory() const
return _ui->lineEdit_workingDirectory->text();
}
QString PreferencesDialog::getDatabasePath() const
{
return _ui->lineEdit_databasePath->text();
}
QString PreferencesDialog::getIniFilePath() const
{
#ifdef DEMO_BUILD