From 9184ea73941814b95c2768d8bcca8bdb77655891 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Sat, 17 Mar 2012 16:15:51 +0000 Subject: Changed Tracker code, so the DLL's are true plug-ins. FaceTrackNoIR will scan the bin folder for FTNoIR_Tracker*.dll and put the names in the combobox. All Trackers have 3 new member-functions (like the filters). git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@104 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Filter_EWMA2/FTNoIR_FilterControls.ui | 633 +++++++++++---------- FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h | 12 +- FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2.cpp | 6 +- FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2_dialog.cpp | 6 +- 4 files changed, 340 insertions(+), 317 deletions(-) (limited to 'FTNoIR_Filter_EWMA2') diff --git a/FTNoIR_Filter_EWMA2/FTNoIR_FilterControls.ui b/FTNoIR_Filter_EWMA2/FTNoIR_FilterControls.ui index cbd61d53..e9419a73 100644 --- a/FTNoIR_Filter_EWMA2/FTNoIR_FilterControls.ui +++ b/FTNoIR_Filter_EWMA2/FTNoIR_FilterControls.ui @@ -6,10 +6,16 @@ 0 0 - 411 - 225 + 371 + 380 + + + 0 + 380 + + EWMA2 Filter settings FaceTrackNoIR @@ -28,293 +34,338 @@ - - - - - - 0 - 0 - - - - - 30 - 16777215 - - - - - - - Min. - - - - - - - - 0 - 0 - - - - - 30 - 16777215 - - - - - - - Max. - - + + + QLayout::SetMinimumSize + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + + + + Max. + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + + + + Curve + + + + + + + + 45 + 15 + + + + 1 + + + 100 + + + 10 + + + 2 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 40 + 22 + + + + background:none; + + + 1 + + + 100 + + + 5 + + + 2 + + + + + + + + 35 + 0 + + + + + 30 + 16777215 + + + + + + + frames + + + + + + + + 45 + 15 + + + + 1 + + + 100 + + + 10 + + + 10 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 40 + 22 + + + + background:none; + + + 1 + + + 100 + + + 5 + + + 10 + + + + + + + + 35 + 0 + + + + + 30 + 16777215 + + + + + + + frames + + + + + + + + 45 + 15 + + + + 1 + + + 100 + + + 10 + + + 10 + + + Qt::Horizontal + + + QSlider::NoTicks + + + + + + + + 40 + 22 + + + + background:none; + + + 100 + + + 5 + + + 10 + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + + + + pow + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + + + + Min. + + + + - - + + 0 - 0 - - - - - 30 - 16777215 - - - - - - - Curve - - - - - - - - 45 - 15 - - - - 1 - - - 100 - - - 10 - - - 2 - - - Qt::Horizontal - - - QSlider::NoTicks - - - - - - - - 40 - 22 - - - - background:none; - - - 1 - - - 100 - - - 5 - - - 2 - - - - - - - - 35 - 0 - - - - - 30 - 16777215 - - - - - - - frames - - - - - - - - 45 - 15 - - - - 1 - - - 100 - - - 10 - - - 10 - - - Qt::Horizontal - - - QSlider::NoTicks - - - - - - - - 40 - 22 + 204 - background:none; - - - 1 - - - 100 - - - 5 - - - 10 - - - - - - - - 35 - 0 - - - - - 30 - 16777215 - + background-color: rgb(214, 214, 214); +border-color: rgb(0, 0, 0); - - + + QFrame::Box - frames - - - - - - - - 45 - 15 - - - - 1 - - - 100 - - - 10 - - - 10 - - - Qt::Horizontal - - - QSlider::NoTicks - - - - - - - - 40 - 22 - - - - background:none; - - - 100 - - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Min. frames:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Defines the way the filter responds to fast movements;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Higher value: slower response;</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Max. frames:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Defines the way the filter responds to slow movements;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Higher value: slower response;</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Pow:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Defines the filters 'readiness' to respond to speed changes;</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Higher value = </span><span style=" font-size:10pt; font-weight:600;">higher</span><span style=" font-size:10pt;"> response;</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p></body></html> + + 5 - - 10 - - - - - - - - 0 - 0 - - - - - 30 - 16777215 - - - - - - - pow - @@ -332,34 +383,6 @@ - - - - - - The filter-settings may need some explanation... - - - - - - - ... - - - true - - - - - - - ... - - - - - diff --git a/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h b/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h index f335eb47..bd90c1f8 100644 --- a/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h +++ b/FTNoIR_Filter_EWMA2/FTNoIR_Filter_EWMA2.h @@ -45,9 +45,9 @@ public: void StartFilter(); void FilterHeadPoseData(THeadPoseData *current_camera_position, THeadPoseData *target_camera_position, THeadPoseData *new_camera_position, bool newTarget); - void getFilterFullName(QString *strToBeFilled); - void getFilterShortName(QString *strToBeFilled); - void getFilterDescription(QString *strToBeFilled); + void getFullName(QString *strToBeFilled); + void getShortName(QString *strToBeFilled); + void getDescription(QString *strToBeFilled); private: void loadSettings(); // Load the settings from the INI-file @@ -86,9 +86,9 @@ public: void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent, IFilterPtr ptr); - void getFilterFullName(QString *strToBeFilled); - void getFilterShortName(QString *strToBeFilled); - void getFilterDescription(QString *strToBeFilled); + void getFullName(QString *strToBeFilled); + void getShortName(QString *strToBeFilled); + void getDescription(QString *strToBeFilled); void getIcon(QIcon *icon); private: diff --git a/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2.cpp b/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2.cpp index 179db04c..99a4bd98 100644 --- a/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2.cpp +++ b/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2.cpp @@ -226,19 +226,19 @@ void FTNoIR_Filter::FilterHeadPoseData(THeadPoseData *current_camera_position, T return; } -void FTNoIR_Filter::getFilterFullName(QString *strToBeFilled) +void FTNoIR_Filter::getFullName(QString *strToBeFilled) { *strToBeFilled = filterFullName; }; -void FTNoIR_Filter::getFilterShortName(QString *strToBeFilled) +void FTNoIR_Filter::getShortName(QString *strToBeFilled) { *strToBeFilled = filterShortName; }; -void FTNoIR_Filter::getFilterDescription(QString *strToBeFilled) +void FTNoIR_Filter::getDescription(QString *strToBeFilled) { *strToBeFilled = filterDescription; }; diff --git a/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2_dialog.cpp b/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2_dialog.cpp index fd24d552..7ffe8bb9 100644 --- a/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2_dialog.cpp +++ b/FTNoIR_Filter_EWMA2/ftnoir_filter_ewma2_dialog.cpp @@ -187,19 +187,19 @@ void FilterControls::save() { settingsDirty = false; } -void FilterControls::getFilterFullName(QString *strToBeFilled) +void FilterControls::getFullName(QString *strToBeFilled) { *strToBeFilled = filterFullName; }; -void FilterControls::getFilterShortName(QString *strToBeFilled) +void FilterControls::getShortName(QString *strToBeFilled) { *strToBeFilled = filterShortName; }; -void FilterControls::getFilterDescription(QString *strToBeFilled) +void FilterControls::getDescription(QString *strToBeFilled) { *strToBeFilled = filterDescription; }; -- cgit v1.2.3