tracker/pt: gui changes

Add MJPEG checkbox
Add tooltips
Fix tab order

5 files changed, 298 insertions, 151 deletions

diff --git a/tracker-pt/FTNoIR_PT_Controls.ui b/tracker-pt/FTNoIR_PT_Controls.ui
index f683d7c3..fb41d27e 100644
--- a/tracker-pt/FTNoIR_PT_Controls.ui
+++ b/tracker-pt/FTNoIR_PT_Controls.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>418</width>
+    <width>420</width>
     <height>724</height>
    </rect>
   </property>
@@ -134,43 +134,53 @@
           <string>Camera settings</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="1">
-           <widget class="QComboBox" name="camdevice_combo">
+          <item row="8" 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="minimumContentsLength">
-             <number>10</number>
+            <property name="text">
+             <string>Open</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QSpinBox" name="fov">
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_4">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="suffix">
-             <string>°</string>
+            <property name="cursor">
+             <cursorShape>WhatsThisCursor</cursorShape>
             </property>
-            <property name="prefix">
-             <string/>
+            <property name="toolTip">
+             <string>This should be 56° or 76° for the PS3 Eye, dependent upon the physical lens setting. It's only neccessary to get position correspond to real-world values.</string>
             </property>
-            <property name="minimum">
-             <number>10</number>
+            <property name="text">
+             <string>Diagonal field of view</string>
             </property>
-            <property name="maximum">
-             <number>90</number>
+           </widget>
+          </item>
+          <item row="8" 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="text">
+             <string>Camera settings (when available)</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_4">
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_37">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -178,7 +188,10 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Diagonal field of view</string>
+             <string>FPS</string>
+            </property>
+            <property name="buddy">
+             <cstring>fps_spin</cstring>
             </property>
            </widget>
           </item>
@@ -195,8 +208,73 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_37">
+          <item row="9" column="1">
+           <widget class="QComboBox" name="blob_color">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <item>
+             <property name="text">
+              <string>Average</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Natural</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Red only</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Green only</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Blue only</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Red chroma key</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Green chroma key</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Blue chroma key</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Cyan chroma key</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Yellow chroma key</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Magenta chroma key</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_41">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -204,10 +282,33 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>FPS</string>
+             <string>Height</string>
             </property>
-            <property name="buddy">
-             <cstring>fps_spin</cstring>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Dynamic pose (for caps only, never clips)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QCheckBox" name="dynamic_pose">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string/>
             </property>
            </widget>
           </item>
@@ -233,48 +334,35 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="label_6">
+          <item row="9" 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="text">
-             <string>Dynamic pose timeout</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QSpinBox" name="fps_spin">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+            <property name="cursor">
+             <cursorShape>WhatsThisCursor</cursorShape>
             </property>
             <property name="toolTip">
-             <string>Desired capture framerate</string>
-            </property>
-            <property name="suffix">
-             <string> Hz</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For LEDs, 'Natural' is the fastest grayscale mode thanks to optimized SIMD code. Color key allows to track regular pieces of colored paper.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
-            <property name="maximum">
-             <number>2000</number>
+            <property name="text">
+             <string>Color channels used</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="1">
-           <widget class="QCheckBox" name="dynamic_pose">
+          <item row="0" column="1">
+           <widget class="QComboBox" name="camdevice_combo">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string/>
+            <property name="minimumContentsLength">
+             <number>10</number>
             </property>
            </widget>
           </item>
@@ -300,20 +388,26 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_41">
+          <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>Height</string>
+            <property name="toolTip">
+             <string>Desired capture framerate</string>
+            </property>
+            <property name="suffix">
+             <string> Hz</string>
+            </property>
+            <property name="maximum">
+             <number>2000</number>
             </property>
            </widget>
           </item>
-          <item row="6" column="1">
+          <item row="7" column="1">
            <widget class="QSpinBox" name="init_phase_timeout">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -332,37 +426,46 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_2">
+          <item row="5" column="1">
+           <widget class="QSpinBox" name="fov">
             <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>Device</string>
+            <property name="suffix">
+             <string>°</string>
             </property>
-            <property name="buddy">
-             <cstring>camdevice_combo</cstring>
+            <property name="prefix">
+             <string/>
+            </property>
+            <property name="minimum">
+             <number>10</number>
+            </property>
+            <property name="maximum">
+             <number>90</number>
             </property>
            </widget>
           </item>
-          <item row="7" column="1">
-           <widget class="QPushButton" name="camera_settings">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_2">
             <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>Device</string>
+            </property>
+            <property name="buddy">
+             <cstring>camdevice_combo</cstring>
             </property>
            </widget>
           </item>
           <item row="7" column="0">
-           <widget class="QLabel" name="label_9">
+           <widget class="QLabel" name="label_6">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
@@ -370,98 +473,33 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Camera settings (when available)</string>
+             <string>Dynamic pose timeout</string>
             </property>
            </widget>
           </item>
-          <item row="8" column="0">
-           <widget class="QLabel" name="label_12">
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_13">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text">
-             <string>Color channels used</string>
+            <property name="cursor">
+             <cursorShape>WhatsThisCursor</cursorShape>
             </property>
-           </widget>
-          </item>
-          <item row="8" column="1">
-           <widget class="QComboBox" name="blob_color">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+            <property name="toolTip">
+             <string>Enable MJPEG compression for high-speed cameras other than the PS3 Eye. Windows only.</string>
+            </property>
+            <property name="text">
+             <string>MJPEG compression</string>
             </property>
-            <item>
-             <property name="text">
-              <string>Average</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Natural</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Red only</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Green only</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Blue only</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Red chroma key</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Green chroma key</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Blue chroma key</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Cyan chroma key</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Yellow chroma key</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Magenta chroma key</string>
-             </property>
-            </item>
            </widget>
           </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="use_mjpeg">
             <property name="text">
-             <string>Dynamic pose (for caps only, never clips)</string>
+             <string/>
             </property>
            </widget>
           </item>
@@ -504,6 +542,12 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="cursor">
+             <cursorShape>WhatsThisCursor</cursorShape>
+            </property>
+            <property name="toolTip">
+             <string>Set minimum size to avoid small stray lights from being treated as points.</string>
+            </property>
             <property name="text">
              <string>Min size</string>
             </property>
@@ -580,6 +624,12 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="cursor">
+             <cursorShape>WhatsThisCursor</cursorShape>
+            </property>
+            <property name="toolTip">
+             <string>Track dependent on point size and not absolute brightness. This may allow more stable tracking.</string>
+            </property>
             <property name="text">
              <string>Automatic threshold</string>
             </property>
@@ -1411,11 +1461,12 @@ Don't roll or change position.</string>
   <tabstop>res_x_spin</tabstop>
   <tabstop>res_y_spin</tabstop>
   <tabstop>fps_spin</tabstop>
+  <tabstop>use_mjpeg</tabstop>
   <tabstop>fov</tabstop>
   <tabstop>dynamic_pose</tabstop>
   <tabstop>init_phase_timeout</tabstop>
-  <tabstop>camera_settings</tabstop>
   <tabstop>blob_color</tabstop>
+  <tabstop>camera_settings</tabstop>
   <tabstop>auto_threshold</tabstop>
   <tabstop>threshold_slider</tabstop>
   <tabstop>mindiam_spin</tabstop>
@@ -1425,19 +1476,19 @@ Don't roll or change position.</string>
   <tabstop>clip_theight_spin</tabstop>
   <tabstop>clip_bheight_spin</tabstop>
   <tabstop>clip_blength_spin</tabstop>
+  <tabstop>tx_spin</tabstop>
+  <tabstop>ty_spin</tabstop>
+  <tabstop>tz_spin</tabstop>
+  <tabstop>tcalib_button</tabstop>
   <tabstop>cap_length_spin</tabstop>
-  <tabstop>cap_height_spin</tabstop>
   <tabstop>cap_width_spin</tabstop>
+  <tabstop>cap_height_spin</tabstop>
   <tabstop>m1x_spin</tabstop>
   <tabstop>m1y_spin</tabstop>
   <tabstop>m1z_spin</tabstop>
   <tabstop>m2x_spin</tabstop>
-  <tabstop>m2y_spin</tabstop>
   <tabstop>m2z_spin</tabstop>
-  <tabstop>tx_spin</tabstop>
-  <tabstop>ty_spin</tabstop>
-  <tabstop>tz_spin</tabstop>
-  <tabstop>tcalib_button</tabstop>
+  <tabstop>m2y_spin</tabstop>
  </tabstops>
  <resources>
   <include location="module/tracker_pt.qrc"/>
diff --git a/tracker-pt/lang/nl_NL.ts b/tracker-pt/lang/nl_NL.ts
index 3d12a7ea..41cd8e4b 100644
--- a/tracker-pt/lang/nl_NL.ts
+++ b/tracker-pt/lang/nl_NL.ts
@@ -256,6 +256,30 @@ Don&apos;t roll or change position.</source>
         <source>Magenta chroma key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This should be 56° or 76° for the PS3 Eye, dependent upon the physical lens setting. It&apos;s only neccessary to get position correspond to real-world values.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable MJPEG compression for high-speed cameras other than the PS3 Eye. Windows only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set minimum size to avoid small stray lights from being treated as points.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Track dependent on point size and not absolute brightness. This may allow more stable tracking.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For LEDs, &apos;Natural&apos; is the fastest grayscale mode thanks to optimized SIMD code. Color key allows to track regular pieces of colored paper.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MJPEG compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>pt_impl::TrackerDialog_PT</name>
diff --git a/tracker-pt/lang/ru_RU.ts b/tracker-pt/lang/ru_RU.ts
index 0315d493..f2266d82 100644
--- a/tracker-pt/lang/ru_RU.ts
+++ b/tracker-pt/lang/ru_RU.ts
@@ -261,6 +261,30 @@ ROLL или X/Y-смещения.</translation>
         <source>Magenta chroma key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This should be 56° or 76° for the PS3 Eye, dependent upon the physical lens setting. It&apos;s only neccessary to get position correspond to real-world values.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable MJPEG compression for high-speed cameras other than the PS3 Eye. Windows only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set minimum size to avoid small stray lights from being treated as points.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Track dependent on point size and not absolute brightness. This may allow more stable tracking.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For LEDs, &apos;Natural&apos; is the fastest grayscale mode thanks to optimized SIMD code. Color key allows to track regular pieces of colored paper.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MJPEG compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>pt_impl::TrackerDialog_PT</name>
diff --git a/tracker-pt/lang/stub.ts b/tracker-pt/lang/stub.ts
index 4c8c4f82..da299466 100644
--- a/tracker-pt/lang/stub.ts
+++ b/tracker-pt/lang/stub.ts
@@ -256,6 +256,30 @@ Don&apos;t roll or change position.</source>
         <source>Magenta chroma key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This should be 56° or 76° for the PS3 Eye, dependent upon the physical lens setting. It&apos;s only neccessary to get position correspond to real-world values.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable MJPEG compression for high-speed cameras other than the PS3 Eye. Windows only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set minimum size to avoid small stray lights from being treated as points.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Track dependent on point size and not absolute brightness. This may allow more stable tracking.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For LEDs, &apos;Natural&apos; is the fastest grayscale mode thanks to optimized SIMD code. Color key allows to track regular pieces of colored paper.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MJPEG compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>pt_impl::TrackerDialog_PT</name>
diff --git a/tracker-pt/lang/zh_CN.ts b/tracker-pt/lang/zh_CN.ts
index bbbc7f8d..c9d320a1 100644
--- a/tracker-pt/lang/zh_CN.ts
+++ b/tracker-pt/lang/zh_CN.ts
@@ -256,6 +256,30 @@ Don&apos;t roll or change position.</source>
         <source>Magenta chroma key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This should be 56° or 76° for the PS3 Eye, dependent upon the physical lens setting. It&apos;s only neccessary to get position correspond to real-world values.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable MJPEG compression for high-speed cameras other than the PS3 Eye. Windows only.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set minimum size to avoid small stray lights from being treated as points.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Track dependent on point size and not absolute brightness. This may allow more stable tracking.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For LEDs, &apos;Natural&apos; is the fastest grayscale mode thanks to optimized SIMD code. Color key allows to track regular pieces of colored paper.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MJPEG compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>pt_impl::TrackerDialog_PT</name>