From 1b13bae1263b4430311aff68ebe1da96d9e78779 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Mon, 13 Jan 2014 01:55:44 +0100 Subject: [PATCH] OP-1150 UI for thermal calibration: move into calibration/thermal --- .../{ => thermal}/thermalcalibration.cpp | 2 +- .../calibration/{ => thermal}/thermalcalibration.h | 2 +- ground/openpilotgcs/src/plugins/config/config.pro | 13 ++++--------- 3 files changed, 6 insertions(+), 11 deletions(-) rename ground/openpilotgcs/src/plugins/config/calibration/{ => thermal}/thermalcalibration.cpp (100%) rename ground/openpilotgcs/src/plugins/config/calibration/{ => thermal}/thermalcalibration.h (98%) diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermalcalibration.cpp b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.cpp similarity index 100% rename from ground/openpilotgcs/src/plugins/config/calibration/thermalcalibration.cpp rename to ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.cpp index ab7286f2a..d5489b09a 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/thermalcalibration.cpp +++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.cpp @@ -25,8 +25,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "thermalcalibration.h" #include "QDebug" +#include "thermalcalibration.h" using namespace OpenPilot; bool ThermalCalibration::BarometerCalibration(Eigen::VectorXf pressure, Eigen::VectorXf temperature, float *result) { diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermalcalibration.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.h similarity index 98% rename from ground/openpilotgcs/src/plugins/config/calibration/thermalcalibration.h rename to ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.h index f069f92c0..d9233d97d 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/thermalcalibration.h +++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibration.h @@ -27,7 +27,7 @@ */ #ifndef THERMALCALIBRATION_H #define THERMALCALIBRATION_H -#include "calibrationutils.h" +#include "../calibrationutils.h" namespace OpenPilot { class ThermalCalibration { diff --git a/ground/openpilotgcs/src/plugins/config/config.pro b/ground/openpilotgcs/src/plugins/config/config.pro index df998b811..ba153b8df 100644 --- a/ground/openpilotgcs/src/plugins/config/config.pro +++ b/ground/openpilotgcs/src/plugins/config/config.pro @@ -26,7 +26,6 @@ HEADERS += configplugin.h \ configpipxtremewidget.h \ configstabilizationwidget.h \ assertions.h \ -# calibration.h \ defaultattitudewidget.h \ defaulthwsettingswidget.h \ inputchannelform.h \ @@ -45,9 +44,9 @@ HEADERS += configplugin.h \ dblspindelegate.h \ configrevohwwidget.h \ calibration/calibrationutils.h \ - calibration/thermalcalibration.h \ calibration/wizardstate.h \ - calibration/wizardmodel.h + calibration/wizardmodel.h \ + calibration/thermal/thermalcalibration.h \ SOURCES += configplugin.cpp \ configgadgetwidget.cpp \ @@ -61,10 +60,6 @@ SOURCES += configplugin.cpp \ configccattitudewidget.cpp \ configstabilizationwidget.cpp \ configpipxtremewidget.cpp \ -# twostep.cpp \ -# legacy-calibration.cpp \ -# gyro-calibration.cpp \ -# alignment-calibration.cpp \ defaultattitudewidget.cpp \ defaulthwsettingswidget.cpp \ inputchannelform.cpp \ @@ -82,9 +77,9 @@ SOURCES += configplugin.cpp \ dblspindelegate.cpp \ configrevohwwidget.cpp \ calibration/calibrationutils.cpp \ - calibration/thermalcalibration.cpp \ calibration/wizardstate.cpp \ - calibration/wizardmodel.cpp + calibration/wizardmodel.cpp \ + calibration/thermal/thermalcalibration.cpp \ FORMS += airframe.ui \ airframe_ccpm.ui \