From 537c5e0c082ba969ab9fc83a0104fbd90e3c7ce6 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 26 Apr 2022 18:37:55 +0200 Subject: tracker/pt: make dialog less tall --- tracker-pt/FTNoIR_PT_Controls.ui | 418 +++++++++++++++++++++------------------ tracker-pt/lang/nl_NL.ts | 4 + tracker-pt/lang/ru_RU.ts | 4 + tracker-pt/lang/stub.ts | 4 + tracker-pt/lang/zh_CN.ts | 4 + 5 files changed, 237 insertions(+), 197 deletions(-) diff --git a/tracker-pt/FTNoIR_PT_Controls.ui b/tracker-pt/FTNoIR_PT_Controls.ui index 7abfe088..4cf4344c 100644 --- a/tracker-pt/FTNoIR_PT_Controls.ui +++ b/tracker-pt/FTNoIR_PT_Controls.ui @@ -10,7 +10,7 @@ 0 0 413 - 683 + 575 @@ -647,198 +647,6 @@ - - - - Point filter - - - - - - - 0 - 0 - - - - 0 - - - 99 - - - 1 - - - 10 - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 1.000000000000000 - - - - - - - - 10 - 0 - - - - 0 - - - 400 - - - 1 - - - 10 - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Filter point centers prior to pose estimation. - - - Enable - - - - - - - Limit - - - - - - - - 2 - 0 - - - - Qt::NoFocus - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 999.990000000000009 - - - - - - - Deadzone - - - - - - - - 0 - 0 - - - - 0 - - - 100 - - - 1 - - - 3 - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - px - - - 1.000000000000000 - - - - - - @@ -1568,6 +1376,218 @@ Don't roll or change position. + + + Filter + + + + + + Point filter + + + + + + + 0 + 0 + + + + 0 + + + 99 + + + 1 + + + 10 + + + Qt::Horizontal + + + + + + + + 2 + 0 + + + + Qt::NoFocus + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999.990000000000009 + + + + + + + Limit + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + px + + + 1.000000000000000 + + + + + + + + 10 + 0 + + + + 0 + + + 400 + + + 1 + + + 10 + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + 0 + + + 100 + + + 1 + + + 3 + + + Qt::Horizontal + + + + + + + Deadzone + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + Filter point centers prior to pose estimation. + + + Enable + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + About @@ -1701,10 +1721,6 @@ Don't roll or change position. threshold_slider mindiam_spin maxdiam_spin - enable_point_filter - point_filter_slider - point_filter_limit_slider - point_filter_deadzone_slider model_tabs clip_tlength_spin clip_theight_spin @@ -1723,6 +1739,14 @@ Don't roll or change position. ty_spin tz_spin tcalib_button + enable_point_filter + point_filter_slider + point_filter_limit_slider + point_filter_deadzone_slider + maxdiam_spin + mindiam_spin + auto_threshold + threshold_slider diff --git a/tracker-pt/lang/nl_NL.ts b/tracker-pt/lang/nl_NL.ts index 368b97a0..90383b97 100644 --- a/tracker-pt/lang/nl_NL.ts +++ b/tracker-pt/lang/nl_NL.ts @@ -300,6 +300,10 @@ Don't roll or change position. Deadzone + + Filter + + pt_impl::TrackerDialog_PT diff --git a/tracker-pt/lang/ru_RU.ts b/tracker-pt/lang/ru_RU.ts index 43dca4cf..b7146449 100644 --- a/tracker-pt/lang/ru_RU.ts +++ b/tracker-pt/lang/ru_RU.ts @@ -305,6 +305,10 @@ ROLL или X/Y-смещения. Deadzone + + Filter + + pt_impl::TrackerDialog_PT diff --git a/tracker-pt/lang/stub.ts b/tracker-pt/lang/stub.ts index 9cb5daa7..3d5e9ae7 100644 --- a/tracker-pt/lang/stub.ts +++ b/tracker-pt/lang/stub.ts @@ -300,6 +300,10 @@ Don't roll or change position. Deadzone + + Filter + + pt_impl::TrackerDialog_PT diff --git a/tracker-pt/lang/zh_CN.ts b/tracker-pt/lang/zh_CN.ts index 668672c1..d8aff4b5 100644 --- a/tracker-pt/lang/zh_CN.ts +++ b/tracker-pt/lang/zh_CN.ts @@ -300,6 +300,10 @@ Don't roll or change position. Deadzone + + Filter + + pt_impl::TrackerDialog_PT -- cgit v1.2.3 From c084d8672c63bacc572eab1c6c28bee6d176b763 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 26 Apr 2022 18:39:41 +0200 Subject: tracker/kinect: fix ir camera provider --- tracker-kinect-face/camera_kinect_ir.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tracker-kinect-face/camera_kinect_ir.cpp b/tracker-kinect-face/camera_kinect_ir.cpp index e1ef2208..3a33fd14 100644 --- a/tracker-kinect-face/camera_kinect_ir.cpp +++ b/tracker-kinect-face/camera_kinect_ir.cpp @@ -48,7 +48,12 @@ namespace Kinect { std::vector CamerasProvider::camera_names() const { - if (camera_name_to_index("Kinect V2 Video Sensor") != -1) + auto list = get_camera_names(); + auto it = std::find_if(list.cbegin(), list.cend(), [](const auto& x) { + const auto& [name, idx] = x; + return name.startsWith("Kinect V2 Video Sensor ["); + }); + if (it != list.cend()) { // We found Kinect V2 Video Sensor therefore we have a kinect V2 connected. // Publish our Kinect V2 IR Sensor implementation then. -- cgit v1.2.3