diff options
| author | Wim Vriend <facetracknoir@gmail.com> | 2012-09-05 17:30:23 +0000 |
|---|---|---|
| committer | Wim Vriend <facetracknoir@gmail.com> | 2012-09-05 17:30:23 +0000 |
| commit | 81e8f7e500bcbeb34f7844349800887eabcde305 (patch) | |
| tree | 7459457f9c899eff6a43bdcfaed8ffea71b4005c | |
| parent | 3f082dbee43e6dbdb5d88fceec49298d0d2bce18 (diff) | |
Modified 4 Arduino Tracker
git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@126 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
| -rw-r--r-- | FTNoIR_Tracker_Base/ftnoir_tracker_base.h | 3 | ||||
| -rw-r--r-- | FTNoIR_Tracker_Base/ftnoir_tracker_sm_types.h | 2 | ||||
| -rw-r--r-- | FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp | 2 | ||||
| -rw-r--r-- | FaceTrackNoIR.suo | bin | 548864 -> 587264 bytes | |||
| -rw-r--r-- | QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h | 18 | ||||
| -rw-r--r-- | QFunctionConfigurator/release/QFunctionConfigurator.dll | bin | 69632 -> 69632 bytes | |||
| -rw-r--r-- | QFunctionConfigurator/release/QFunctionConfigurator.exp | bin | 17180 -> 17230 bytes | |||
| -rw-r--r-- | QFunctionConfigurator/release/QFunctionConfigurator.lib | bin | 30108 -> 30168 bytes |
8 files changed, 13 insertions, 12 deletions
diff --git a/FTNoIR_Tracker_Base/ftnoir_tracker_base.h b/FTNoIR_Tracker_Base/ftnoir_tracker_base.h index e2585ecf..022bf2e3 100644 --- a/FTNoIR_Tracker_Base/ftnoir_tracker_base.h +++ b/FTNoIR_Tracker_Base/ftnoir_tracker_base.h @@ -41,7 +41,8 @@ // Instances are obtained via factory function.
struct ITracker
{
- virtual void Release() = 0; // Member required to enable Auto-remove
+ virtual ~ITracker() {};
+// virtual void Release() = 0; // Member required to enable Auto-remove
virtual void Initialize( QFrame *videoframe ) = 0;
virtual void StartTracker( HWND parent_window ) = 0;
virtual void StopTracker(bool exit) = 0;
diff --git a/FTNoIR_Tracker_Base/ftnoir_tracker_sm_types.h b/FTNoIR_Tracker_Base/ftnoir_tracker_sm_types.h index 1767cb94..a8802e4a 100644 --- a/FTNoIR_Tracker_Base/ftnoir_tracker_sm_types.h +++ b/FTNoIR_Tracker_Base/ftnoir_tracker_sm_types.h @@ -5,7 +5,7 @@ static const char* SM_MM_DATA = "SM_SharedMem"; static const char* SM_FACEAPI = "SM_FaceAPI";
static const char* SM_MUTEX = "SM_Mutex";
-#include "sm_api.h"
+#include <sm_api.h>
struct TFaceData {
int DataID;
diff --git a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp index c9b3bc0b..14dd1d96 100644 --- a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp +++ b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi.cpp @@ -35,7 +35,7 @@ FTNoIR_Tracker::FTNoIR_Tracker() FTNoIR_Tracker::~FTNoIR_Tracker()
{
- qDebug() << "stopTracker says: terminating";
+ qDebug() << "~FTNoIR_Tracker says: cleaning up";
if ( pMemData != NULL ) {
UnmapViewOfFile ( pMemData );
diff --git a/FaceTrackNoIR.suo b/FaceTrackNoIR.suo Binary files differindex 8925fbfd..0e5e4c30 100644 --- a/FaceTrackNoIR.suo +++ b/FaceTrackNoIR.suo diff --git a/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h b/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h index c96b0f55..48b816ca 100644 --- a/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h +++ b/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h @@ -120,9 +120,9 @@ public: ~QFunctionConfigurator();
FunctionConfig* config();
- void setConfig(FunctionConfig* config); // Connect the FunctionConfig to the Widget.
- void loadSettings(QSettings& settings); // Load the FunctionConfig (points) from the INI-file
- void saveSettings(QSettings& settings); // Save the FunctionConfig (points) to the INI-file
+ void setConfig(FunctionConfig* config, QString settingsFile); // Connect the FunctionConfig to the Widget.
+ void loadSettings(QString settingsFile); // Load the FunctionConfig (points) from the INI-file
+ void saveSettings(QString settingsFile); // Save the FunctionConfig (points) to the INI-file
signals:
void CurveChanged(bool);
@@ -142,8 +142,8 @@ public slots: void setCaption(QString);
void resetCurve() {
- QSettings iniFile( strSettingsFile, QSettings::IniFormat ); // Application settings (in INI-file)
- loadSettings( iniFile );
+ qDebug() << "QFunctionConfigurator::resetCurve = " << strSettingsFile;
+ loadSettings( strSettingsFile );
}
protected slots:
@@ -165,10 +165,10 @@ protected: virtual void resizeEvent(QResizeEvent *);
private:
- QRectF range; // The actual rectangle for the Bezier-curve
- QPointF lastPoint; // The right-most point of the Function
- QPointF normalizePoint (QPointF point) const; // Convert the graphical Point to a real-life Point
- QPointF graphicalizePoint (QPointF point) const; // Convert the Point to a graphical Point
+ QRectF range; // The actual rectangle for the Bezier-curve
+ QPointF lastPoint; // The right-most point of the Function
+ QPointF normalizePoint (QPointF point) const; // Convert the graphical Point to a real-life Point
+ QPointF graphicalizePoint (QPointF point, QString source) const; // Convert the Point to a graphical Point
QPointF *moving;
int movingPoint;
diff --git a/QFunctionConfigurator/release/QFunctionConfigurator.dll b/QFunctionConfigurator/release/QFunctionConfigurator.dll Binary files differindex 008bdc0b..8fbdf805 100644 --- a/QFunctionConfigurator/release/QFunctionConfigurator.dll +++ b/QFunctionConfigurator/release/QFunctionConfigurator.dll diff --git a/QFunctionConfigurator/release/QFunctionConfigurator.exp b/QFunctionConfigurator/release/QFunctionConfigurator.exp Binary files differindex cd05cbd2..b1d0e01b 100644 --- a/QFunctionConfigurator/release/QFunctionConfigurator.exp +++ b/QFunctionConfigurator/release/QFunctionConfigurator.exp diff --git a/QFunctionConfigurator/release/QFunctionConfigurator.lib b/QFunctionConfigurator/release/QFunctionConfigurator.lib Binary files differindex b102f3be..c41801d4 100644 --- a/QFunctionConfigurator/release/QFunctionConfigurator.lib +++ b/QFunctionConfigurator/release/QFunctionConfigurator.lib |