diff options
Diffstat (limited to 'ftnoir_filter_ewma2')
-rw-r--r-- | ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp | 2 | ||||
-rw-r--r-- | ftnoir_filter_ewma2/ftnoir_filter_ewma2.h | 10 | ||||
-rw-r--r-- | ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp index 320b95ad..5214b37b 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp @@ -40,7 +40,7 @@ void FTNoIR_Filter::receiveSettings() s.b->reload(); } -void FTNoIR_Filter::FilterHeadPoseData(const double *target_camera_position, +void FTNoIR_Filter::filter(const double *target_camera_position, double *new_camera_position) { double new_delta, new_noise, norm_noise; diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h index aacf4916..f2baaa22 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h @@ -25,7 +25,7 @@ class FTNoIR_Filter : public IFilter public: FTNoIR_Filter(); void reset() { first_run=true; } - void FilterHeadPoseData(const double *target_camera_position, + void filter(const double *target_camera_position, double *new_camera_position); void receiveSettings(); private: @@ -38,7 +38,7 @@ private: settings s; }; -class FilterControls: public QWidget, public IFilterDialog +class FilterControls: public IFilterDialog { Q_OBJECT public: @@ -60,8 +60,6 @@ private slots: class FTNoIR_FilterDll : public Metadata { public: - void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA Filter Mk3"); } - void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("EWMA"); } - void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Exponentially Weighted Moving Average filter with dynamic smoothing parameter"); } - void getIcon(QIcon *icon){ *icon = QIcon(":/images/filter-16.png"); } + QString name() { return QString("EWMA"); } + QIcon icon() { return QIcon(":/images/filter-16.png"); } }; diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp index b6bde553..bdc6e1bf 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp @@ -4,8 +4,7 @@ #include "facetracknoir/plugin-support.h" #include "ui_ftnoir_ewma_filtercontrols.h" -FilterControls::FilterControls() : - QWidget(), pFilter(NULL) +FilterControls::FilterControls() : pFilter(NULL) { ui.setupUi( this ); |