Some minor changes to the interface. Also moved to new dev.hardware

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

2 files changed, 17 insertions, 14 deletions

diff --git a/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj b/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj
index a479811d..b174725d 100644
--- a/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj
+++ b/FTNoIR_Tracker_SM/FTNoIR_Tracker_SM.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8.00"

+	Version="8,00"

 	Name="FTNoIR_Tracker_SM"

 	ProjectGUID="{26346BCF-92A5-47A7-B4CF-73C402F7C3AD}"

 	RootNamespace="FTNoIR_Tracker_SM"

@@ -39,7 +39,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".\GeneratedFiles;&quot;$(QTDIR)\include&quot;;&quot;.\GeneratedFiles\$(ConfigurationName)&quot;;&quot;$(QTDIR)\include\qtmain&quot;;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtNetwork&quot;;&quot;$(QTDIR)\include\QtGui&quot;;.\;&quot;$(SM_API_PATH)\include&quot;;&quot;$(SM_API_CPP_WRAPPERS)\include&quot;;&quot;$(SM_API_WIDGETS)\include&quot;;&quot;$(SM_API_QTDIR)\include&quot;"

-				PreprocessorDefinitions="UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_THREAD_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;FTNOIR_TRACKER_BASE_LIB"

+				PreprocessorDefinitions="UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_THREAD_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;FTNOIR_TRACKER_BASE_LIB;QT_DLL"

 				RuntimeLibrary="2"

 				TreatWChar_tAsBuiltInType="false"

 				DebugInformationFormat="0"

@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;.\"

-				PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_THREAD_SUPPORT,QT_CORE_LIB,FTNOIR_TRACKER_SM_LIB"

+				PreprocessorDefinitions="UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_THREAD_SUPPORT,QT_CORE_LIB,FTNOIR_TRACKER_SM_LIB;QT_DLL"

 				RuntimeLibrary="3"

 				TreatWChar_tAsBuiltInType="false"

 				DebugInformationFormat="3"

@@ -186,7 +186,7 @@
 					<Tool

 						Name="VCCustomBuildTool"

 						Description="Moc&apos;ing $(InputFileName)..."

-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  &quot;$(InputPath)&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot; -D_WINDLL -DFTNOIR_TRACKER_BASE_LIB -DNDEBUG -DQT_CORE_LIB -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DUNICODE -DWIN32 -I&quot;$(QTDIR)\include\.&quot; -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;$(QTDIR)\include\qtmain\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(SM_API_CPP_WRAPPERS)\include\.&quot; -I&quot;$(SM_API_PATH)\include\.&quot; -I&quot;$(SM_API_QTDIR)\include\.&quot; -I&quot;$(SM_API_WIDGETS)\include\.&quot; -I&quot;.\.&quot; -I&quot;.\GeneratedFiles\$(ConfigurationName)\.&quot; -I&quot;.\GeneratedFiles\.&quot;&#x0D;&#x0A;"

+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_THREAD_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DFTNOIR_TRACKER_BASE_LIB -DQT_DLL -D_WINDLL  -I&quot;.\GeneratedFiles\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\GeneratedFiles\$(ConfigurationName)\.&quot; -I&quot;$(QTDIR)\include\qtmain\.&quot; -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\QtNetwork\.&quot; -I&quot;$(QTDIR)\include\QtGui\.&quot; -I&quot;.\.&quot; -I&quot;$(SM_API_PATH)\include\.&quot; -I&quot;$(SM_API_CPP_WRAPPERS)\include\.&quot; -I&quot;$(SM_API_WIDGETS)\include\.&quot; -I&quot;$(SM_API_QTDIR)\include\.&quot; &quot;.\FTNoIR_Tracker_SM.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"

 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"

 						Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"

 					/>

@@ -197,7 +197,7 @@
 					<Tool

 						Name="VCCustomBuildTool"

 						Description="Moc&apos;ing $(InputFileName)..."

-						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  &quot;$(InputPath)&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot; -D_WINDLL -DFTNOIR_TRACKER_SM_LIB -DQT_CORE_LIB -DQT_LARGEFILE_SUPPORT -DQT_THREAD_SUPPORT -DUNICODE -DWIN32 -I&quot;$(QTDIR)\include\.&quot; -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;$(QTDIR)\include\qtmain\.&quot; -I&quot;.\.&quot; -I&quot;.\GeneratedFiles\$(ConfigurationName)\.&quot; -I&quot;.\GeneratedFiles\.&quot;&#x0D;&#x0A;"

+						CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_THREAD_SUPPORT -DQT_CORE_LIB -DFTNOIR_TRACKER_SM_LIB -DQT_DLL -D_WINDLL  -I&quot;.\GeneratedFiles\.&quot; -I&quot;$(QTDIR)\include\.&quot; -I&quot;.\GeneratedFiles\$(ConfigurationName)\.&quot; -I&quot;$(QTDIR)\include\qtmain\.&quot; -I&quot;$(QTDIR)\include\QtCore\.&quot; -I&quot;.\.&quot; &quot;.\FTNoIR_Tracker_SM.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"

 						AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"

 						Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"

 					/>

@@ -306,7 +306,7 @@
 		/>

 		<Global

 			Name="QtVersion Win32"

-			Value="QT462_VS2005"

+			Value="$(DefaultQtVersion)"

 		/>

 		<Global

 			Name="RccDir"

diff --git a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp
index 5cc8d885..ed7ae426 100644
--- a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp
+++ b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp
@@ -40,7 +40,6 @@ void FTNoIR_Tracker_SM::Release()
 void FTNoIR_Tracker_SM::Initialize( QFrame *videoframe )

 {

 	qDebug() << "FTNoIR_Tracker_SM::Initialize says: Starting ";

-	loadSettings();

 

 	if (SMCreateMapping()) {

 		qDebug() << "FTNoIR_Tracker_SM::Initialize Mapping created.";

@@ -49,6 +48,8 @@ void FTNoIR_Tracker_SM::Initialize( QFrame *videoframe )
 		QMessageBox::warning(0,"FaceTrackNoIR Error","Memory mapping not created!",QMessageBox::Ok,QMessageBox::NoButton);

 	}

 

+	loadSettings();

+

 	if ( pMemData != NULL ) {

 		pMemData->command = 0;						// Reset any and all commands

 		pMemData->handle = videoframe->winId();		// Handle of Videoframe widget

@@ -158,9 +159,11 @@ 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 ( "SMTracker" );

+	if (pMemData) {

+		pMemData->initial_filter_level = iniFile.value ( "FilterLevel", 1 ).toInt();

+	}

+	iniFile.endGroup ();

 }

 

 //

@@ -359,9 +362,8 @@ void SMClientControls::loadSettings() {
 

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

 

-	iniFile.beginGroup ( "SMClient" );

-

-//	ui.spinPortNumber->setValue( iniFile.value ( "PortNumber", 5550 ).toInt() );

+	iniFile.beginGroup ( "SMTracker" );

+	ui.cbxFilterSetting->setCurrentIndex(iniFile.value ( "FilterLevel", 1 ).toInt());

 	iniFile.endGroup ();

 

 	settingsDirty = false;

@@ -377,7 +379,8 @@ void SMClientControls::save() {
 	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

 	QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)

 

-	iniFile.beginGroup ( "SMClient" );

+	iniFile.beginGroup ( "SMTracker" );

+	iniFile.setValue ( "FilterLevel", ui.cbxFilterSetting->currentIndex() );

 	iniFile.endGroup ();

 

 	settingsDirty = false;