diff options
| -rw-r--r-- | filter-accela/accela-settings.hpp | 6 | ||||
| -rw-r--r-- | filter-accela/ftnoir_accela_filtercontrols.ui | 298 |
2 files changed, 152 insertions, 152 deletions
diff --git a/filter-accela/accela-settings.hpp b/filter-accela/accela-settings.hpp index e132e66a..b012fc07 100644 --- a/filter-accela/accela-settings.hpp +++ b/filter-accela/accela-settings.hpp @@ -51,9 +51,9 @@ struct settings_accela : opts settings_accela() : opts("accela-sliders"), 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)), + trans_sensitivity(b, "translation-sensitivity", slider_value(1., .05, 1.5)), + rot_deadzone(b, "rotation-deadzone", slider_value(.03, 0, 2)), + trans_deadzone(b, "translation-deadzone", slider_value(.1, 0, 1)), ewma(b, "ewma", slider_value(0, 0, 30)), rot_nonlinearity(b, "rotation-nonlinearity", slider_value(1.05, 1, 1.5)) {} diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui index eaccf95d..5509bd3f 100644 --- a/filter-accela/ftnoir_accela_filtercontrols.ui +++ b/filter-accela/ftnoir_accela_filtercontrols.ui @@ -30,64 +30,6 @@ <property name="topMargin"> <number>5</number> </property> - <item row="4" column="0"> - <widget class="QLabel" name="label_9"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font"> - <font> - <pointsize>7</pointsize> - </font> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="text"> - <string><html><head/><body><p align="right"><br/><span style=" font-size:10pt;">Accela by </span><a href="https://github.com/sthalik"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Stanisław Halik</span></a><span style=" font-size:10pt;"><br/>Thanks to </span><a href="https://github.com/dbaarda"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Donovan Baarda</span></a></p><p align="right"><span style=" font-size:10pt;">2012-2015</span></p><p align="right"><br/><span style=" font-size:8pt;">Visit </span><a href="https://github.com/opentrack/opentrack/wiki/Accela-in-opentrack-2.3"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">our wiki</span></a><span style=" font-size:8pt;"> for description of the settings.</span></p></body></html></string> - </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> - </property> - <property name="scaledContents"> - <bool>false</bool> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="indent"> - <number>0</number> - </property> - <property name="openExternalLinks"> - <bool>true</bool> - </property> - <property name="textInteractionFlags"> - <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> - </property> - </widget> - </item> - <item row="5" 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="0" column="0"> <widget class="QGroupBox" name="groupBox66"> <property name="title"> @@ -145,12 +87,12 @@ </layout> </widget> </item> - <item row="1" column="0"> - <widget class="QGroupBox" name="groupBox44"> + <item row="2" column="0"> + <widget class="QGroupBox" name="groupBox_2"> <property name="title"> - <string>Rotation filtering (Yaw, pitch, and roll)</string> + <string>Position filtering (X, Y, Z - translation)</string> </property> - <layout class="QGridLayout" name="gridLayout"> + <layout class="QGridLayout" name="gridLayout_2"> <property name="topMargin"> <number>4</number> </property> @@ -164,7 +106,7 @@ <number>2</number> </property> <item row="0" column="0"> - <widget class="QLabel" name="lblSensYaw_6"> + <widget class="QLabel" name="label"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -177,7 +119,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLabel" name="rot_gain"> + <widget class="QLabel" name="trans_gain"> <property name="minimumSize"> <size> <width>50</width> @@ -185,41 +127,28 @@ </size> </property> <property name="text"> - <string>0°</string> + <string>0mm</string> </property> </widget> </item> - <item row="0" column="2"> - <widget class="QSlider" name="rotation_slider"> + <item row="1" column="2"> + <widget class="QSlider" name="trans_dz_slider"> <property name="minimum"> <number>0</number> </property> <property name="maximum"> - <number>495</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>50</number> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Deadzone</string> - </property> </widget> </item> <item row="1" column="1"> - <widget class="QLabel" name="rot_dz"> + <widget class="QLabel" name="trans_dz"> <property name="minimumSize"> <size> <width>50</width> @@ -227,35 +156,54 @@ </size> </property> <property name="text"> - <string>0°</string> + <string>0mm</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QSlider" name="rot_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>200</number> + <number>145</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> + <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="2" column="0"> - <widget class="QGroupBox" name="groupBox_2"> + <item row="1" column="0"> + <widget class="QGroupBox" name="groupBox44"> <property name="title"> - <string>Position filtering (X, Y, Z - translation)</string> + <string>Rotation filtering (Yaw, pitch, and roll)</string> </property> - <layout class="QGridLayout" name="gridLayout_2"> + <layout class="QGridLayout" name="gridLayout"> <property name="topMargin"> <number>4</number> </property> @@ -269,7 +217,7 @@ <number>2</number> </property> <item row="0" column="0"> - <widget class="QLabel" name="label"> + <widget class="QLabel" name="lblSensYaw_6"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -282,7 +230,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLabel" name="trans_gain"> + <widget class="QLabel" name="rot_gain"> <property name="minimumSize"> <size> <width>50</width> @@ -290,28 +238,41 @@ </size> </property> <property name="text"> - <string>0mm</string> + <string>0°</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QSlider" name="trans_dz_slider"> + <item row="0" column="2"> + <widget class="QSlider" name="rotation_slider"> <property name="minimum"> <number>0</number> </property> <property name="maximum"> - <number>100</number> + <number>495</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>50</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Deadzone</string> + </property> </widget> </item> <item row="1" column="1"> - <widget class="QLabel" name="trans_dz"> + <widget class="QLabel" name="rot_dz"> <property name="minimumSize"> <size> <width>50</width> @@ -319,46 +280,27 @@ </size> </property> <property name="text"> - <string>0mm</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>Deadzone</string> + <string>0°</string> </property> </widget> </item> - <item row="0" column="2"> - <widget class="QSlider" name="translation_slider"> + <item row="1" column="2"> + <widget class="QSlider" name="rot_dz_slider"> <property name="minimum"> <number>0</number> </property> <property name="maximum"> - <number>395</number> + <number>200</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>40</number> - </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"> @@ -367,31 +309,6 @@ <string>Rotation nonlinearity</string> </property> <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>20</number> - </property> - <property name="pageStep"> - <number>2</number> - </property> - <property name="value"> - <number>1</number> - </property> - <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"> <widget class="QLabel" name="rot_nl"> <property name="minimumSize"> @@ -417,9 +334,92 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QSlider" name="rot_nl_slider"> + <property name="minimum"> + <number>0</number> + </property> + <property name="maximum"> + <number>20</number> + </property> + <property name="pageStep"> + <number>2</number> + </property> + <property name="value"> + <number>1</number> + </property> + <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> </layout> </widget> </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_9"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>7</pointsize> + </font> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="text"> + <string><html><head/><body><p align="right"><br/><span style=" font-size:10pt;">Accela by </span><a href="https://github.com/sthalik"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Stanisław Halik</span></a><span style=" font-size:10pt;"><br/>Thanks to </span><a href="https://github.com/dbaarda"><span style=" font-size:10pt; text-decoration: underline; color:#0057ae;">Donovan Baarda</span></a></p><p align="right"><span style=" font-size:10pt;">2012-2015</span></p><p align="right"><br/><span style=" font-size:8pt;">Visit </span><a href="https://github.com/opentrack/opentrack/wiki/Accela-in-opentrack-2.3"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">our wiki</span></a><span style=" font-size:8pt;"> for description of the settings.</span></p></body></html></string> + </property> + <property name="textFormat"> + <enum>Qt::RichText</enum> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="indent"> + <number>0</number> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="5" 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> |