Add CSV-sources in FreeTrack20 and removed some obsolete files.

6 files changed, 137 insertions, 241 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index cf858ac6..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-[Dd]ebug
-[Rr]elease
-/bin/*
-/bin_dbg/*
-[Gg]enerated[Ff]iles
-*.ncb
-*.suo
-*.user
diff --git a/FTNoIR_Protocol_FT/csv.cpp b/FTNoIR_Protocol_FT/csv.cpp
new file mode 100644
index 00000000..22852f89
--- /dev/null
+++ b/FTNoIR_Protocol_FT/csv.cpp
@@ -0,0 +1,99 @@
+/********************************************************************************
+* FaceTrackNoIR		This program is a private project of the some enthusiastic	*
+*					gamers from Holland, who don't like to pay much for			*
+*					head-tracking.												*
+*																				*
+* Copyright (C) 2013	Wim Vriend (Developing)									*
+*						Ron Hendriks (Researching and Testing)					*
+*																				*
+* Homepage																		*
+*																				*
+* This program is free software; you can redistribute it and/or modify it		*
+* under the terms of the GNU General Public License as published by the			*
+* Free Software Foundation; either version 3 of the License, or (at your		*
+* option) any later version.													*
+*																				*
+* This program is distributed in the hope that it will be useful, but			*
+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
+* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
+* more details.																	*
+*																				*
+* You should have received a copy of the GNU General Public License along		*
+* with this program; if not, see <http://www.gnu.org/licenses/>.				*
+*																				*
+********************************************************************************/
+#include "csv.h"
+#include <QTextDecoder>
+
+CSV::CSV(QIODevice * device)
+{
+	m_device = device;
+	m_codec = QTextCodec::codecForLocale();
+	m_pos = 0;
+	m_rx = QRegExp("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)\\n");
+}
+CSV::CSV(QString &string){	
+	m_device = NULL;
+	m_codec = QTextCodec::codecForLocale();
+	m_string = string;	
+	m_pos = 0;
+	m_rx = QRegExp("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)\\n");
+}
+
+CSV::~CSV()
+{
+	//delete m_codec;
+}
+
+
+void CSV::setCodec(const char* codecName){
+	//delete m_codec;
+	m_codec = QTextCodec::codecForName(codecName);
+}
+
+QString CSV::readLine(){
+	QString line;
+
+	if(m_string.isNull()){
+		//READ DATA FROM DEVICE
+		if(m_device && m_device->isReadable()){
+			QTextDecoder dec(m_codec);
+			m_string = dec.toUnicode(m_device->readAll());
+		}else{
+			return QString();
+		}
+	}
+
+	//PARSE
+	if((m_pos = m_rx.indexIn(m_string,m_pos)) != -1) {
+		line = m_rx.cap(1);		
+		m_pos += m_rx.matchedLength();
+	}
+	return line;
+	
+}
+QStringList CSV::parseLine(){
+	return parseLine(readLine());
+}
+QStringList CSV::parseLine(QString line){
+	QStringList list;
+	int pos2 = 0;
+	QRegExp rx2("(?:\"([^\"]*)\";?)|(?:([^;]*);?)");
+	if(line.size()<1){
+		list << "";		
+	}else while (line.size()>pos2 && (pos2 = rx2.indexIn(line, pos2)) != -1) {
+		QString col;
+		if(rx2.cap(1).size()>0)
+			col = rx2.cap(1);
+		else if(rx2.cap(2).size()>0)
+			col = rx2.cap(2);
+		
+		list << col;			
+
+		if(col.size())
+			pos2 += rx2.matchedLength();
+		else
+			pos2++;
+	}
+	return list;
+}
\ No newline at end of file
diff --git a/FTNoIR_Protocol_FT/csv.h b/FTNoIR_Protocol_FT/csv.h
new file mode 100644
index 00000000..13231293
--- /dev/null
+++ b/FTNoIR_Protocol_FT/csv.h
@@ -0,0 +1,38 @@
+/*dummy CSV reader for QT4*/
+/*version 0.1*/
+/*11.1.2009*/
+#ifndef CSV_H
+#define CSV_H
+
+//#include "myclass_api.h"
+
+#include <QObject>
+#include <QStringList>
+#include <QIODevice>
+#include <QTextCodec>
+#include <QRegExp>
+
+class /*MYCLASS_API*/ CSV /*: public QObject*/
+{
+	/*Q_OBJECT*/
+
+public:
+	CSV(QIODevice * device);
+	CSV(QString &string);
+	~CSV();
+
+	QString readLine();
+	QStringList parseLine();
+	static QStringList parseLine(QString line);
+
+	void setCodec(const char* codecName);
+private:
+	QIODevice *m_device;
+	QTextCodec *m_codec;
+	QString m_string;
+	int m_pos;
+	QRegExp m_rx;
+	
+};
+
+#endif // CSV_H
diff --git a/SetupFaceTrackNoIR/SetupFaceTrackNoIR.jpg b/SetupFaceTrackNoIR/SetupFaceTrackNoIR.jpg
deleted file mode 100644
index 1f110875..00000000
--- a/SetupFaceTrackNoIR/SetupFaceTrackNoIR.jpg
+++ /dev/null
diff --git a/SetupFaceTrackNoIR/msiexec.exe b/SetupFaceTrackNoIR/msiexec.exe
deleted file mode 100644
index 2ac8d19a..00000000
--- a/SetupFaceTrackNoIR/msiexec.exe
+++ /dev/null
diff --git a/faceAPI/FaceAPI2FSX.vcproj b/faceAPI/FaceAPI2FSX.vcproj
deleted file mode 100644
index 9437e3d0..00000000
--- a/faceAPI/FaceAPI2FSX.vcproj
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="FTNoIR_FaceAPI_EXE"

-	ProjectGUID="{EF743D32-0980-44D9-BA9E-B9D2456251AC}"

-	RootNamespace="TestAppConsole"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ProjectDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine=""

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-				CommandLine=""

-				Outputs=""

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="C:\Program Files\SeeingMachines\FaceTrackingAPI_NC 3.2\API\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="smft32.lib user32.lib"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\FaceAPI\bin;..\..\SimConnect"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine=""

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ProjectDir)$(ConfigurationName)"

-			IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine=""

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="&quot;D:\Program Files (x86)\SeeingMachines\FaceTrackingAPI_NC 3.2\API\include&quot;;..\FTNoIR_Tracker_Base"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="smft32.lib user32.lib"

-				OutputFile="..\bin\$(ProjectName).exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;D:\Program Files (x86)\SeeingMachines\FaceTrackingAPI_NC 3.2\API\bin&quot;"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine=""

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Headers"

-			>

-			<File

-				RelativePath=".\build_options.h"

-				>

-			</File>

-			<File

-				RelativePath="..\FTNoIR_Tracker_Base\ftnoir_tracker_sm_types.h"

-				>

-			</File>

-			<File

-				RelativePath=".\lock.h"

-				>

-			</File>

-			<File

-				RelativePath=".\lockfree.h"

-				>

-			</File>

-			<File

-				RelativePath=".\mutex.h"

-				>

-			</File>

-			<File

-				RelativePath=".\stdafx.h"

-				>

-			</File>

-			<File

-				RelativePath=".\utils.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Sources"

-			>

-			<File

-				RelativePath=".\main.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\stdafx.cpp"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>