Adding faceAPI controls

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

3 files changed, 209 insertions, 5 deletions

diff --git a/FTNoIR_Tracker_SM/FTNoIR_SM_Controls.ui b/FTNoIR_Tracker_SM/FTNoIR_SM_Controls.ui
new file mode 100644
index 00000000..5d1cc66b
--- /dev/null
+++ b/FTNoIR_Tracker_SM/FTNoIR_SM_Controls.ui
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ui version="4.0">

+ <class>UICSMClientControls</class>

+ <widget class="QWidget" name="UICSMClientControls">

+  <property name="geometry">

+   <rect>

+    <x>0</x>

+    <y>0</y>

+    <width>406</width>

+    <height>160</height>

+   </rect>

+  </property>

+  <property name="windowTitle">

+   <string>faceAPI tracker settings FaceTrackNoIR</string>

+  </property>

+  <property name="windowIcon">

+   <iconset>

+    <normaloff>images/FaceTrackNoIR.ico</normaloff>images/FaceTrackNoIR.ico</iconset>

+  </property>

+  <property name="layoutDirection">

+   <enum>Qt::LeftToRight</enum>

+  </property>

+  <property name="autoFillBackground">

+   <bool>false</bool>

+  </property>

+  <layout class="QVBoxLayout" name="_vertical_layout">

+   <item>

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

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

+      <widget class="QLabel" name="_engine_state_label">

+       <property name="minimumSize">

+        <size>

+         <width>100</width>

+         <height>0</height>

+        </size>

+       </property>

+       <property name="text">

+        <string>wait...</string>

+       </property>

+      </widget>

+     </item>

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

+      <spacer name="horizontalSpacer_3">

+       <property name="orientation">

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

+       </property>

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

+        <size>

+         <width>40</width>

+         <height>20</height>

+        </size>

+       </property>

+      </spacer>

+     </item>

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

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

+       <property name="text">

+        <string>Camera</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="text">

+        <string>Start</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="text">

+        <string>Stop</string>

+       </property>

+      </widget>

+     </item>

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

+      <widget class="QLabel" name="label_2">

+       <property name="text">

+        <string>Engine state:</string>

+       </property>

+      </widget>

+     </item>

+    </layout>

+   </item>

+   <item>

+    <spacer name="verticalSpacer">

+     <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>

+    <layout class="QVBoxLayout" name="verticalLayout"/>

+   </item>

+   <item>

+    <layout class="QHBoxLayout" name="horizontalLayout">

+     <item>

+      <spacer name="horizontalSpacer_2">

+       <property name="orientation">

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

+       </property>

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

+        <size>

+         <width>40</width>

+         <height>20</height>

+        </size>

+       </property>

+      </spacer>

+     </item>

+     <item>

+      <layout class="QHBoxLayout" name="horizontalLayout_2">

+       <property name="sizeConstraint">

+        <enum>QLayout::SetDefaultConstraint</enum>

+       </property>

+       <item>

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

+         <property name="sizePolicy">

+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

+           <horstretch>0</horstretch>

+           <verstretch>0</verstretch>

+          </sizepolicy>

+         </property>

+         <property name="minimumSize">

+          <size>

+           <width>100</width>

+           <height>0</height>

+          </size>

+         </property>

+         <property name="maximumSize">

+          <size>

+           <width>100</width>

+           <height>16777215</height>

+          </size>

+         </property>

+         <property name="text">

+          <string>OK</string>

+         </property>

+        </widget>

+       </item>

+       <item>

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

+         <property name="sizePolicy">

+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

+           <horstretch>0</horstretch>

+           <verstretch>0</verstretch>

+          </sizepolicy>

+         </property>

+         <property name="minimumSize">

+          <size>

+           <width>100</width>

+           <height>0</height>

+          </size>

+         </property>

+         <property name="maximumSize">

+          <size>

+           <width>100</width>

+           <height>16777215</height>

+          </size>

+         </property>

+         <property name="text">

+          <string>Cancel</string>

+         </property>

+        </widget>

+       </item>

+      </layout>

+     </item>

+     <item>

+      <spacer name="horizontalSpacer">

+       <property name="orientation">

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

+       </property>

+       <property name="sizeType">

+        <enum>QSizePolicy::Fixed</enum>

+       </property>

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

+        <size>

+         <width>10</width>

+         <height>20</height>

+        </size>

+       </property>

+      </spacer>

+     </item>

+    </layout>

+   </item>

+  </layout>

+ </widget>

+ <tabstops>

+  <tabstop>btnOK</tabstop>

+  <tabstop>btnCancel</tabstop>

+ </tabstops>

+ <resources/>

+ <connections/>

+ <slots>

+  <slot>startEngineClicked()</slot>

+  <slot>stopEngineClicked()</slot>

+  <slot>cameraSettingsClicked()</slot>

+ </slots>

+</ui>

diff --git a/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj b/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj
index 403d2044..a479811d 100644
--- a/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj
+++ b/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj
@@ -55,9 +55,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtNetwork4.lib smft32.lib smftcpp.lib smftqt.lib"

+				AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtNetwork4.lib"

 				OutputFile="$(OutDir)\$(ProjectName).dll"

-				AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;&quot;$(SM_API_PATH)\bin&quot;;&quot;$(SM_API_CPP_WRAPPERS)\lib&quot;;&quot;$(SM_API_WIDGETS)\lib&quot;;&quot;$(SM_API_QTDIR)\lib&quot;"

+				AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;"

 				GenerateDebugInformation="false"

 				SubSystem="2"

 			/>

diff --git a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp
index 9665890c..9834e78f 100644
--- a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp
+++ b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp
@@ -158,9 +158,9 @@ void FTNoIR_Tracker_SM::loadSettings() {
 

 	qDebug() << "FTNoIR_Tracker_SM::loadSettings says: iniFile = " << currentFile;

 

-	iniFile.beginGroup ( "FTNClient" );

-	setParameterValue(kPortAddress, (float) iniFile.value ( "PortNumber", 5550 ).toInt());

-	iniFile.endGroup ();

+	//iniFile.beginGroup ( "FTNClient" );

+	//setParameterValue(kPortAddress, (float) iniFile.value ( "PortNumber", 5550 ).toInt());

+	//iniFile.endGroup ();

 }

 

 //