Merge branch 'unstable' into trackhat-ui

1 files changed, 129 insertions, 95 deletions

diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui
index efe1568a..b41c09a0 100644
--- a/facetracknoir/settings.ui
+++ b/facetracknoir/settings.ui
@@ -297,20 +297,7 @@
        <string>Camera</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_9">
-       <item row="4" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QGroupBox" name="groupBox_6">
          <property name="title">
           <string>Point extraction</string>
@@ -424,6 +411,124 @@
          </layout>
         </widget>
        </item>
+       <item row="4" column="0">
+        <widget class="QGroupBox" name="groupBox_11">
+         <property name="title">
+          <string>Status</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QLabel" name="caminfo_label">
+            <property name="text">
+             <string>Not running</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="pointinfo_label">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox_9">
+         <property name="title">
+          <string>Device</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_32">
+            <property name="text">
+             <string>Dynamic pose resolution</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QCheckBox" name="dynamic_pose">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="camera_mode">
+            <item>
+             <property name="text">
+              <string>640x480, 75 Hz</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>640x480, 60 Hz</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>320x240, 189 Hz</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>320x240, 120 Hz</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_25">
+            <property name="text">
+             <string>Mode</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="camera_fov">
+            <item>
+             <property name="text">
+              <string>56°</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>75°</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Field of view</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_33">
+            <property name="text">
+             <string>Dynamic pose timeout</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QSpinBox" name="init_phase_timeout">
+            <property name="suffix">
+             <string> ms</string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>10000</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_5">
          <property name="title">
@@ -530,89 +635,18 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox_9">
-         <property name="title">
-          <string>Device</string>
+       <item row="5" column="0">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_25">
-            <property name="text">
-             <string>Mode</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="camera_mode">
-            <item>
-             <property name="text">
-              <string>640x480, 75 Hz</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>640x480, 60 Hz</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>320x240, 189 Hz</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>320x240, 120 Hz</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Field of view</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="camera_fov">
-            <item>
-             <property name="text">
-              <string>56°</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>75°</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QGroupBox" name="groupBox_11">
-         <property name="title">
-          <string>Status</string>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLabel" name="caminfo_label">
-            <property name="text">
-             <string>Not running</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="pointinfo_label">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
+        </spacer>
        </item>
       </layout>
      </widget>