Changed filling protocol Listbox to match the Filter and Tracker.

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

10 files changed, 180 insertions, 211 deletions

diff --git a/FaceTrackNoIR/FaceTrackNoIR.cpp b/FaceTrackNoIR/FaceTrackNoIR.cpp
index bb078b07..afa5f9ef 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.cpp
+++ b/FaceTrackNoIR/FaceTrackNoIR.cpp
@@ -23,7 +23,9 @@
 *********************************************************************************/

 /*

 	Modifications (last one on top):

-		20120317 - WVR: The Filter and Tracker-code was moved to separate DLL's. The calling-method

+		20120427 - WVR: The Protocol-code was already in separate DLLs, but the ListBox was still filled ´statically´. Now, a Dir() of the

+						EXE-folder is done, to locate Protocol-DLLs. The Icons were also moved to the DLLs

+		20120317 - WVR: The Filter and Tracker-code was moved to separate DLLs. The calling-method

 						was changed accordingly. The save() and LoadSettings() functions were adapted.

 						The face-tracker member-functions NotifyZeroed and refreshVideo were added, as 

 						requested by Stanislaw.

@@ -154,9 +156,9 @@ void FaceTrackNoIR::setupFaceTrackNoIR() {
 	loadSettings();

 	trayIcon->show();

 

+	connect(ui.iconcomboProtocol, SIGNAL(currentIndexChanged(int)), this, SLOT(protocolSelected(int)));

 	connect(ui.iconcomboProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(profileSelected(int)));

 	connect(ui.iconcomboTrackerSource, SIGNAL(currentIndexChanged(int)), this, SLOT(trackingSourceSelected(int)));

-	connect(ui.iconcomboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setIcon(int)));

 	connect(ui.iconcomboFilter, SIGNAL(currentIndexChanged(int)), this, SLOT(filterSelected(int)));

 

 	//Setup the timer for automatically minimizing after StartTracker.

@@ -228,6 +230,14 @@ QFrame *FaceTrackNoIR::getVideoWidget() {
 }

 

 //

+// Return the name of the Protocol-DLL

+//

+QString FaceTrackNoIR::getCurrentProtocolName()

+{

+	return protocolFileList.at(ui.iconcomboProtocol->currentIndex());

+}

+

+//

 // Return the name of the Filter-DLL

 //

 QString FaceTrackNoIR::getCurrentFilterName()

@@ -356,7 +366,8 @@ void FaceTrackNoIR::save() {
 	iniFile.endGroup ();

 

 	iniFile.beginGroup ( "GameProtocol" );

-	iniFile.setValue ( "Selection", ui.iconcomboBox->currentIndex() );

+	iniFile.setValue ( "Selection", ui.iconcomboProtocol->currentIndex() );

+	iniFile.setValue ( "DLL", getCurrentProtocolName() );

 	iniFile.endGroup ();

 

 	iniFile.beginGroup ( "TrackerSource" );

@@ -481,18 +492,73 @@ void FaceTrackNoIR::loadSettings() {
 

 	iniFile.endGroup ();

 

+	//

+	// Read the currently selected Protocol from the INI-file.

+	// If the setting "DLL" isn't found (pre-1.7 version of INI), then the setting 'Selection' is evaluated.

+	//

 	iniFile.beginGroup ( "GameProtocol" );

-	ui.iconcomboBox->setCurrentIndex(iniFile.value ( "Selection", 0 ).toInt());

-	setIcon( ui.iconcomboBox->currentIndex() );

+

+	QString selectedProtocolName = iniFile.value ( "DLL", "" ).toString();

+	qDebug() << "loadSettings says: selectedProtocolName = " << selectedProtocolName;

+

+	if (selectedProtocolName.length() == 0) {

+		int index = iniFile.value ( "Selection", 0 ).toInt();

+		switch ( index ) {

+			case FREE_TRACK:

+				selectedProtocolName = QString("FTNoIR_Protocol_FT.dll");

+				break;

+

+			case SIMCONNECT:

+				selectedProtocolName = QString("FTNoIR_Protocol_SC.dll");

+				break;

+

+			case PPJOY:

+				selectedProtocolName = QString("FTNoIR_Protocol_PPJOY.dll");

+				break;

+

+			case FSUIPC:

+				selectedProtocolName = QString("FTNoIR_Protocol_FSUIPC.dll");

+				break;

+

+			case TRACKIR:

+				selectedProtocolName = QString("FTNoIR_Protocol_FTIR.dll");

+				break;

+

+			case FLIGHTGEAR:

+				selectedProtocolName = QString("FTNoIR_Protocol_FG.dll");

+				break;

+

+			case FTNOIR:

+				selectedProtocolName = QString("FTNoIR_Protocol_FTN.dll");

+				break;

+

+			case MOUSE:

+				selectedProtocolName = QString("FTNoIR_Protocol_MOUSE.dll");

+				break;

+

+			default:

+				selectedProtocolName = QString("FTNoIR_Protocol_MOUSE.dll");

+				break;

+		}

+	}

 	iniFile.endGroup ();

 

+	disconnect(ui.iconcomboProtocol, SIGNAL(currentIndexChanged(int)), this, SLOT(protocolSelected(int)));

+	for ( int i = 0; i < protocolFileList.size(); i++) {

+		if (protocolFileList.at(i) == selectedProtocolName) {

+			ui.iconcomboProtocol->setCurrentIndex( i );

+		}

+	}

+	connect(ui.iconcomboProtocol, SIGNAL(currentIndexChanged(int)), this, SLOT(protocolSelected(int)));

+	protocolSelected( ui.iconcomboProtocol->currentIndex() );

+

 	//

 	// Read the currently selected Tracker from the INI-file.

 	// If the setting "DLL" isn't found (pre-1.7 version), then the setting 'Selection' is evaluated.

 	//

 	iniFile.beginGroup ( "TrackerSource" );

 	QString selectedTrackerName = iniFile.value ( "DLL", "" ).toString();

-	qDebug() << "createIconGroupBox says: selectedTrackerName = " << selectedTrackerName;

+	qDebug() << "loadSettings says: selectedTrackerName = " << selectedTrackerName;

 	if (selectedTrackerName.length() == 0) {

 		int index = iniFile.value ( "Selection", 0 ).toInt();

 		switch ( index ) {

@@ -571,7 +637,7 @@ void FaceTrackNoIR::startTracker( ) {
 	//

 	// Create the Tracker and setup

 	//

-	tracker = new Tracker ( ui.iconcomboBox->currentIndex(), ui.iconcomboTrackerSource->currentIndex(), this );

+	tracker = new Tracker ( this );

 

 	//

 	// Setup the Tracker and send the settings.

@@ -610,7 +676,7 @@ void FaceTrackNoIR::startTracker( ) {
 

 	// Enable/disable Protocol-server Settings

 	ui.iconcomboTrackerSource->setEnabled ( false );

-	ui.iconcomboBox->setEnabled ( false );

+	ui.iconcomboProtocol->setEnabled ( false );

 	ui.btnShowServerControls->setEnabled ( false );

 	ui.iconcomboFilter->setEnabled ( false );

 

@@ -698,7 +764,7 @@ void FaceTrackNoIR::stopTracker( ) {
 	ui.btnStartTracker->setEnabled ( true );

 	ui.btnStopTracker->setEnabled ( false );

 //	ui.btnShowEngineControls->setEnabled ( false );

-	ui.iconcomboBox->setEnabled ( true );

+	ui.iconcomboProtocol->setEnabled ( true );

 	ui.iconcomboTrackerSource->setEnabled ( true );

 	ui.iconcomboFilter->setEnabled ( true );

 

@@ -858,20 +924,6 @@ QString libName;
 	libName.clear();

 	libName = getCurrentTrackerName();

 

-	//switch (ui.iconcomboTrackerSource->currentIndex()) {

-	//	case FT_SM_FACEAPI:										// Face API

-	//		qDebug() << "FaceTrackNoIR::showEngineControls case FT_SM_FACEAPI.";

-	//		break;

-

-	//	case FT_FTNOIR:											// FTNoir server

-	//		qDebug() << "FaceTrackNoIR::showEngineControls case FT_FTNOIR.";

-	//		libName = QString("FTNoIR_Tracker.dll");

-	//		break;

-

-	//	default:

-	//		break;

-	//}

-

 	//

 	// Load the Server-settings dialog (if any) and show it.

 	//

@@ -915,38 +967,7 @@ QString libName;
 

 	// Show the appropriate Protocol-server Settings

 	libName.clear();

-	switch (ui.iconcomboBox->currentIndex()) {

-	case FREE_TRACK:

-	case SIMCONNECT:

-		break;

-

-	case PPJOY:

-		libName = QString("FTNoIR_Protocol_PPJOY.dll");

-		break;

-

-	case FSUIPC:

-		libName = QString("FTNoIR_Protocol_FSUIPC.dll");

-		break;

-

-	case TRACKIR:

-		libName = QString("FTNoIR_Protocol_FTIR.dll");

-		break;

-

-	case FLIGHTGEAR:

-		libName = QString("FTNoIR_Protocol_FG.dll");

-		break;

-

-	case FTNOIR:

-		libName = QString("FTNoIR_Protocol_FTN.dll");

-		break;

-

-	case MOUSE:

-		libName = QString("FTNoIR_Protocol_MOUSE.dll");

-		break;

-

-	default:

-		break;

-    }

+	libName = getCurrentProtocolName();

 

 	//

 	// Load the Server-settings dialog (if any) and show it.

@@ -1076,31 +1097,75 @@ void FaceTrackNoIR::exit() {
 //

 void FaceTrackNoIR::createIconGroupBox()

 {

+importGetProtocolDialog getProtocol;

 importGetFilterDialog getFilter;

 importGetTrackerDialog getTracker;

-QLibrary *filterLib;

-QString *filterName;

-QIcon *filterIcon;

+//QLibrary *filterLib;

+//QString *filterName;

+//QIcon *filterIcon;

 

 	QSettings settings("Abbequerque Inc.", "FaceTrackNoIR");	// Registry settings (in HK_USER)

 

 	QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/Settings/default.ini" ).toString();

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

 

-	ui.iconcomboBox->addItem(QIcon(":/images/Freetrack.ico"), tr("Freetrack"));

-	ui.iconcomboBox->addItem(QIcon(":/images/FlightGear.ico"), tr("FlightGear"));

-	ui.iconcomboBox->addItem(QIcon(":/images/FaceTrackNoIR.ico"), tr("FTNoir client"));

-	ui.iconcomboBox->addItem(QIcon(":/images/PPJoy.ico"), tr("Virtual Joystick"));

-	ui.iconcomboBox->addItem(QIcon(":/images/TrackIR.ico"), tr("Fake TrackIR"));

-	ui.iconcomboBox->addItem(QIcon(":/images/FSX.ico"), tr("SimConnect (FSX)"));

-	ui.iconcomboBox->addItem(QIcon(":/images/FS9.ico"), tr("FS2002/FS2004"));

-	ui.iconcomboBox->addItem(QIcon(":/images/Mouse.ico"), tr("Mouse look"));

-

 	//

 	// Get a List of all the Filter-DLL-files in the Program-folder.

 	//

 	QDir settingsDir( QCoreApplication::applicationDirPath() );

     QStringList filters;

+    filters.clear();

+    filters << "FTNoIR_Protocol_*.dll";

+	protocolFileList.clear();

+	protocolFileList = settingsDir.entryList( filters, QDir::Files, QDir::Name );

+

+	//

+	// Add strings to the Listbox.

+	//

+	disconnect(ui.iconcomboProtocol, SIGNAL(currentIndexChanged(int)), this, SLOT(protocolSelected(int)));

+	ui.iconcomboProtocol->clear();

+	for ( int i = 0; i < protocolFileList.size(); i++) {

+

+		qDebug() << "createIconGroupBox says: ProtocolName = " << protocolFileList.at(i);

+

+		//

+		// Delete the existing QDialog

+		//

+		if (pProtocolDialog) {

+			pProtocolDialog.Release();

+		}

+

+		// Show the appropriate Protocol-server Settings

+		QLibrary *protocolLib = new QLibrary(protocolFileList.at(i));

+		QString *protocolName = new QString("");

+		QIcon *protocolIcon = new QIcon();

+

+		getProtocol = (importGetProtocolDialog) protocolLib->resolve("GetProtocolDialog");

+		if (getProtocol) {

+			IProtocolDialogPtr ptrXyz(getProtocol());

+			if (ptrXyz)

+			{

+				pProtocolDialog = ptrXyz;

+				pProtocolDialog->getFullName( protocolName );

+				pProtocolDialog->getIcon( protocolIcon );

+				qDebug() << "FaceTrackNoIR::showServerControls GetProtocolDialog Function Resolved!";

+			}

+			else {

+				qDebug() << "FaceTrackNoIR::showServerControls Function NOT Resolved!";

+			}	

+		}

+		else {

+			QMessageBox::warning(0,"FaceTrackNoIR Error", "Protocol-DLL not loaded, please check if the DLL is version 1.7",QMessageBox::Ok,QMessageBox::NoButton);

+		}

+

+		ui.iconcomboProtocol->addItem(*protocolIcon, *protocolName );

+	}

+	connect(ui.iconcomboProtocol, SIGNAL(currentIndexChanged(int)), this, SLOT(protocolSelected(int)));

+

+	//

+	// Get a List of all the Filter-DLL-files in the Program-folder.

+	//

+    filters.clear();

     filters << "FTNoIR_Filter_*.dll";

 	filterFileList.clear();

 	filterFileList = settingsDir.entryList( filters, QDir::Files, QDir::Name );

@@ -1122,9 +1187,9 @@ QIcon *filterIcon;
 		}

 

 		// Show the appropriate Protocol-server Settings

-		filterLib = new QLibrary(filterFileList.at(i));

-		filterName = new QString("");

-		filterIcon = new QIcon();

+		QLibrary *filterLib = new QLibrary(filterFileList.at(i));

+		QString *filterName = new QString("");

+		QIcon *filterIcon = new QIcon();

 

 		getFilter = (importGetFilterDialog) filterLib->resolve("GetFilterDialog");

 		if (getFilter) {

@@ -1173,18 +1238,18 @@ QIcon *filterIcon;
 		}

 

 		// Show the appropriate Protocol-server Settings

-		filterLib = new QLibrary(trackerFileList.at(i));

-		filterName = new QString("");

-		filterIcon = new QIcon();

+		QLibrary *trackerLib = new QLibrary(trackerFileList.at(i));

+		QString *trackerName = new QString("");

+		QIcon *trackerIcon = new QIcon();

 

-		getTracker = (importGetTrackerDialog) filterLib->resolve("GetTrackerDialog");

+		getTracker = (importGetTrackerDialog) trackerLib->resolve("GetTrackerDialog");

 		if (getTracker) {

 			ITrackerDialogPtr ptrXyz(getTracker());

 			if (ptrXyz)

 			{

 				pTrackerDialog = ptrXyz;

-				pTrackerDialog->getFullName( filterName );

-				pTrackerDialog->getIcon( filterIcon );

+				pTrackerDialog->getFullName( trackerName );

+				pTrackerDialog->getIcon( trackerIcon );

 				qDebug() << "FaceTrackNoIR::showServerControls GetTrackerDialog Function Resolved!";

 			}

 			else {

@@ -1195,7 +1260,7 @@ QIcon *filterIcon;
 			QMessageBox::warning(0,"FaceTrackNoIR Error", "Facetracker-DLL not loaded, please check if the DLL is version 1.7",QMessageBox::Ok,QMessageBox::NoButton);

 		}

 

-		ui.iconcomboTrackerSource->addItem(*filterIcon, *filterName );

+		ui.iconcomboTrackerSource->addItem(*trackerIcon, *trackerName );

 	}

 	connect(ui.iconcomboTrackerSource, SIGNAL(currentIndexChanged(int)), this, SLOT(trackingSourceSelected(int)));

 

@@ -1240,45 +1305,6 @@ void FaceTrackNoIR::createTrayIcon()
 }

 

 //

-// Set the Tray icon, using the Game-protocol combobox as source

-//

-void FaceTrackNoIR::setIcon(int index)

-{

-    QIcon icon = ui.iconcomboBox->itemIcon(index);

-	if (trayIcon != 0) {

-		trayIcon->setIcon(icon);

-	    trayIcon->setToolTip(ui.iconcomboBox->itemText(index));

-		trayIcon->show();

-		trayIcon->showMessage( "FaceTrackNoIR", ui.iconcomboBox->itemText(index));

-	}

-	setWindowIcon(QIcon(":/images/FaceTrackNoIR.ico"));

-	ui.btnShowServerControls->setIcon(icon);

-

-	settingsDirty = true;

-

-	// Enable/disable Protocol-server Settings

-	switch (ui.iconcomboBox->currentIndex()) {

-	case FREE_TRACK:

-	case SIMCONNECT:

-		ui.btnShowServerControls->hide();

-		break;

-	case PPJOY:

-	case FSUIPC:

-	case TRACKIR:

-	case FLIGHTGEAR:

-	case FTNOIR:

-	case MOUSE:

-		ui.btnShowServerControls->show();

-		ui.btnShowServerControls->setEnabled ( true );

-		break;

-

-	default:

-		break;

-	}

-

-}

- 

-//

 // Handle SystemTray events

 //

 void FaceTrackNoIR::iconActivated(QSystemTrayIcon::ActivationReason reason)

@@ -1286,8 +1312,8 @@ void FaceTrackNoIR::iconActivated(QSystemTrayIcon::ActivationReason reason)
      switch (reason) {

      case QSystemTrayIcon::Trigger:

      case QSystemTrayIcon::DoubleClick:

-         //ui.iconcomboBox->setCurrentIndex((ui.iconcomboBox->currentIndex() + 1)

-         //                              % ui.iconcomboBox->count());

+         //ui.iconcomboProtocol->setCurrentIndex((ui.iconcomboProtocol->currentIndex() + 1)

+         //                              % ui.iconcomboProtocol->count());

          break;

      ////case QSystemTrayIcon::MiddleClick:

      ////    showMessage();

@@ -1298,23 +1324,34 @@ void FaceTrackNoIR::iconActivated(QSystemTrayIcon::ActivationReason reason)
  }

 

 //

+// Handle changes of the Protocol selection

+//

+void FaceTrackNoIR::protocolSelected(int index)

+{

+	settingsDirty = true;

+	ui.btnShowServerControls->setEnabled ( true );

+

+	//

+	// Set the Icon for the tray and update the Icon for the Settings button.

+	//

+	QIcon icon = ui.iconcomboProtocol->itemIcon(index);

+	if (trayIcon != 0) {

+		trayIcon->setIcon(icon);

+	    trayIcon->setToolTip(ui.iconcomboProtocol->itemText(index));

+		trayIcon->show();

+		trayIcon->showMessage( "FaceTrackNoIR", ui.iconcomboProtocol->itemText(index));

+	}

+	setWindowIcon(QIcon(":/images/FaceTrackNoIR.ico"));

+	ui.btnShowServerControls->setIcon(icon);

+}

+

+//

 // Handle changes of the Tracking Source selection

 //

 void FaceTrackNoIR::trackingSourceSelected(int index)

 {

 	settingsDirty = true;

-	//switch ( index ) {

-	//	case FT_SM_FACEAPI:										// Face API

-	//		ui.btnShowEngineControls->setEnabled ( false );

-	//		break;

-	//	case FT_FTNOIR:											// FTNoir server

-	//		ui.video_frame->hide();

-	//		ui.headPoseWidget->show();

 	ui.btnShowEngineControls->setEnabled ( true );

-	//		break;

-	//	default:

-	//		break;

-	//}

 }

 

 //

diff --git a/FaceTrackNoIR/FaceTrackNoIR.h b/FaceTrackNoIR/FaceTrackNoIR.h
index 1bc2d7b7..ace9c666 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.h
+++ b/FaceTrackNoIR/FaceTrackNoIR.h
@@ -78,6 +78,7 @@ public:
 	void updateSettings();						// Update the settings (let Tracker read INI-file).

 

 	QFrame *getVideoWidget();					// Get a pointer to the video-widget, to use in the DLL

+	QString getCurrentProtocolName();			// Get the name of the selected protocol

 	QString getCurrentFilterName();				// Get the name of the selected filter

 	QString getCurrentTrackerName();			// Get the name of the selected face-tracker

 

@@ -87,6 +88,7 @@ private:
 	QTimer *timMinimizeFTN;						// Timer to Auto-minimize

 	QTimer *timUpdateHeadPose;					// Timer to display headpose

 	QStringList iniFileList;					// List of INI-files, that are present in the Settings folder

+	QStringList protocolFileList;				// List of Protocol-DLL-files, that are present in the program-folder

 	QStringList filterFileList;					// List of Filter-DLL-files, that are present in the program-folder

 	QStringList trackerFileList;				// List of Tracker-DLL-files, that are present in the program-folder

 

@@ -137,11 +139,12 @@ private:
 		void openurl_donation();

 		void about();

 

-		void setIcon(int index);

+//		void setIcon(int index);

 		void iconActivated(QSystemTrayIcon::ActivationReason reason);

-		void trackingSourceSelected(int index);

 		void profileSelected(int index);

+		void protocolSelected(int index);

 		void filterSelected(int index);

+		void trackingSourceSelected(int index);

 

 		void showVideoWidget();

 		void showHeadPoseWidget();

diff --git a/FaceTrackNoIR/FaceTrackNoIR.qrc b/FaceTrackNoIR/FaceTrackNoIR.qrc
index bc1b34f4..32169124 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.qrc
+++ b/FaceTrackNoIR/FaceTrackNoIR.qrc
@@ -6,15 +6,8 @@
         <file>UIElements/Curves.png</file>
         <file>images/rotation_DOFs.png</file>
         <file>images/translation_DOFs.png</file>
-        <file>images/FlightGear.ico</file>
         <file>images/330px-6DOF_en.png</file>
-        <file>images/Freetrack.ico</file>
         <file>images/FaceTrackNoIR.ico</file>
-        <file>images/Mouse.ico</file>
-        <file>images/FS9.ico</file>
-        <file>images/FSX.ico</file>
-        <file>images/PPJoy.ico</file>
-        <file>images/TrackIR.ico</file>
         <file>UIElements/aboutFaceTrackNoIR.png</file>
     </qresource>
 </RCC>
diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui
index 3e367e4e..d670efea 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.ui
+++ b/FaceTrackNoIR/FaceTrackNoIR.ui
@@ -1937,7 +1937,7 @@ background:none;</string>
                <property name="title">

                 <string>Game protocol</string>

                </property>

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

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

                 <property name="geometry">

                  <rect>

                   <x>10</x>

@@ -2221,7 +2221,7 @@ background:none;</string>
   <tabstop>btnStartTracker</tabstop>

   <tabstop>btnStopTracker</tabstop>

   <tabstop>btnShowEngineControls</tabstop>

-  <tabstop>iconcomboBox</tabstop>

+  <tabstop>iconcomboProtocol</tabstop>

  </tabstops>

  <resources>

   <include location="FaceTrackNoIR.qrc"/>

diff --git a/FaceTrackNoIR/images/FlightGear.ico b/FaceTrackNoIR/images/FlightGear.ico
deleted file mode 100644
index f96c0f88..00000000
--- a/FaceTrackNoIR/images/FlightGear.ico
+++ /dev/null
diff --git a/FaceTrackNoIR/images/Freetrack.ico b/FaceTrackNoIR/images/Freetrack.ico
deleted file mode 100644
index 02554c3d..00000000
--- a/FaceTrackNoIR/images/Freetrack.ico
+++ /dev/null
diff --git a/FaceTrackNoIR/images/PPJoy.ico b/FaceTrackNoIR/images/PPJoy.ico
deleted file mode 100644
index f94f8d65..00000000
--- a/FaceTrackNoIR/images/PPJoy.ico
+++ /dev/null
diff --git a/FaceTrackNoIR/images/TrackIR.ico b/FaceTrackNoIR/images/TrackIR.ico
deleted file mode 100644
index 99e02e7b..00000000
--- a/FaceTrackNoIR/images/TrackIR.ico
+++ /dev/null
diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp
index e529b243..49417733 100644
--- a/FaceTrackNoIR/tracker.cpp
+++ b/FaceTrackNoIR/tracker.cpp
@@ -23,7 +23,9 @@
 *********************************************************************************/

 /*

 	Modifications (last one on top):

-		20120317 - WVR: The Filter and Tracker-code was moved to separate DLL's. The calling-method

+		20120427 - WVR: The Protocol-code was already in separate DLLs, but the ListBox was still filled ´statically´. Now, a Dir() of the

+						EXE-folder is done, to locate Protocol-DLLs. The Icons were also moved to the DLLs

+		20120317 - WVR: The Filter and Tracker-code was moved to separate DLLs. The calling-method

 						was changed accordingly.

 						The face-tracker member-functions NotifyZeroed and refreshVideo were added, as 

 						requested by Stanislaw.

@@ -108,7 +110,7 @@ IFilterPtr Tracker::pFilter;							// Pointer to Filter instance (in DLL)
 

 

 /** constructor **/

-Tracker::Tracker( int clientID, int facetrackerID, FaceTrackNoIR *parent ) {

+Tracker::Tracker( FaceTrackNoIR *parent ) {

 QString libName;

 importGetTracker getIT;

 QLibrary *trackerLib;

@@ -121,11 +123,6 @@ QFrame *video_frame;
 	// Retieve the pointer to the parent

 	mainApp = parent;

 

-	// Remember the selected client, from the ListBox

-	// If the Tracker runs, this can NOT be changed...

-	selectedClient = (FTNoIR_Client) clientID;

-//	selectedTracker = (FTNoIR_Face_Tracker) facetrackerID;

-

 	// Create events

 	m_StopThread = CreateEvent(0, TRUE, FALSE, 0);

 	m_WaitThread = CreateEvent(0, TRUE, FALSE, 0);

@@ -149,26 +146,6 @@ QFrame *video_frame;
 	video_frame = mainApp->getVideoWidget();

 	qDebug() << "Tracker::setup VideoFrame = " << video_frame;

 

-	////

-	//// Select the Tracker-engine DLL

-	////

-	//switch (selectedTracker) {

-	//	case FT_SM_FACEAPI:

-	//		libName = QString("FTNoIR_Tracker_SM.dll");

-	//		break;

-

-	//	case FT_FTNOIR:

-	//		libName = QString("FTNoIR_Tracker_UDP.dll");

-	//		break;

-

-	//	case FT_VISAGE:

-	//		libName = QString("FTNoIR_Tracker_Visage.dll");

-	//		break;

-

-	//	default:

-	//		break;

-	//}

-

 	//

 	// Load the Tracker-engine DLL, get the tracker-class from it and do stuff...

 	//

@@ -192,50 +169,9 @@ QFrame *video_frame;
 	}

 

 	//

-	// Initialize all server-handles. Only start the server, that was selected in the GUI.

-	//

-	libName.clear();

-	switch (selectedClient) {

-		case FREE_TRACK:

-			libName = QString("FTNoIR_Protocol_FT.dll");

-			break;

-

-		case FLIGHTGEAR:

-			libName = QString("FTNoIR_Protocol_FG.dll");

-			break;

-

-		case FTNOIR:

-			libName = QString("FTNoIR_Protocol_FTN.dll");

-			break;

-

-		case PPJOY:

-			libName = QString("FTNoIR_Protocol_PPJOY.dll");

-			break;

-

-		case TRACKIR:

-			libName = QString("FTNoIR_Protocol_FTIR.dll");

-			break;

-

-		case SIMCONNECT:

-			libName = QString("FTNoIR_Protocol_SC.dll");

-			break;

-

-		case FSUIPC:

-			libName = QString("FTNoIR_Protocol_FSUIPC.dll");

-			break;

-

-		case MOUSE:

-			libName = QString("FTNoIR_Protocol_MOUSE.dll");

-			break;

-

-		default:

-			// should never be reached

-		break;

-	}

-

-	//

 	// Load the DLL with the protocol-logic and retrieve a pointer to the Protocol-class.

 	//

+	libName = mainApp->getCurrentProtocolName();

 	if (!libName.isEmpty()) {

 		protocolLib = new QLibrary(libName);

 		getProtocol = (importGetProtocol) protocolLib->resolve("GetProtocol");

diff --git a/FaceTrackNoIR/tracker.h b/FaceTrackNoIR/tracker.h
index fa0c5111..a69218a1 100644
--- a/FaceTrackNoIR/tracker.h
+++ b/FaceTrackNoIR/tracker.h
@@ -147,7 +147,7 @@ private:
 	HANDLE m_StopThread;

 	HANDLE m_WaitThread;

 

-	FTNoIR_Client selectedClient;

+//	FTNoIR_Client selectedClient;

 //	FTNoIR_Face_Tracker selectedTracker;

 

 	static T6DOF current_camera;					// Used for filtering

@@ -204,7 +204,7 @@ protected:
 	void run();

 

 public:

-	Tracker( int clientID, int facetrackerID, FaceTrackNoIR *parent );

+	Tracker( FaceTrackNoIR *parent );

 	~Tracker();

 

 	void setup();