From 37cec18e504c7c581532c51cc6e7f1ab5e86b1b3 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Fri, 11 Apr 2014 06:29:56 +0200 Subject: [PATCH] OP-975 move listMean and listVar out of configtaskwidget --- .../src/plugins/config/configccattitudewidget.cpp | 14 +++++++------- .../uavobjectwidgetutils/configtaskwidget.h | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp b/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp index 24623d503..eb08d874d 100644 --- a/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp @@ -38,7 +38,7 @@ #include "gyrostate.h" #include #include - +#include ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) : ConfigTaskWidget(parent), ui(new Ui_ccattitude) @@ -113,13 +113,13 @@ void ConfigCCAttitudeWidget::sensorsUpdated(UAVObject *obj) disconnect(obj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(sensorsUpdated(UAVObject *))); disconnect(&timer, SIGNAL(timeout()), this, SLOT(timeout())); - float x_bias = listMean(x_accum); - float y_bias = listMean(y_accum); - float z_bias = (listMean(z_accum) + 9.81); + float x_bias = OpenPilot::CalibrationUtils::listMean(x_accum); + float y_bias = OpenPilot::CalibrationUtils::listMean(y_accum); + float z_bias = OpenPilot::CalibrationUtils::listMean(z_accum) + 9.81; - float x_gyro_bias = listMean(x_gyro_accum); - float y_gyro_bias = listMean(y_gyro_accum); - float z_gyro_bias = listMean(z_gyro_accum); + float x_gyro_bias = OpenPilot::CalibrationUtils::listMean(x_gyro_accum); + float y_gyro_bias = OpenPilot::CalibrationUtils::listMean(y_gyro_accum); + float z_gyro_bias = OpenPilot::CalibrationUtils::listMean(z_gyro_accum); accelState->setMetadata(initialAccelStateMdata); gyroState->setMetadata(initialGyroStateMdata); diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h index 900aaa9a0..dfc9a9c76 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h @@ -106,8 +106,6 @@ public: void saveObjectToSD(UAVObject *obj); UAVObjectManager *getObjectManager(); - static double listMean(QList list); - static double listVar(QList list); void addUAVObject(QString objectName, QList *reloadGroups = NULL); void addUAVObject(UAVObject *objectName, QList *reloadGroups = NULL);