From 3195bebe6b59b6f9dc657584570260c28d7937ec Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 13 Sep 2013 14:54:32 +0200 Subject: Allow for editing filter settings while the software is running --- ftnoir_filter_accela/ftnoir_filter_accela.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'ftnoir_filter_accela/ftnoir_filter_accela.cpp') diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp index f2306204..c2cda351 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp @@ -5,11 +5,13 @@ * copyright notice and this permission notice appear in all copies. */ #include "ftnoir_filter_accela/ftnoir_filter_accela.h" -#include "math.h" +#include #include -#include +#include #include "facetracknoir/global-settings.h" +using namespace std; + FTNoIR_Filter::FTNoIR_Filter() { first_run = true; @@ -34,6 +36,15 @@ void FTNoIR_Filter::loadSettings() { iniFile.endGroup (); } +void FTNoIR_Filter::receiveSettings(double rot, double trans, double zoom_fac) +{ + QMutexLocker foo(&mutex); + + rotation_alpha = rot; + translation_alpha = trans; + zoom_factor = zoom_fac; +} + static double parabola(const double a, const double x) { const double a1 = 1./a; @@ -56,6 +67,8 @@ void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position, first_run = false; return; } + + QMutexLocker foo(&mutex); for (int i=0;i<6;i++) { -- cgit v1.2.3