From 0f9c7c2c42b4e32e7690d5a685bf6fc0ae36a777 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 1 Aug 2013 19:07:23 +0200 Subject: Default to 1k 'reduction factor' in Accela, as per polling interval --- ftnoir_filter_accela/ftnoir_filter_accela.cpp | 6 +++--- ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp index 0eb7ea7b..0aea2f78 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp @@ -25,7 +25,7 @@ FTNoIR_Filter::FTNoIR_Filter() : translationFunctionConfig("Accela-Scaling-Translation", 10, 10) { first_run = true; - kMagicNumber = 100.0f; + kMagicNumber = 1000; loadSettings(); // Load the Settings } @@ -44,7 +44,7 @@ void FTNoIR_Filter::loadSettings() { translationFunctionConfig.loadSettings(iniFile); iniFile.beginGroup ( "Accela" ); - kMagicNumber = iniFile.value ( "Reduction", 100 ).toFloat(); + kMagicNumber = iniFile.value ( "Reduction", 1000 ).toFloat(); kZoomSlowness = iniFile.value("zoom-slowness", 0).toFloat(); iniFile.endGroup (); } @@ -108,7 +108,7 @@ void FTNoIR_Filter::FilterHeadPoseData(double *current_camera_position, // useful for filtering, as skipping them would result in jerky output. // the magic "100" is the amount of calls to the filter by FTNOIR per sec. // WVR: Added kMagicNumber for Patrick - double velocity = foo / (kMagicNumber > 0 ? kMagicNumber : 100.0) * (1 / std::max(1.0, 1 + kZoomSlowness * -last_post_filter_values[TZ] / 100)); + double velocity = foo / kMagicNumber * (1 / std::max(1.0, 1 + kZoomSlowness * -last_post_filter_values[TZ] / 100)); double sum = start + velocity * sign; bool done = (sign > 0 ? sum >= e2 : sum <= e2); if (done) { diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp index b524f508..1de51b10 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp @@ -149,7 +149,7 @@ void FilterControls::loadSettings() { ui.scalingConfig->setConfig(&functionConfig, currentFile); iniFile.beginGroup ( "Accela" ); - ui.slideReduction->setValue (iniFile.value ( "Reduction", 100 ).toInt()); + ui.slideReduction->setValue (iniFile.value ( "Reduction", 1000 ).toInt()); ui.slideZoom->setValue(iniFile.value("zoom-slowness", 0).toInt()); ui.rotationCircle->setValue(iniFile.value("preset-rotation", 3).toDouble()); ui.translationCircle->setValue(iniFile.value("preset-translation", 0.75).toDouble()); -- cgit v1.2.3