From 8cea28a221d1a38310b41e76c2bffb8811c46fbd Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Tue, 13 May 2014 01:23:31 +0200 Subject: [PATCH] OP-1351 calibration ui : Moved instruction panel below button panel to free space for visual help. Made visual help image respect aspect ration. Text panels are now non editable, reworked help text and step names. --- .../src/plugins/config/calibration/sixpointcalibrationmodel.cpp | 1 + ground/openpilotgcs/src/plugins/config/configrevowidget.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp b/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp index 444a16d05..bc866b00d 100644 --- a/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp +++ b/ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp @@ -122,6 +122,7 @@ void SixPointCalibrationModel::start(bool calibrateAccel, bool calibrateMag) // check if Homelocation is set if (!homeLocationData.Set) { + // TODO QMessageBox msgBox; msgBox.setInformativeText(tr("

HomeLocation not SET.

Please set your HomeLocation and try again. Aborting calibration!

")); msgBox.setStandardButtons(QMessageBox::Ok); diff --git a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp index b7a949338..092f7cb56 100644 --- a/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configrevowidget.cpp @@ -82,6 +82,7 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) : m_ui->calibrationVisualHelp->setRenderHint(QPainter::HighQualityAntialiasing, true); m_ui->calibrationVisualHelp->setRenderHint(QPainter::SmoothPixmapTransform, true); displayVisualHelp("empty"); + // Must set up the UI (above) before setting up the UAVO mappings or refreshWidgetValues // will be dealing with some null pointers addUAVObject("RevoCalibration");