diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-02 14:03:33 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-02 14:03:33 +0200 |
| commit | 93f518264a5b46d1764d6009ce59f43934fb451c (patch) | |
| tree | 167d77d4c23206d7e65440b5268c1e1317196a05 /facetracknoir | |
| parent | fc3be69e2a53e582aee04f184636a93e27534739 (diff) | |
| parent | 4a2f89042595a5caefc1ee286b6ddca8e7714adc (diff) | |
Merge branch 'unstable' into trackhat-ui
* unstable:
pt: experimental auto threshold support
Diffstat (limited to 'facetracknoir')
| -rw-r--r-- | facetracknoir/options-dialog.cpp | 1 | ||||
| -rw-r--r-- | facetracknoir/settings.ui | 40 |
2 files changed, 28 insertions, 13 deletions
diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp index 87b7b349..a2dd1726 100644 --- a/facetracknoir/options-dialog.cpp +++ b/facetracknoir/options-dialog.cpp @@ -79,6 +79,7 @@ OptionsDialog::OptionsDialog(State& state) : state(state), trans_calib_running(f tie_setting(pt.dynamic_pose, ui.dynamic_pose); tie_setting(pt.init_phase_timeout, ui.init_phase_timeout); + tie_setting(pt.auto_threshold, ui.auto_threshold); connect(&timer,SIGNAL(timeout()), this,SLOT(poll_tracker_info())); connect( ui.tcalib_button,SIGNAL(toggled(bool)), this,SLOT(startstop_trans_calib(bool)) ); diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui index 95d8d565..34953a51 100644 --- a/facetracknoir/settings.ui +++ b/facetracknoir/settings.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>462</width> - <height>689</height> + <width>440</width> + <height>705</height> </rect> </property> <property name="windowTitle"> @@ -189,17 +189,7 @@ <enum>QFrame::Raised</enum> </property> <layout class="QGridLayout" name="gridLayout_10"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Threshold</string> - </property> - <property name="buddy"> - <cstring>threshold_slider</cstring> - </property> - </widget> - </item> - <item row="0" column="1"> + <item row="1" column="1"> <widget class="QSlider" name="threshold_slider"> <property name="toolTip"> <string>Intensity threshold for point extraction</string> @@ -224,6 +214,30 @@ </property> </widget> </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Threshold</string> + </property> + <property name="buddy"> + <cstring>threshold_slider</cstring> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_38"> + <property name="text"> + <string>Automatic threshold</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="auto_threshold"> + <property name="text"> + <string>Enable, ignore slider</string> + </property> + </widget> + </item> </layout> </widget> </item> |