PT: added reference to help

updated vc9 project files

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

3 files changed, 21 insertions, 14 deletions

diff --git a/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui b/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui
index 38909013..77e412af 100644
--- a/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui
+++ b/FTNoIR_Tracker_PT/FTNoIR_PT_Controls.ui
@@ -51,7 +51,7 @@
       </size>

      </property>

      <property name="currentIndex">

-      <number>0</number>

+      <number>2</number>

      </property>

      <widget class="QWidget" name="tab">

       <attribute name="title">

@@ -730,18 +730,21 @@
         <rect>

          <x>30</x>

          <y>30</y>

-         <width>131</width>

-         <height>81</height>

+         <width>161</width>

+         <height>111</height>

         </rect>

        </property>

        <property name="text">

-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PointTracker Plugin &lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Version 0.1&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;by Patrick Ruoff&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;FTNoIR PointTracker Plugin&lt;br/&gt;Version 0.1&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;by Patrick Ruoff&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://ftnoirpt.sourceforge.net/&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;Manual (external)&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

+       </property>

+       <property name="openExternalLinks">

+        <bool>true</bool>

        </property>

       </widget>

       <widget class="QLabel" name="label_35">

        <property name="geometry">

         <rect>

-         <x>170</x>

+         <x>200</x>

          <y>30</y>

          <width>141</width>

          <height>141</height>

diff --git a/FTNoIR_Tracker_PT/FTNoIR_Tracker_PT_vc9.vcproj b/FTNoIR_Tracker_PT/FTNoIR_Tracker_PT_vc9.vcproj
index b938173d..51d2a38a 100644
--- a/FTNoIR_Tracker_PT/FTNoIR_Tracker_PT_vc9.vcproj
+++ b/FTNoIR_Tracker_PT/FTNoIR_Tracker_PT_vc9.vcproj
@@ -38,6 +38,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="2"

+				FavorSizeOrSpeed="1"

+				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="&quot;.&quot;;&quot;.\GeneratedFiles&quot;;&quot;.\GeneratedFiles\$(ConfigurationName)&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(OPENCV_DIR)\include&quot;;&quot;$(BOOST_DIR)&quot;;&quot;$(QTDIR)\include\QtOpenGL&quot;"

 				PreprocessorDefinitions="UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;FTNOIR_TRACKER_BASE_LIB;QT_OPENGL_LIB"

 				RuntimeLibrary="2"

@@ -55,11 +58,12 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtOpenGL4.lib opengl32.lib glu32.lib opencv_core242.lib opencv_highgui242.lib opencv_imgproc242.lib"

+				AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtOpenGL4.lib opengl32.lib glu32.lib opencv_core242.lib opencv_highgui242.lib opencv_imgproc242.lib libjasper.lib libjpeg.lib libpng.lib libtiff.lib vfw32.lib"

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

-				AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;&quot;$(OPENCV_DIR)\x86\vc9\lib&quot;"

+				AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;&quot;$(OPENCV_DIR)\x86\vc9\static_lib&quot;"

 				GenerateDebugInformation="false"

 				SubSystem="2"

+				LinkTimeCodeGeneration="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -85,7 +89,7 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)/bin_dbg"

+			OutputDirectory="$(SolutionDir)\bin"

 			IntermediateDirectory="$(SolutionDir)\$(ConfigurationName)"

 			ConfigurationType="2"

 			>

@@ -124,8 +128,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib QtOpenGLd4.lib opengl32.lib glu32.lib opencv_core242d.lib opencv_highgui242d.lib opencv_imgproc242d.lib opencv_calib3d242d.lib"

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

+				AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib QtOpenGL4.lib opengl32.lib glu32.lib opencv_core242d.lib opencv_highgui242d.lib opencv_imgproc242d.lib opencv_calib3d242d.lib"

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

 				AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;&quot;$(OPENCV_DIR)\x86\vc9\lib&quot;"

 				GenerateDebugInformation="true"

 				SubSystem="2"

diff --git a/FTNoIR_Tracker_PT/point_extractor.cpp b/FTNoIR_Tracker_PT/point_extractor.cpp
index b26f7068..cdb9d3f1 100644
--- a/FTNoIR_Tracker_PT/point_extractor.cpp
+++ b/FTNoIR_Tracker_PT/point_extractor.cpp
@@ -40,7 +40,7 @@ const vector<Vec2f>& PointExtractor::extract_points(Mat frame, float dt, bool dr
 

 	// find connected components...

 	// Method 1: contours

-	//*

+	/*

 	// find contours

 	vector< vector<Point> > contours;

 	findContours(frame_bw.clone(), contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE);

@@ -64,10 +64,10 @@ const vector<Vec2f>& PointExtractor::extract_points(Mat frame, float dt, bool dr
 		c[1] = -(m.m01/m.m00 - frame.rows/2)/frame.cols;

 		points.push_back(c);

 	}

-	//*/

+	*/

 

 	// Method 2: floodfill

-	/*

+	//*

 	// extract blobs

 	struct BlobInfo

 	{

@@ -115,7 +115,7 @@ const vector<Vec2f>& PointExtractor::extract_points(Mat frame, float dt, bool dr
 		c[1] = -(m.m01/float(m.m00) - frame.rows/2)/frame.cols;

 		points.push_back(c);

 	}

-	*/

+	//*/

 	

 	// draw output image

 	if (draw_output)