summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-05-20 14:25:34 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-05-20 14:25:34 +0200
commit53288d022154e562a04b7147bff2afbe28275860 (patch)
tree4eb5b4b97018bbf1e26d6647448f3a9011f6f558
parent4b226352b3bae6514588de7e37387845d8452214 (diff)
filter/accela: use less technical language in the UI
To name position tracking "translation" per se is unusual outside of geometry and hard sciences in general. Clear things up. Reported-by: @MathijsG Closes #359
-rw-r--r--filter-accela/ftnoir_accela_filtercontrols.ui230
1 files changed, 139 insertions, 91 deletions
diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui
index 1066cd88..5cc30866 100644
--- a/filter-accela/ftnoir_accela_filtercontrols.ui
+++ b/filter-accela/ftnoir_accela_filtercontrols.ui
@@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>521</width>
- <height>317</height>
+ <width>528</width>
+ <height>367</height>
</rect>
</property>
<property name="windowTitle">
@@ -20,23 +20,46 @@
<iconset resource="../gui/ui-res.qrc">
<normaloff>:/images/filter-16.png</normaloff>:/images/filter-16.png</iconset>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="topMargin">
+ <number>5</number>
+ </property>
<item row="0" column="0">
- <widget class="QFrame" name="frame">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
+ <widget class="QGroupBox" name="groupBox66">
+ <property name="title">
+ <string>General</string>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="3">
- <widget class="QSlider" name="rotation_slider">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Smoothing</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="ewma_label">
+ <property name="text">
+ <string>0 ms</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="ewma_slider">
<property name="maximum">
- <number>99</number>
+ <number>100</number>
+ </property>
+ <property name="singleStep">
+ <number>10</number>
</property>
<property name="pageStep">
- <number>5</number>
+ <number>25</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -49,56 +72,54 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox44">
+ <property name="title">
+ <string>Rotation filtering (Yaw, pitch, and roll)</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="topMargin">
+ <number>4</number>
+ </property>
+ <property name="bottomMargin">
+ <number>4</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>9</number>
+ </property>
+ <property name="verticalSpacing">
+ <number>2</number>
+ </property>
+ <item row="0" column="0">
<widget class="QLabel" name="lblSensYaw_6">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
- <string>Rotation sensitivity</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Smoothing</string>
+ <string>Sensitivity</string>
</property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QLabel" name="ewma_label">
- <property name="minimumSize">
- <size>
- <width>48</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>0 ms</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
<widget class="QLabel" name="rot_gain">
<property name="text">
<string>0°</string>
</property>
</widget>
</item>
- <item row="0" column="3">
- <widget class="QSlider" name="ewma_slider">
+ <item row="0" column="2">
+ <widget class="QSlider" name="rotation_slider">
<property name="maximum">
- <number>100</number>
- </property>
- <property name="singleStep">
- <number>10</number>
+ <number>99</number>
</property>
<property name="pageStep">
- <number>25</number>
+ <number>5</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -111,39 +132,22 @@
</property>
</widget>
</item>
- <item row="6" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Translation deadzone</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
- <string>Rotation deadzone</string>
- </property>
- </widget>
- </item>
- <item row="4" column="3">
- <widget class="QSlider" name="rot_dz_slider">
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <string>Deadzone</string>
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="1" column="1">
<widget class="QLabel" name="rot_dz">
<property name="text">
<string>0°</string>
</property>
</widget>
</item>
- <item row="6" column="3">
- <widget class="QSlider" name="trans_dz_slider">
+ <item row="1" column="2">
+ <widget class="QSlider" name="rot_dz_slider">
<property name="maximum">
<number>100</number>
</property>
@@ -152,34 +156,48 @@
</property>
</widget>
</item>
- <item row="6" column="1">
- <widget class="QLabel" name="trans_dz">
- <property name="text">
- <string>0mm</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Position filtering (X, Y, Z - translation)</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="topMargin">
+ <number>4</number>
+ </property>
+ <property name="bottomMargin">
+ <number>4</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>9</number>
+ </property>
+ <property name="verticalSpacing">
+ <number>2</number>
+ </property>
+ <item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
- <string>Translation sensitivity</string>
+ <string>Sensitivity</string>
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="0" column="1">
<widget class="QLabel" name="trans_gain">
<property name="text">
<string>0mm</string>
</property>
</widget>
</item>
- <item row="5" column="3">
+ <item row="0" column="2">
<widget class="QSlider" name="translation_slider">
<property name="maximum">
<number>99</number>
@@ -198,23 +216,40 @@
</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">
+ <widget class="QLabel" name="trans_dz">
+ <property name="text">
+ <string>0mm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSlider" name="trans_dz_slider">
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
</layout>
+ <zorder>trans_dz_slider</zorder>
+ <zorder>translation_slider</zorder>
+ <zorder>trans_dz</zorder>
+ <zorder>label_6</zorder>
+ <zorder>trans_gain</zorder>
+ <zorder>label</zorder>
</widget>
</item>
<item row="3" column="0">
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
@@ -259,6 +294,19 @@
</property>
</widget>
</item>
+ <item row="4" column="0">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<tabstops>