summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--filter-accela/accela-settings.hpp12
-rw-r--r--filter-accela/ftnoir_accela_filtercontrols.ui62
2 files changed, 40 insertions, 34 deletions
diff --git a/filter-accela/accela-settings.hpp b/filter-accela/accela-settings.hpp
index 9f0af413..27089199 100644
--- a/filter-accela/accela-settings.hpp
+++ b/filter-accela/accela-settings.hpp
@@ -50,11 +50,11 @@ struct settings_accela : opts
value<slider_value> rot_nonlinearity;
settings_accela() :
opts("accela-sliders"),
- rot_sensitivity(b, "rotation-sensitivity", slider_value(1.8, .05, 3)),
- trans_sensitivity(b, "translation-sensitivity", slider_value(1.8, .05, 3)),
- rot_deadzone(b, "rotation-deadzone", slider_value(0, 0, .5)),
- trans_deadzone(b, "translation-deadzone", slider_value(0, 0, .5)),
- ewma(b, "ewma", slider_value(0, 0, 15)),
- rot_nonlinearity(b, "rotation-nonlinearity", slider_value(1, 1, 1.75))
+ rot_sensitivity(b, "rotation-sensitivity", slider_value(1.8, .05, 5)),
+ trans_sensitivity(b, "translation-sensitivity", slider_value(1.8, .05, 4)),
+ rot_deadzone(b, "rotation-deadzone", slider_value(0, 0, 2)),
+ trans_deadzone(b, "translation-deadzone", slider_value(0, 0, 1)),
+ ewma(b, "ewma", slider_value(0, 0, 30)),
+ rot_nonlinearity(b, "rotation-nonlinearity", slider_value(1, 1, 2))
{}
};
diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui
index 246a9ba0..42ff24d9 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>550</width>
- <height>408</height>
+ <height>412</height>
</rect>
</property>
<property name="sizePolicy">
@@ -126,7 +126,7 @@
<number>0</number>
</property>
<property name="maximum">
- <number>30</number>
+ <number>60</number>
</property>
<property name="pageStep">
<number>3</number>
@@ -138,7 +138,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
- <number>25</number>
+ <number>5</number>
</property>
</widget>
</item>
@@ -195,7 +195,7 @@
<number>0</number>
</property>
<property name="maximum">
- <number>295</number>
+ <number>495</number>
</property>
<property name="pageStep">
<number>15</number>
@@ -207,7 +207,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
- <number>25</number>
+ <number>50</number>
</property>
</widget>
</item>
@@ -237,7 +237,7 @@
<number>0</number>
</property>
<property name="maximum">
- <number>50</number>
+ <number>200</number>
</property>
<property name="pageStep">
<number>5</number>
@@ -294,33 +294,20 @@
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QSlider" name="translation_slider">
+ <item row="1" column="2">
+ <widget class="QSlider" name="trans_dz_slider">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
- <number>295</number>
+ <number>100</number>
</property>
<property name="pageStep">
- <number>15</number>
+ <number>5</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="tickPosition">
- <enum>QSlider::TicksAbove</enum>
- </property>
- <property name="tickInterval">
- <number>25</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Deadzone</string>
- </property>
</widget>
</item>
<item row="1" column="1">
@@ -336,20 +323,33 @@
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QSlider" name="trans_dz_slider">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Deadzone</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QSlider" name="translation_slider">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
- <number>50</number>
+ <number>395</number>
</property>
<property name="pageStep">
- <number>5</number>
+ <number>15</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ <property name="tickInterval">
+ <number>40</number>
+ </property>
</widget>
</item>
</layout>
@@ -373,7 +373,7 @@
<number>0</number>
</property>
<property name="maximum">
- <number>15</number>
+ <number>20</number>
</property>
<property name="pageStep">
<number>2</number>
@@ -384,6 +384,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksAbove</enum>
+ </property>
+ <property name="tickInterval">
+ <number>3</number>
+ </property>
</widget>
</item>
<item row="0" column="1">