From e596f2ea9004db17f06d899d3ef5d76259cc6d03 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 11 Jun 2014 01:07:00 +0200 Subject: [PATCH] OP-1351 thermal calibration - added Debug message type and used it to stop displaying some status messages --- .../thermal/boardsetuptransition.h | 2 +- .../compensationcalculationtransition.h | 2 +- .../thermal/settingshandlingtransitions.h | 4 +- .../plugins/config/calibration/wizardmodel.h | 2 +- .../src/plugins/config/configrevowidget.cpp | 45 ++++++++++++------- 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h index f90b34a0f..609a36337 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h +++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/boardsetuptransition.h @@ -72,7 +72,7 @@ public: public slots: void enterState() { - m_helper->addInstructions(tr("Configuring board for calibration.")); + m_helper->addInstructions(tr("Configuring board for calibration."), WizardModel::Debug); m_helper->setupBoard(); } diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/compensationcalculationtransition.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/compensationcalculationtransition.h index 7e8ac8fa5..1ce4a56cf 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/compensationcalculationtransition.h +++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/compensationcalculationtransition.h @@ -67,7 +67,7 @@ public: public slots: void enterState() { - m_helper->addInstructions("Calculating calibration data."); + m_helper->addInstructions("Calculating calibration data.", WizardModel::Debug); m_helper->calculate(); } diff --git a/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h b/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h index d7aaf5791..d64bfd313 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h +++ b/ground/openpilotgcs/src/plugins/config/calibration/thermal/settingshandlingtransitions.h @@ -72,7 +72,7 @@ public: public slots: void enterState() { - m_helper->addInstructions(tr("Saving initial settings.")); + m_helper->addInstructions(tr("Saving initial settings."), WizardModel::Debug); m_helper->statusSave(); } @@ -112,7 +112,7 @@ public: public slots: void enterState() { - m_helper->addInstructions(tr("Restoring board configuration.")); + m_helper->addInstructions(tr("Restoring board configuration."), WizardModel::Debug); m_helper->endAcquisition(); m_helper->statusRestore(); } diff --git a/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h b/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h index f1cba5a2a..25ac0424d 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h +++ b/ground/openpilotgcs/src/plugins/config/calibration/wizardmodel.h @@ -40,7 +40,7 @@ class WizardModel : public QStateMachine { Q_PROPERTY(WizardState * currentState READ currentState NOTIFY currentStateChanged) public: - enum MessageType { Info, Prompt, Warn, Success, Failure }; + enum MessageType { Debug, Info, Prompt, Warn, Success, Failure }; explicit WizardModel(QObject *parent = 0); diff --git a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp index 504f511ff..3565e637e 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp @@ -56,6 +56,8 @@ #define sign(x) ((x < 0) ? -1 : 1) +//#define DEBUG + // Uncomment this to enable 6 point calibration on the accels #define NOISE_SAMPLES 50 @@ -268,26 +270,37 @@ void ConfigRevoWidget::displayVisualHelp(QString elementID) void ConfigRevoWidget::clearInstructions() { m_ui->calibrationInstructions->clear(); - // addInstructions(tr("Press any Start button to start a calibration step."), WizardModel::Prompt); } void ConfigRevoWidget::addInstructions(QString text, WizardModel::MessageType type) { - if (!text.isNull()) { - switch (type) { - case WizardModel::Prompt: - text = QString("%1").arg(text); - break; - case WizardModel::Success: - text = QString("%1").arg(text); - break; - case WizardModel::Failure: - text = QString("%1").arg(text); - break; - default: - break; - } - m_ui->calibrationInstructions->append(text); + QString msg; + switch (type) { + case WizardModel::Debug: +#ifdef DEBUG + msg = QString("%1").arg(text); +#endif + break; + case WizardModel::Info: + msg = QString("%1").arg(text); + break; + case WizardModel::Prompt: + msg = QString("%1").arg(text); + break; + case WizardModel::Warn: + msg = QString("%1").arg(text); + break; + case WizardModel::Success: + msg = QString("%1").arg(text); + break; + case WizardModel::Failure: + msg = QString("%1").arg(text); + break; + default: + break; + } + if (!msg.isEmpty()) { + m_ui->calibrationInstructions->append(msg); } }