Started work on incorporating two headtracker at once.

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@189 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

1 files changed, 161 insertions, 72 deletions

diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui
index bd4356c3..eec447bc 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.ui
+++ b/FaceTrackNoIR/FaceTrackNoIR.ui
@@ -11,7 +11,7 @@
     <x>0</x>

     <y>0</y>

     <width>925</width>

-    <height>428</height>

+    <height>411</height>

    </rect>

   </property>

   <property name="sizePolicy">

@@ -1173,7 +1173,7 @@ color: rgb(0, 255, 0);</string>
               <widget class="QGroupBox" name="groupGlobalSettings">

                <property name="minimumSize">

                 <size>

-                 <width>206</width>

+                 <width>420</width>

                  <height>120</height>

                 </size>

                </property>

@@ -1591,6 +1591,19 @@ background:none;</string>
                </widget>

               </widget>

              </item>

+             <item>

+              <spacer name="horizontalSpacer_4">

+               <property name="orientation">

+                <enum>Qt::Horizontal</enum>

+               </property>

+               <property name="sizeHint" stdset="0">

+                <size>

+                 <width>40</width>

+                 <height>20</height>

+                </size>

+               </property>

+              </spacer>

+             </item>

             </layout>

            </item>

            <item row="0" column="0">

@@ -1739,33 +1752,30 @@ background:none;</string>
              </item>

             </layout>

            </item>

-           <item row="3" column="0">

-            <layout class="QHBoxLayout" name="horizontalLayout_7">

-             <property name="leftMargin">

-              <number>10</number>

-             </property>

-             <property name="rightMargin">

-              <number>10</number>

+           <item row="4" column="0">

+            <layout class="QGridLayout" name="gridLayout_5">

+             <property name="verticalSpacing">

+              <number>1</number>

              </property>

-             <item>

+             <item row="0" column="0">

               <widget class="QGroupBox" name="groupTrackerSource">

                <property name="minimumSize">

                 <size>

                  <width>200</width>

-                 <height>120</height>

+                 <height>80</height>

                 </size>

                </property>

                <property name="maximumSize">

                 <size>

-                 <width>16777215</width>

-                 <height>120</height>

+                 <width>200</width>

+                 <height>80</height>

                 </size>

                </property>

                <property name="styleSheet">

                 <string notr="true"/>

                </property>

                <property name="title">

-                <string>Tracker Source</string>

+                <string>Tracker Source(1st)</string>

                </property>

                <widget class="QComboBox" name="iconcomboTrackerSource">

                 <property name="geometry">

@@ -1793,7 +1803,7 @@ background:none;</string>
                 <property name="geometry">

                  <rect>

                   <x>10</x>

-                  <y>80</y>

+                  <y>50</y>

                   <width>180</width>

                   <height>23</height>

                  </rect>

@@ -1808,70 +1818,92 @@ background:none;</string>
                  <string>Settings</string>

                 </property>

                </widget>

-               <widget class="QPushButton" name="btnStartTracker">

+              </widget>

+             </item>

+             <item row="0" column="1">

+              <widget class="QGroupBox" name="groupFilter">

+               <property name="minimumSize">

+                <size>

+                 <width>200</width>

+                 <height>70</height>

+                </size>

+               </property>

+               <property name="maximumSize">

+                <size>

+                 <width>200</width>

+                 <height>80</height>

+                </size>

+               </property>

+               <property name="styleSheet">

+                <string notr="true"/>

+               </property>

+               <property name="title">

+                <string>Filter</string>

+               </property>

+               <widget class="QComboBox" name="iconcomboFilter">

                 <property name="geometry">

                  <rect>

                   <x>10</x>

-                  <y>50</y>

-                  <width>81</width>

-                  <height>23</height>

+                  <y>20</y>

+                  <width>180</width>

+                  <height>22</height>

                  </rect>

                 </property>

-                <property name="toolTip">

-                 <string>Start the Tracker</string>

-                </property>

                 <property name="styleSheet">

                  <string notr="true"/>

                 </property>

-                <property name="text">

-                 <string>Start</string>

+                <property name="currentIndex">

+                 <number>-1</number>

+                </property>

+                <property name="maxVisibleItems">

+                 <number>7</number>

                 </property>

                </widget>

-               <widget class="QPushButton" name="btnStopTracker">

+               <widget class="QPushButton" name="btnShowFilterControls">

                 <property name="enabled">

-                 <bool>false</bool>

+                 <bool>true</bool>

                 </property>

                 <property name="geometry">

                  <rect>

-                  <x>109</x>

+                  <x>10</x>

                   <y>50</y>

-                  <width>81</width>

+                  <width>180</width>

                   <height>23</height>

                  </rect>

                 </property>

                 <property name="toolTip">

-                 <string>Stop the Tracker</string>

+                 <string>Change game protocol settings</string>

                 </property>

                 <property name="styleSheet">

                  <string notr="true"/>

                 </property>

                 <property name="text">

-                 <string>Stop</string>

+                 <string>Settings</string>

                 </property>

                </widget>

               </widget>

              </item>

-             <item>

-              <widget class="QGroupBox" name="groupFilter">

+             <item row="0" column="2">

+              <widget class="QGroupBox" name="groupGameProtocol">

                <property name="minimumSize">

                 <size>

-                 <width>190</width>

-                 <height>120</height>

+                 <width>200</width>

+                 <height>80</height>

                 </size>

                </property>

                <property name="maximumSize">

                 <size>

-                 <width>16777215</width>

-                 <height>120</height>

+                 <width>200</width>

+                 <height>80</height>

                 </size>

                </property>

                <property name="styleSheet">

                 <string notr="true"/>

                </property>

                <property name="title">

-                <string>Filter</string>

+                <string>Game protocol</string>

                </property>

-               <widget class="QComboBox" name="iconcomboFilter">

+               <widget class="QComboBox" name="iconcomboProtocol">

                 <property name="geometry">

                  <rect>

                   <x>10</x>

@@ -1890,14 +1922,14 @@ background:none;</string>
                  <number>7</number>

                 </property>

                </widget>

-               <widget class="QPushButton" name="btnShowFilterControls">

+               <widget class="QPushButton" name="btnShowServerControls">

                 <property name="enabled">

                  <bool>true</bool>

                 </property>

                 <property name="geometry">

                  <rect>

                   <x>10</x>

-                  <y>80</y>

+                  <y>50</y>

                   <width>180</width>

                   <height>23</height>

                  </rect>

@@ -1914,59 +1946,97 @@ background:none;</string>
                </widget>

               </widget>

              </item>

-             <item>

-              <widget class="QGroupBox" name="groupGameProtocol">

+             <item row="1" column="1">

+              <widget class="QGroupBox" name="groupStartStop">

                <property name="minimumSize">

                 <size>

-                 <width>190</width>

-                 <height>120</height>

+                 <width>200</width>

+                 <height>80</height>

                 </size>

                </property>

                <property name="maximumSize">

                 <size>

                  <width>16777215</width>

-                 <height>120</height>

+                 <height>80</height>

                 </size>

                </property>

-               <property name="styleSheet">

-                <string notr="true"/>

-               </property>

                <property name="title">

-                <string>Game protocol</string>

+                <string>GO!</string>

                </property>

-               <widget class="QComboBox" name="iconcomboProtocol">

+               <widget class="QPushButton" name="btnStartTracker">

                 <property name="geometry">

                  <rect>

                   <x>10</x>

                   <y>20</y>

-                  <width>180</width>

-                  <height>22</height>

+                  <width>81</width>

+                  <height>23</height>

                  </rect>

                 </property>

+                <property name="toolTip">

+                 <string>Start the Tracker</string>

+                </property>

                 <property name="styleSheet">

                  <string notr="true"/>

                 </property>

-                <property name="currentIndex">

-                 <number>-1</number>

+                <property name="text">

+                 <string>Start</string>

                 </property>

-                <property name="maxVisibleItems">

-                 <number>7</number>

+               </widget>

+               <widget class="QPushButton" name="btnStopTracker">

+                <property name="enabled">

+                 <bool>false</bool>

+                </property>

+                <property name="geometry">

+                 <rect>

+                  <x>100</x>

+                  <y>20</y>

+                  <width>81</width>

+                  <height>23</height>

+                 </rect>

+                </property>

+                <property name="toolTip">

+                 <string>Stop the Tracker</string>

+                </property>

+                <property name="styleSheet">

+                 <string notr="true"/>

+                </property>

+                <property name="text">

+                 <string>Stop</string>

                 </property>

                </widget>

-               <widget class="QPushButton" name="btnShowServerControls">

+              </widget>

+             </item>

+             <item row="1" column="0">

+              <widget class="QGroupBox" name="groupBox_3">

+               <property name="minimumSize">

+                <size>

+                 <width>200</width>

+                 <height>80</height>

+                </size>

+               </property>

+               <property name="maximumSize">

+                <size>

+                 <width>200</width>

+                 <height>80</height>

+                </size>

+               </property>

+               <property name="title">

+                <string>Tracker Source (2nd)</string>

+               </property>

+               <widget class="QPushButton" name="btnShowSecondTrackerSettings">

                 <property name="enabled">

                  <bool>true</bool>

                 </property>

                 <property name="geometry">

                  <rect>

                   <x>10</x>

-                  <y>80</y>

+                  <y>50</y>

                   <width>180</width>

                   <height>23</height>

                  </rect>

                 </property>

                 <property name="toolTip">

-                 <string>Change game protocol settings</string>

+                 <string>Change tracker settings</string>

                 </property>

                 <property name="styleSheet">

                  <string notr="true"/>

@@ -1975,23 +2045,42 @@ background:none;</string>
                  <string>Settings</string>

                 </property>

                </widget>

+               <widget class="QComboBox" name="cbxSecondTrackerSource">

+                <property name="geometry">

+                 <rect>

+                  <x>10</x>

+                  <y>20</y>

+                  <width>180</width>

+                  <height>22</height>

+                 </rect>

+                </property>

+                <property name="styleSheet">

+                 <string notr="true"/>

+                </property>

+                <property name="currentIndex">

+                 <number>-1</number>

+                </property>

+                <property name="maxVisibleItems">

+                 <number>5</number>

+                </property>

+               </widget>

               </widget>

              </item>

+             <item row="1" column="2">

+              <spacer name="verticalSpacer">

+               <property name="orientation">

+                <enum>Qt::Vertical</enum>

+               </property>

+               <property name="sizeHint" stdset="0">

+                <size>

+                 <width>20</width>

+                 <height>30</height>

+                </size>

+               </property>

+              </spacer>

+             </item>

             </layout>

            </item>

-           <item row="4" column="0">

-            <spacer name="verticalSpacer">

-             <property name="orientation">

-              <enum>Qt::Vertical</enum>

-             </property>

-             <property name="sizeHint" stdset="0">

-              <size>

-               <width>20</width>

-               <height>30</height>

-              </size>

-             </property>

-            </spacer>

-           </item>

           </layout>

          </item>

         </layout>