diff options
| -rw-r--r-- | filter-accela/accela-settings.hpp | 4 | ||||
| -rw-r--r-- | filter-accela/ftnoir_accela_filtercontrols.ui | 126 | 
2 files changed, 82 insertions, 48 deletions
| diff --git a/filter-accela/accela-settings.hpp b/filter-accela/accela-settings.hpp index b012fc07..2ecd8bbc 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, 5)), +        rot_sensitivity(b, "rotation-sensitivity", slider_value(1.5, .05, 5)),          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)) +        rot_nonlinearity(b, "rotation-nonlinearity", slider_value(1.2, 1, 1.5))      {}  }; diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui index 4ed91099..4649bcd6 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>412</height> +    <height>435</height>     </rect>    </property>    <property name="sizePolicy"> @@ -308,55 +308,89 @@       <property name="title">        <string>Rotation nonlinearity</string>       </property> -     <layout class="QGridLayout" name="gridLayout_4"> -      <item row="0" column="1"> -       <widget class="QLabel" name="rot_nl"> -        <property name="minimumSize"> -         <size> -          <width>50</width> -          <height>0</height> -         </size> -        </property> -        <property name="font"> -         <font> -          <pointsize>12</pointsize> -         </font> -        </property> -        <property name="text"> -         <string><html><head/><body><p>x<span style=" vertical-align:super;">2</span></p></body></html></string> -        </property> -       </widget> -      </item> -      <item row="0" column="0"> -       <widget class="QLabel" name="label_3"> +     <layout class="QVBoxLayout" name="verticalLayout"> +      <item> +       <widget class="QLabel" name="label_5">          <property name="text"> -         <string>Value</string> +         <string>Setting it higher will filter out rotation noise but may cause sudden jumps on very high settings.</string>          </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> +      <item> +       <widget class="QFrame" name="frame"> +        <property name="frameShape"> +         <enum>QFrame::NoFrame</enum> +        </property> +        <property name="frameShadow"> +         <enum>QFrame::Raised</enum> +        </property> +        <layout class="QHBoxLayout" name="horizontalLayout_2"> +         <property name="spacing"> +          <number>6</number> +         </property> +         <property name="leftMargin"> +          <number>0</number> +         </property> +         <property name="topMargin"> +          <number>0</number> +         </property> +         <property name="rightMargin"> +          <number>0</number> +         </property> +         <property name="bottomMargin"> +          <number>0</number> +         </property> +         <item> +          <widget class="QLabel" name="label_3"> +           <property name="text"> +            <string>Value</string> +           </property> +          </widget> +         </item> +         <item> +          <widget class="QLabel" name="rot_nl"> +           <property name="minimumSize"> +            <size> +             <width>50</width> +             <height>0</height> +            </size> +           </property> +           <property name="font"> +            <font> +             <pointsize>12</pointsize> +            </font> +           </property> +           <property name="text"> +            <string><html><head/><body><p>x<span style=" vertical-align:super;">2</span></p></body></html></string> +           </property> +          </widget> +         </item> +         <item> +          <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>       </layout> | 
