From af37b4b746504d13d98b7153e35faebeb6365333 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Mon, 22 Feb 2016 18:22:49 -0500 Subject: [PATCH] Disabled FAST parameters OpenCV2 related parameters in OpenCV3 --- guilib/src/PreferencesDialog.cpp | 5 + guilib/src/ui/preferencesDialog.ui | 319 +++++++++++++++-------------- 2 files changed, 169 insertions(+), 155 deletions(-) diff --git a/guilib/src/PreferencesDialog.cpp b/guilib/src/PreferencesDialog.cpp index c41a639b..990094a5 100644 --- a/guilib/src/PreferencesDialog.cpp +++ b/guilib/src/PreferencesDialog.cpp @@ -171,6 +171,11 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) : _ui->reextract_type->setItemData(6, 0, Qt::UserRole - 1); #endif } + +#if CV_MAJOR_VERSION == 3 + _ui->groupBox_fast_opencv2->setEnabled(false); +#endif + _ui->comboBox_cameraImages_gtFormat->setItemData(4, 0, Qt::UserRole - 1); if(!Optimizer::isAvailable(Optimizer::kTypeG2O)) { diff --git a/guilib/src/ui/preferencesDialog.ui b/guilib/src/ui/preferencesDialog.ui index fb1a0b37..f2f16433 100644 --- a/guilib/src/ui/preferencesDialog.ui +++ b/guilib/src/ui/preferencesDialog.ui @@ -63,7 +63,7 @@ 0 - -591 + 0 681 2010 @@ -86,7 +86,7 @@ QFrame::Raised - 16 + 23 @@ -10612,161 +10612,170 @@ Lower the ratio -> higher the precision. 0 means disabled, matching the neare - - - - - - - true - - - - - - - GPU-FAST: Use GPU version of FAST. This option is enabled only if OpenCV is built with CUDA and GPUs are detected. - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - 1.000000000000000 - - - 0.010000000000000 - - - 0.050000000000000 - - - - - - - Used with FAST GPU. - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - Grid rows (0 to disable). Adapts a detector to partition the source image into a grid and detect points in each cell. - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - 0 - - - 9999 - - - 0 - - - - - - - 0 - - - 9999 - - - 0 - - - - - - - Grid cols (0 to disable). Adapts a detector to partition the source image into a grid and detect points in each cell. - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - Minimum threshold. Used only when FAST/GridRows and FAST/GridCols are set. - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - Maximum threshold. Used only when FAST/GridRows and FAST/GridCols are set. - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - 1 - - - 9999 - - - 50 - - - - - - - 1 - - - 9999 - - - 50 - - - + + + + OpenCV 2 + + + + + + 1 + + + 9999 + + + 50 + + + + + + + Minimum threshold. Used only when FAST/GridRows and FAST/GridCols are set. + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + 1 + + + 9999 + + + 50 + + + + + + + Maximum threshold. Used only when FAST/GridRows and FAST/GridCols are set. + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + 0 + + + 9999 + + + 0 + + + + + + + Grid rows (0 to disable). Adapts a detector to partition the source image into a grid and detect points in each cell. + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + 0 + + + 9999 + + + 0 + + + + + + + Grid cols (0 to disable). Adapts a detector to partition the source image into a grid and detect points in each cell. + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + + + true + + + + + + + GPU-FAST: Use GPU version of FAST. This option is enabled only if OpenCV is built with CUDA and GPUs are detected. + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + 1.000000000000000 + + + 0.010000000000000 + + + 0.050000000000000 + + + + + + + Used with FAST GPU. + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + +