From 77a469de95a498a4860b7da72b38508d40c2bede Mon Sep 17 00:00:00 2001
From: Stéphane Lenclud <github@lenclud.com>
Date: Sun, 21 Apr 2019 13:36:18 +0200
Subject: Easy Tracker: Settings clean-up and rearrangement.

---
 tracker-easy/tracker-easy-settings.ui | 381 +++++++++++++---------------------
 1 file changed, 141 insertions(+), 240 deletions(-)

(limited to 'tracker-easy/tracker-easy-settings.ui')

diff --git a/tracker-easy/tracker-easy-settings.ui b/tracker-easy/tracker-easy-settings.ui
index 9ff929dc..2ec56a04 100644
--- a/tracker-easy/tracker-easy-settings.ui
+++ b/tracker-easy/tracker-easy-settings.ui
@@ -117,9 +117,9 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab_2">
+     <widget class="QWidget" name="tabTracker">
       <attribute name="title">
-       <string>Camera</string>
+       <string>Tracker</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
@@ -131,35 +131,25 @@
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Camera settings</string>
+          <string>Camera</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_5">
+          <item row="3" column="1">
+           <widget class="QSpinBox" name="fps_spin">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string>Debug (full size preview)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+            <property name="toolTip">
+             <string>Desired capture framerate</string>
             </property>
-            <property name="text">
-             <string>Device</string>
+            <property name="suffix">
+             <string> Hz</string>
             </property>
-            <property name="buddy">
-             <cstring>camdevice_combo</cstring>
+            <property name="maximum">
+             <number>2000</number>
             </property>
            </widget>
           </item>
@@ -176,8 +166,8 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_41">
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_9">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -185,12 +175,12 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Height</string>
+             <string>Camera settings (when available)</string>
             </property>
            </widget>
           </item>
-          <item row="7" column="0">
-           <widget class="QLabel" name="label_12">
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_36">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -198,38 +188,25 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Perspective-N-Point solver</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <widget class="QCheckBox" name="debug">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string/>
+             <string>Width</string>
             </property>
            </widget>
           </item>
-          <item row="6" column="1">
-           <widget class="QPushButton" name="camera_settings">
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_41">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Open</string>
+             <string>Height</string>
             </property>
            </widget>
           </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="label_9">
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_37">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -237,54 +214,24 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Camera settings (when available)</string>
+             <string>FPS</string>
+            </property>
+            <property name="buddy">
+             <cstring>fps_spin</cstring>
             </property>
            </widget>
           </item>
-          <item row="7" column="1">
-           <widget class="QComboBox" name="comboBoxSolvers">
+          <item row="5" column="1">
+           <widget class="QPushButton" name="camera_settings">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip">
-             <string>Make sure you pick a solver supporting the number of marker you are using. For three points detection use either P3P or AP3P.</string>
-            </property>
-            <property name="currentText">
-             <string>P3P</string>
+            <property name="text">
+             <string>Open</string>
             </property>
-            <item>
-             <property name="text">
-              <string>ITERATIVE</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>EPNP</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>P3P</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>DLS</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>UPNP</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>AP3P</string>
-             </property>
-            </item>
            </widget>
           </item>
           <item row="4" column="1">
@@ -309,30 +256,8 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QSpinBox" name="res_y_spin">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>Desired capture height</string>
-            </property>
-            <property name="suffix">
-             <string> px</string>
-            </property>
-            <property name="maximum">
-             <number>2000</number>
-            </property>
-            <property name="singleStep">
-             <number>10</number>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_36">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -340,25 +265,15 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Width</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+             <string>Device</string>
             </property>
-            <property name="text">
-             <string>Diagonal field of view</string>
+            <property name="buddy">
+             <cstring>camdevice_combo</cstring>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QSpinBox" name="fps_spin">
+          <item row="2" column="1">
+           <widget class="QSpinBox" name="res_y_spin">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -366,29 +281,16 @@
              </sizepolicy>
             </property>
             <property name="toolTip">
-             <string>Desired capture framerate</string>
+             <string>Desired capture height</string>
             </property>
             <property name="suffix">
-             <string> Hz</string>
+             <string> px</string>
             </property>
             <property name="maximum">
              <number>2000</number>
             </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_37">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>FPS</string>
-            </property>
-            <property name="buddy">
-             <cstring>fps_spin</cstring>
+            <property name="singleStep">
+             <number>10</number>
             </property>
            </widget>
           </item>
@@ -414,6 +316,19 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Diagonal field of view</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -426,31 +341,27 @@
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Point extraction</string>
+          <string>Settings</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_7">
-          <item row="3" column="1">
-           <widget class="QLabel" name="threshold_value_display">
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_7">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string/>
+             <string>Min size</string>
             </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_14">
-            <property name="text">
-             <string>Value</string>
+            <property name="buddy">
+             <cstring>mindiam_spin</cstring>
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_7">
+          <item row="5" column="0">
+           <widget class="QLabel" name="labelDeadzone">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -458,15 +369,15 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Min size</string>
+             <string>Deadzone</string>
             </property>
             <property name="buddy">
-             <cstring>mindiam_spin</cstring>
+             <cstring>maxdiam_spin</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" colspan="2">
-           <widget class="QCheckBox" name="auto_threshold">
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_8">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -474,50 +385,54 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Enable, slider sets point size</string>
+             <string>Max size</string>
+            </property>
+            <property name="buddy">
+             <cstring>maxdiam_spin</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_5">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Threshold</string>
-            </property>
-            <property name="buddy">
-             <cstring>threshold_slider</cstring>
+             <string>Debug (full size preview)</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QDoubleSpinBox" name="mindiam_spin">
+          <item row="0" column="1">
+           <widget class="QCheckBox" name="debug">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip">
-             <string>Minimum point diameter</string>
-            </property>
-            <property name="suffix">
-             <string> px</string>
+            <property name="text">
+             <string/>
             </property>
-            <property name="decimals">
-             <number>1</number>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <property name="singleStep">
-             <double>0.100000000000000</double>
+            <property name="text">
+             <string>Perspective-N-Point solver</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QSlider" name="threshold_slider">
+          <item row="1" column="1">
+           <widget class="QComboBox" name="comboBoxSolvers">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -525,30 +440,45 @@
              </sizepolicy>
             </property>
             <property name="toolTip">
-             <string>Intensity threshold for point extraction</string>
-            </property>
-            <property name="maximum">
-             <number>255</number>
-            </property>
-            <property name="pageStep">
-             <number>1</number>
-            </property>
-            <property name="value">
-             <number>127</number>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="tickPosition">
-             <enum>QSlider::TicksBothSides</enum>
+             <string>Make sure you pick a solver supporting the number of marker you are using. For three points detection use either P3P or AP3P.</string>
             </property>
-            <property name="tickInterval">
-             <number>25</number>
+            <property name="currentText">
+             <string>ITERATIVE</string>
             </property>
+            <item>
+             <property name="text">
+              <string>ITERATIVE</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>EPNP</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>P3P</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>DLS</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>UPNP</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>AP3P</string>
+             </property>
+            </item>
            </widget>
           </item>
-          <item row="5" column="1">
-           <widget class="QDoubleSpinBox" name="maxdiam_spin">
+          <item row="2" column="1">
+           <widget class="QDoubleSpinBox" name="mindiam_spin">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -556,7 +486,7 @@
              </sizepolicy>
             </property>
             <property name="toolTip">
-             <string>Maximum point diameter</string>
+             <string>Minimum point diameter</string>
             </property>
             <property name="suffix">
              <string> px</string>
@@ -569,52 +499,29 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_8">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Max size</string>
-            </property>
-            <property name="buddy">
-             <cstring>maxdiam_spin</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_11">
+          <item row="3" column="1">
+           <widget class="QDoubleSpinBox" name="maxdiam_spin">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string>Automatic threshold</string>
+            <property name="toolTip">
+             <string>Maximum point diameter</string>
             </property>
-           </widget>
-          </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="labelDeadzone">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+            <property name="suffix">
+             <string> px</string>
             </property>
-            <property name="text">
-             <string>Deadzone</string>
+            <property name="decimals">
+             <number>1</number>
             </property>
-            <property name="buddy">
-             <cstring>maxdiam_spin</cstring>
+            <property name="singleStep">
+             <double>0.100000000000000</double>
             </property>
            </widget>
           </item>
-          <item row="6" column="1">
+          <item row="5" column="1">
            <widget class="QSpinBox" name="spinDeadzone">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -1402,13 +1309,7 @@ Don't roll or change position.</string>
   <tabstop>res_y_spin</tabstop>
   <tabstop>fps_spin</tabstop>
   <tabstop>fov</tabstop>
-  <tabstop>debug</tabstop>
   <tabstop>camera_settings</tabstop>
-  <tabstop>comboBoxSolvers</tabstop>
-  <tabstop>auto_threshold</tabstop>
-  <tabstop>threshold_slider</tabstop>
-  <tabstop>mindiam_spin</tabstop>
-  <tabstop>maxdiam_spin</tabstop>
   <tabstop>model_tabs</tabstop>
   <tabstop>clip_tlength_spin</tabstop>
   <tabstop>clip_theight_spin</tabstop>
-- 
cgit v1.2.3