From 292740d183ee6970e7241c822e707ffad7e670f5 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Sat, 5 Jan 2013 11:46:43 +0000 Subject: Fixed engine-status display when EXIT is done. git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@205 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Tracker_SM/ftnoir_tracker_faceapi_dialog.cpp | 2 ++ faceAPI/main.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi_dialog.cpp b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi_dialog.cpp index e334f932..5c422402 100644 --- a/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi_dialog.cpp +++ b/FTNoIR_Tracker_SM/ftnoir_tracker_faceapi_dialog.cpp @@ -38,6 +38,7 @@ QWidget() ui.setupUi( this ); theTracker = NULL; + prev_state = -1; // Connect Qt signals to member-functions connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK())); @@ -107,6 +108,7 @@ void TrackerControls::doOK() { // override show event void TrackerControls::showEvent ( QShowEvent * event ) { + prev_state = -1; loadSettings(); } diff --git a/faceAPI/main.cpp b/faceAPI/main.cpp index 9545c091..46732cb3 100644 --- a/faceAPI/main.cpp +++ b/faceAPI/main.cpp @@ -3,7 +3,7 @@ * gamers from Holland, who don't like to pay much for * * head-tracking. * * * -* Copyright (C) 2011 Wim Vriend (Developing) * +* Copyright (C) 2013 Wim Vriend (Developing) * * Ron Hendriks (Researching and Testing) * * * * Homepage * @@ -23,6 +23,7 @@ *********************************************************************************/ /* Modifications (last one on top): + 20130105 - WVR: Set engine state to TERMINATED, when EXIT. 20110501 - WVR: Added some command to be handled from FaceTrackNoIR (settings dialog). 20110322 - WVR: Somehow the video-widget of faceAPI version 3.2.6. does not work with FaceTrackNoIR (Qt issue?!). To be able to use @@ -421,6 +422,7 @@ void run() THROW_ON_ERROR(smEngineStop(engine_handle)); // Stop tracking stopCommand = TRUE; pMemData->command = 0; // Reset + pMemData->state = SM_API_ENGINE_STATE_TERMINATED; // One last update, before quitting... break; case FT_SM_SET_PAR_FILTER: -- cgit v1.2.3