summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-07-31 10:25:58 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-07-31 10:25:58 +0200
commit743a79a3fcf3e6a9676146654127e6ee29715a1c (patch)
tree93765b8cab0540b27e2f66cb5a6929154260d9a0
parent30f65d15688a3ba02689b8a4e7fccd8baaaf82e9 (diff)
filter/accela: reduce rotation nonlinearity range to 1->1.75
-rw-r--r--filter-accela/ftnoir_accela_filtercontrols.ui10
-rw-r--r--filter-accela/ftnoir_filter_accela.h5
2 files changed, 11 insertions, 4 deletions
diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui
index 86ca57b1..2b568913 100644
--- a/filter-accela/ftnoir_accela_filtercontrols.ui
+++ b/filter-accela/ftnoir_accela_filtercontrols.ui
@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>558</width>
- <height>411</height>
+ <height>421</height>
</rect>
</property>
<property name="windowTitle">
@@ -345,8 +345,14 @@
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="2">
<widget class="QSlider" name="rot_nl_slider">
+ <property name="minimum">
+ <number>0</number>
+ </property>
<property name="maximum">
- <number>134</number>
+ <number>75</number>
+ </property>
+ <property name="value">
+ <number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h
index 69db54cd..3f504767 100644
--- a/filter-accela/ftnoir_filter_accela.h
+++ b/filter-accela/ftnoir_filter_accela.h
@@ -16,7 +16,8 @@
using namespace options;
#include "opentrack-compat/timer.hpp"
-struct settings_accela : opts {
+struct settings_accela : opts
+{
value<int> rot_threshold, trans_threshold, ewma, rot_deadzone, trans_deadzone;
value<slider_value> rot_nonlinearity;
static constexpr double mult_rot = 4. / 100.;
@@ -32,7 +33,7 @@ struct settings_accela : opts {
ewma(b, "ewma", 2),
rot_deadzone(b, "rotation-deadzone", 0),
trans_deadzone(b, "translation-deadzone", 0),
- rot_nonlinearity(b, "rotation-nonlinearity", slider_value(1., .66, 2))
+ rot_nonlinearity(b, "rotation-nonlinearity", slider_value(1.1, 1, 1.75))
{}
};