diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-12-02 09:45:20 +0100 | 
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-12-02 09:45:20 +0100 | 
| commit | e89709a801e7874bc02c66848c638c6a0ccc85c1 (patch) | |
| tree | 1635273f39e9aa06d14ec7a7c566049da77838a8 /gui | |
| parent | 2396ac190a62c30cbc687bb7c19119e1a8fd431e (diff) | |
logic: remove center_method setting
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/settings-dialog.ui | 894 | ||||
| -rw-r--r-- | gui/settings.cpp | 2 | 
2 files changed, 386 insertions, 510 deletions
| diff --git a/gui/settings-dialog.ui b/gui/settings-dialog.ui index fe5b8864..7ffff281 100644 --- a/gui/settings-dialog.ui +++ b/gui/settings-dialog.ui @@ -6,8 +6,8 @@     <rect>      <x>0</x>      <y>0</y> -    <width>588</width> -    <height>562</height> +    <width>576</width> +    <height>560</height>     </rect>    </property>    <property name="windowTitle"> @@ -36,7 +36,7 @@        </sizepolicy>       </property>       <property name="currentIndex"> -      <number>0</number> +      <number>1</number>       </property>       <property name="usesScrollButtons">        <bool>false</bool> @@ -963,351 +963,6 @@         </item>        </layout>       </widget> -     <widget class="QWidget" name="tab_3"> -      <property name="sizePolicy"> -       <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> -        <horstretch>0</horstretch> -        <verstretch>0</verstretch> -       </sizepolicy> -      </property> -      <attribute name="title"> -       <string>Camera</string> -      </attribute> -      <layout class="QVBoxLayout" name="verticalLayout_2"> -       <item> -        <widget class="QGroupBox" name="groupBox_6"> -         <property name="sizePolicy"> -          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum"> -           <horstretch>0</horstretch> -           <verstretch>0</verstretch> -          </sizepolicy> -         </property> -         <property name="title"> -          <string>Custom center pose</string> -         </property> -         <property name="alignment"> -          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> -         </property> -         <layout class="QVBoxLayout" name="verticalLayout_6"> -          <item> -           <widget class="QLabel" name="label_22"> -            <property name="text"> -             <string>Alter the centered position sent to games.</string> -            </property> -            <property name="wordWrap"> -             <bool>true</bool> -            </property> -            <property name="margin"> -             <number>2</number> -            </property> -           </widget> -          </item> -          <item> -           <widget class="QGroupBox" name="groupBox_7"> -            <property name="styleSheet"> -             <string notr="true">QGroupBox { -	border: 0; -}</string> -            </property> -            <property name="title"> -             <string/> -            </property> -            <property name="alignment"> -             <set>Qt::AlignCenter</set> -            </property> -            <property name="flat"> -             <bool>false</bool> -            </property> -            <property name="checkable"> -             <bool>false</bool> -            </property> -            <layout class="QGridLayout" name="gridLayout_3"> -             <item row="2" column="1"> -              <widget class="QDoubleSpinBox" name="pos_rz"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>0</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="suffix"> -                <string>°</string> -               </property> -               <property name="decimals"> -                <number>2</number> -               </property> -               <property name="minimum"> -                <double>-180.000000000000000</double> -               </property> -               <property name="maximum"> -                <double>180.000000000000000</double> -               </property> -              </widget> -             </item> -             <item row="2" column="3"> -              <widget class="QDoubleSpinBox" name="pos_tz"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>0</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="suffix"> -                <string> cm</string> -               </property> -               <property name="decimals"> -                <number>3</number> -               </property> -               <property name="minimum"> -                <double>-500.000000000000000</double> -               </property> -               <property name="maximum"> -                <double>500.000000000000000</double> -               </property> -              </widget> -             </item> -             <item row="0" column="2"> -              <widget class="QLabel" name="label_4"> -               <property name="text"> -                <string>X</string> -               </property> -              </widget> -             </item> -             <item row="0" column="3"> -              <widget class="QDoubleSpinBox" name="pos_tx"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>0</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="suffix"> -                <string> cm</string> -               </property> -               <property name="decimals"> -                <number>3</number> -               </property> -               <property name="minimum"> -                <double>-500.000000000000000</double> -               </property> -               <property name="maximum"> -                <double>500.000000000000000</double> -               </property> -              </widget> -             </item> -             <item row="1" column="0"> -              <widget class="QLabel" name="label"> -               <property name="text"> -                <string>Pitch</string> -               </property> -              </widget> -             </item> -             <item row="1" column="2"> -              <widget class="QLabel" name="label_5"> -               <property name="text"> -                <string>Y</string> -               </property> -              </widget> -             </item> -             <item row="1" column="1"> -              <widget class="QDoubleSpinBox" name="pos_ry"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>0</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="suffix"> -                <string>°</string> -               </property> -               <property name="decimals"> -                <number>2</number> -               </property> -               <property name="minimum"> -                <double>-180.000000000000000</double> -               </property> -               <property name="maximum"> -                <double>180.000000000000000</double> -               </property> -              </widget> -             </item> -             <item row="2" column="2"> -              <widget class="QLabel" name="label_6"> -               <property name="text"> -                <string>Z</string> -               </property> -              </widget> -             </item> -             <item row="2" column="0"> -              <widget class="QLabel" name="label_3"> -               <property name="text"> -                <string>Roll</string> -               </property> -              </widget> -             </item> -             <item row="1" column="3"> -              <widget class="QDoubleSpinBox" name="pos_ty"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>0</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="suffix"> -                <string> cm</string> -               </property> -               <property name="decimals"> -                <number>3</number> -               </property> -               <property name="minimum"> -                <double>-500.000000000000000</double> -               </property> -               <property name="maximum"> -                <double>500.000000000000000</double> -               </property> -              </widget> -             </item> -             <item row="0" column="0"> -              <widget class="QLabel" name="label_2"> -               <property name="text"> -                <string>Yaw</string> -               </property> -              </widget> -             </item> -             <item row="0" column="1"> -              <widget class="QDoubleSpinBox" name="pos_rx"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>0</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="suffix"> -                <string>°</string> -               </property> -               <property name="decimals"> -                <number>2</number> -               </property> -               <property name="minimum"> -                <double>-180.000000000000000</double> -               </property> -               <property name="maximum"> -                <double>180.000000000000000</double> -               </property> -              </widget> -             </item> -            </layout> -           </widget> -          </item> -         </layout> -        </widget> -       </item> -       <item> -        <widget class="QGroupBox" name="groupBox_9"> -         <property name="sizePolicy"> -          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum"> -           <horstretch>0</horstretch> -           <verstretch>0</verstretch> -          </sizepolicy> -         </property> -         <property name="title"> -          <string>Centering method</string> -         </property> -         <property name="alignment"> -          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> -         </property> -         <layout class="QVBoxLayout" name="verticalLayout_10"> -          <item> -           <widget class="QLabel" name="label_25"> -            <property name="sizePolicy"> -             <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> -              <horstretch>4</horstretch> -              <verstretch>0</verstretch> -             </sizepolicy> -            </property> -            <property name="text"> -             <string>Try changing this if centering doesn't perform correctly for your input device.</string> -            </property> -            <property name="wordWrap"> -             <bool>true</bool> -            </property> -           </widget> -          </item> -          <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"> -             <property name="spacing"> -              <number>0</number> -             </property> -             <property name="leftMargin"> -              <number>1</number> -             </property> -             <property name="topMargin"> -              <number>0</number> -             </property> -             <property name="rightMargin"> -              <number>1</number> -             </property> -             <property name="bottomMargin"> -              <number>0</number> -             </property> -             <item> -              <widget class="QLabel" name="label_26"> -               <property name="text"> -                <string>Method</string> -               </property> -              </widget> -             </item> -             <item> -              <widget class="QComboBox" name="center_method"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> -                 <horstretch>0</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <item> -                <property name="text"> -                 <string>Relative (inertial device)</string> -                </property> -               </item> -               <item> -                <property name="text"> -                 <string>Absolute (camera device)</string> -                </property> -               </item> -              </widget> -             </item> -            </layout> -           </widget> -          </item> -         </layout> -        </widget> -       </item> -       <item> -        <spacer name="verticalSpacer_3"> -         <property name="orientation"> -          <enum>Qt::Vertical</enum> -         </property> -         <property name="sizeType"> -          <enum>QSizePolicy::Expanding</enum> -         </property> -         <property name="sizeHint" stdset="0"> -          <size> -           <width>20</width> -           <height>0</height> -          </size> -         </property> -        </spacer> -       </item> -      </layout> -     </widget>       <widget class="QWidget" name="tab_4">        <property name="sizePolicy">         <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> @@ -1378,16 +1033,61 @@               <property name="verticalSpacing">                <number>9</number>               </property> -             <item row="7" column="2"> -              <widget class="QCheckBox" name="invert_y"> +             <item row="7" column="1"> +              <widget class="QComboBox" name="src_y"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> +                 <horstretch>0</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <item> +                <property name="text"> +                 <string>X</string> +                </property> +               </item> +               <item> +                <property name="text"> +                 <string>Y</string> +                </property> +               </item> +               <item> +                <property name="text"> +                 <string>Z</string> +                </property> +               </item> +               <item> +                <property name="text"> +                 <string>Yaw</string> +                </property> +               </item> +               <item> +                <property name="text"> +                 <string>Pitch</string> +                </property> +               </item> +               <item> +                <property name="text"> +                 <string>Roll</string> +                </property> +               </item> +               <item> +                <property name="text"> +                 <string>Disabled</string> +                </property> +               </item> +              </widget> +             </item> +             <item row="6" column="0"> +              <widget class="QLabel" name="label_10">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>255</horstretch> +                 <horstretch>254</horstretch>                   <verstretch>0</verstretch>                  </sizepolicy>                 </property>                 <property name="text"> -                <string/> +                <string>X</string>                 </property>                </widget>               </item> @@ -1404,21 +1104,34 @@                 </property>                </widget>               </item> -             <item row="6" column="0"> -              <widget class="QLabel" name="label_10"> +             <item row="7" column="2"> +              <widget class="QCheckBox" name="invert_y">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>254</horstretch> +                 <horstretch>255</horstretch>                   <verstretch>0</verstretch>                  </sizepolicy>                 </property>                 <property name="text"> -                <string>X</string> +                <string/>                 </property>                </widget>               </item> -             <item row="0" column="2"> -              <widget class="QLabel" name="label_14"> +             <item row="4" column="2"> +              <widget class="QCheckBox" name="invert_pitch"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>255</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="text"> +                <string/> +               </property> +              </widget> +             </item> +             <item row="3" column="0"> +              <widget class="QLabel" name="label_7">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum">                   <horstretch>254</horstretch> @@ -1426,57 +1139,25 @@                  </sizepolicy>                 </property>                 <property name="text"> -                <string>Invert</string> +                <string>Yaw</string>                 </property>                </widget>               </item> -             <item row="6" column="1"> -              <widget class="QComboBox" name="src_x"> +             <item row="6" column="2"> +              <widget class="QCheckBox" name="invert_x">                 <property name="sizePolicy"> -                <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> -                 <horstretch>0</horstretch> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>255</horstretch>                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> -               <item> -                <property name="text"> -                 <string>X</string> -                </property> -               </item> -               <item> -                <property name="text"> -                 <string>Y</string> -                </property> -               </item> -               <item> -                <property name="text"> -                 <string>Z</string> -                </property> -               </item> -               <item> -                <property name="text"> -                 <string>Yaw</string> -                </property> -               </item> -               <item> -                <property name="text"> -                 <string>Pitch</string> -                </property> -               </item> -               <item> -                <property name="text"> -                 <string>Roll</string> -                </property> -               </item> -               <item> -                <property name="text"> -                 <string>Disabled</string> -                </property> -               </item> +               <property name="text"> +                <string/> +               </property>                </widget>               </item> -             <item row="4" column="0"> -              <widget class="QLabel" name="label_8"> +             <item row="0" column="1"> +              <widget class="QLabel" name="label_13">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum">                   <horstretch>254</horstretch> @@ -1484,12 +1165,12 @@                  </sizepolicy>                 </property>                 <property name="text"> -                <string>Pitch</string> +                <string>Source</string>                 </property>                </widget>               </item> -             <item row="7" column="1"> -              <widget class="QComboBox" name="src_y"> +             <item row="5" column="1"> +              <widget class="QComboBox" name="src_roll">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Preferred" vsizetype="Maximum">                   <horstretch>0</horstretch> @@ -1533,8 +1214,21 @@                 </item>                </widget>               </item> -             <item row="3" column="1"> -              <widget class="QComboBox" name="src_yaw"> +             <item row="3" column="2"> +              <widget class="QCheckBox" name="invert_yaw"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>255</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="text"> +                <string/> +               </property> +              </widget> +             </item> +             <item row="4" column="1"> +              <widget class="QComboBox" name="src_pitch">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Preferred" vsizetype="Maximum">                   <horstretch>0</horstretch> @@ -1578,60 +1272,8 @@                 </item>                </widget>               </item> -             <item row="5" column="2"> -              <widget class="QCheckBox" name="invert_roll"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>255</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="text"> -                <string/> -               </property> -              </widget> -             </item> -             <item row="7" column="0"> -              <widget class="QLabel" name="label_11"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>254</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="text"> -                <string>Y</string> -               </property> -              </widget> -             </item> -             <item row="0" column="0"> -              <widget class="QLabel" name="label_15"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>254</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="text"> -                <string>Destination</string> -               </property> -              </widget> -             </item> -             <item row="4" column="2"> -              <widget class="QCheckBox" name="invert_pitch"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>255</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="text"> -                <string/> -               </property> -              </widget> -             </item> -             <item row="3" column="0"> -              <widget class="QLabel" name="label_7"> +             <item row="8" column="0"> +              <widget class="QLabel" name="label_12">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum">                   <horstretch>254</horstretch> @@ -1639,12 +1281,12 @@                  </sizepolicy>                 </property>                 <property name="text"> -                <string>Yaw</string> +                <string>Z</string>                 </property>                </widget>               </item> -             <item row="6" column="2"> -              <widget class="QCheckBox" name="invert_x"> +             <item row="8" column="2"> +              <widget class="QCheckBox" name="invert_z">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum">                   <horstretch>255</horstretch> @@ -1656,21 +1298,8 @@                 </property>                </widget>               </item> -             <item row="0" column="1"> -              <widget class="QLabel" name="label_13"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>254</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="text"> -                <string>Source</string> -               </property> -              </widget> -             </item> -             <item row="4" column="1"> -              <widget class="QComboBox" name="src_pitch"> +             <item row="8" column="1"> +              <widget class="QComboBox" name="src_z">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Preferred" vsizetype="Maximum">                   <horstretch>0</horstretch> @@ -1714,21 +1343,8 @@                 </item>                </widget>               </item> -             <item row="3" column="2"> -              <widget class="QCheckBox" name="invert_yaw"> -               <property name="sizePolicy"> -                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>255</horstretch> -                 <verstretch>0</verstretch> -                </sizepolicy> -               </property> -               <property name="text"> -                <string/> -               </property> -              </widget> -             </item> -             <item row="5" column="1"> -              <widget class="QComboBox" name="src_roll"> +             <item row="3" column="1"> +              <widget class="QComboBox" name="src_yaw">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Preferred" vsizetype="Maximum">                   <horstretch>0</horstretch> @@ -1772,8 +1388,21 @@                 </item>                </widget>               </item> -             <item row="8" column="0"> -              <widget class="QLabel" name="label_12"> +             <item row="5" column="2"> +              <widget class="QCheckBox" name="invert_roll"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>255</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="text"> +                <string/> +               </property> +              </widget> +             </item> +             <item row="0" column="2"> +              <widget class="QLabel" name="label_14">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum">                   <horstretch>254</horstretch> @@ -1781,12 +1410,12 @@                  </sizepolicy>                 </property>                 <property name="text"> -                <string>Z</string> +                <string>Invert</string>                 </property>                </widget>               </item> -             <item row="8" column="1"> -              <widget class="QComboBox" name="src_z"> +             <item row="6" column="1"> +              <widget class="QComboBox" name="src_x">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Preferred" vsizetype="Maximum">                   <horstretch>0</horstretch> @@ -1830,16 +1459,42 @@                 </item>                </widget>               </item> -             <item row="8" column="2"> -              <widget class="QCheckBox" name="invert_z"> +             <item row="0" column="0"> +              <widget class="QLabel" name="label_15">                 <property name="sizePolicy">                  <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> -                 <horstretch>255</horstretch> +                 <horstretch>254</horstretch>                   <verstretch>0</verstretch>                  </sizepolicy>                 </property>                 <property name="text"> -                <string/> +                <string>Destination</string> +               </property> +              </widget> +             </item> +             <item row="7" column="0"> +              <widget class="QLabel" name="label_11"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>254</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="text"> +                <string>Y</string> +               </property> +              </widget> +             </item> +             <item row="4" column="0"> +              <widget class="QLabel" name="label_8"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>254</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="text"> +                <string>Pitch</string>                 </property>                </widget>               </item> @@ -1883,13 +1538,241 @@           </layout>          </widget>         </item> +       <item alignment="Qt::AlignTop"> +        <widget class="QGroupBox" name="groupBox_6"> +         <property name="sizePolicy"> +          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum"> +           <horstretch>0</horstretch> +           <verstretch>0</verstretch> +          </sizepolicy> +         </property> +         <property name="title"> +          <string>Custom center pose</string> +         </property> +         <property name="alignment"> +          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> +         </property> +         <layout class="QVBoxLayout" name="verticalLayout_6"> +          <item> +           <widget class="QLabel" name="label_22"> +            <property name="text"> +             <string>Alter the centered position sent to games. Useful if the default position is too much downward or upward.</string> +            </property> +            <property name="wordWrap"> +             <bool>true</bool> +            </property> +            <property name="margin"> +             <number>2</number> +            </property> +           </widget> +          </item> +          <item> +           <widget class="QGroupBox" name="groupBox_7"> +            <property name="styleSheet"> +             <string notr="true">QGroupBox { +	border: 0; +}</string> +            </property> +            <property name="title"> +             <string/> +            </property> +            <property name="alignment"> +             <set>Qt::AlignCenter</set> +            </property> +            <property name="flat"> +             <bool>false</bool> +            </property> +            <property name="checkable"> +             <bool>false</bool> +            </property> +            <layout class="QGridLayout" name="gridLayout_3"> +             <item row="2" column="1"> +              <widget class="QDoubleSpinBox" name="pos_rz"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>0</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="suffix"> +                <string>°</string> +               </property> +               <property name="decimals"> +                <number>2</number> +               </property> +               <property name="minimum"> +                <double>-180.000000000000000</double> +               </property> +               <property name="maximum"> +                <double>180.000000000000000</double> +               </property> +              </widget> +             </item> +             <item row="2" column="3"> +              <widget class="QDoubleSpinBox" name="pos_tz"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>0</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="suffix"> +                <string> cm</string> +               </property> +               <property name="decimals"> +                <number>3</number> +               </property> +               <property name="minimum"> +                <double>-500.000000000000000</double> +               </property> +               <property name="maximum"> +                <double>500.000000000000000</double> +               </property> +              </widget> +             </item> +             <item row="0" column="2"> +              <widget class="QLabel" name="label_4"> +               <property name="text"> +                <string>X</string> +               </property> +              </widget> +             </item> +             <item row="0" column="3"> +              <widget class="QDoubleSpinBox" name="pos_tx"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>0</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="suffix"> +                <string> cm</string> +               </property> +               <property name="decimals"> +                <number>3</number> +               </property> +               <property name="minimum"> +                <double>-500.000000000000000</double> +               </property> +               <property name="maximum"> +                <double>500.000000000000000</double> +               </property> +              </widget> +             </item> +             <item row="1" column="0"> +              <widget class="QLabel" name="label"> +               <property name="text"> +                <string>Pitch</string> +               </property> +              </widget> +             </item> +             <item row="1" column="2"> +              <widget class="QLabel" name="label_5"> +               <property name="text"> +                <string>Y</string> +               </property> +              </widget> +             </item> +             <item row="1" column="1"> +              <widget class="QDoubleSpinBox" name="pos_ry"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>0</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="suffix"> +                <string>°</string> +               </property> +               <property name="decimals"> +                <number>2</number> +               </property> +               <property name="minimum"> +                <double>-180.000000000000000</double> +               </property> +               <property name="maximum"> +                <double>180.000000000000000</double> +               </property> +              </widget> +             </item> +             <item row="2" column="2"> +              <widget class="QLabel" name="label_6"> +               <property name="text"> +                <string>Z</string> +               </property> +              </widget> +             </item> +             <item row="2" column="0"> +              <widget class="QLabel" name="label_3"> +               <property name="text"> +                <string>Roll</string> +               </property> +              </widget> +             </item> +             <item row="1" column="3"> +              <widget class="QDoubleSpinBox" name="pos_ty"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>0</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="suffix"> +                <string> cm</string> +               </property> +               <property name="decimals"> +                <number>3</number> +               </property> +               <property name="minimum"> +                <double>-500.000000000000000</double> +               </property> +               <property name="maximum"> +                <double>500.000000000000000</double> +               </property> +              </widget> +             </item> +             <item row="0" column="0"> +              <widget class="QLabel" name="label_2"> +               <property name="text"> +                <string>Yaw</string> +               </property> +              </widget> +             </item> +             <item row="0" column="1"> +              <widget class="QDoubleSpinBox" name="pos_rx"> +               <property name="sizePolicy"> +                <sizepolicy hsizetype="Minimum" vsizetype="Maximum"> +                 <horstretch>0</horstretch> +                 <verstretch>0</verstretch> +                </sizepolicy> +               </property> +               <property name="suffix"> +                <string>°</string> +               </property> +               <property name="decimals"> +                <number>2</number> +               </property> +               <property name="minimum"> +                <double>-180.000000000000000</double> +               </property> +               <property name="maximum"> +                <double>180.000000000000000</double> +               </property> +              </widget> +             </item> +            </layout> +           </widget> +          </item> +         </layout> +        </widget> +       </item>         <item>          <spacer name="verticalSpacer">           <property name="orientation">            <enum>Qt::Vertical</enum>           </property>           <property name="sizeType"> -          <enum>QSizePolicy::Expanding</enum> +          <enum>QSizePolicy::Minimum</enum>           </property>           <property name="sizeHint" stdset="0">            <size> @@ -2348,13 +2231,6 @@    <tabstop>disable_translation</tabstop>    <tabstop>trayp</tabstop>    <tabstop>tray_start</tabstop> -  <tabstop>pos_rx</tabstop> -  <tabstop>pos_ry</tabstop> -  <tabstop>pos_rz</tabstop> -  <tabstop>pos_tx</tabstop> -  <tabstop>pos_ty</tabstop> -  <tabstop>pos_tz</tabstop> -  <tabstop>center_method</tabstop>    <tabstop>src_yaw</tabstop>    <tabstop>invert_yaw</tabstop>    <tabstop>src_pitch</tabstop> diff --git a/gui/settings.cpp b/gui/settings.cpp index 3105bad9..33d9b5cf 100644 --- a/gui/settings.cpp +++ b/gui/settings.cpp @@ -85,7 +85,7 @@ OptionsDialog::OptionsDialog(std::function<void(bool)> pause_keybindings) :      tie_setting(main.a_y.src, ui.src_y);      tie_setting(main.a_z.src, ui.src_z); -    tie_setting(main.center_method, ui.center_method); +    //tie_setting(main.center_method, ui.center_method);      tie_setting(main.tracklogging_enabled, ui.tracklogging_enabled); | 
