rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

OP-444 : changed the error message to a QMessageBox as requested.

Browse Source
This commit is contained in:
elafargue 2011-04-26 18:02:32 +02:00
parent 921fe640a8
commit c49382cdec
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
View File

@ -28,7 +28,7 @@
#include "ui_ccattitude.h" #include "ui_ccattitude.h"
#include "utils/coordinateconversions.h" #include "utils/coordinateconversions.h"
#include <QMutexLocker> #include <QMutexLocker>
#include <QErrorMessage> #include <QMessageBox>
#include <QDebug> #include <QDebug>
ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) : ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) :
@ -89,9 +89,12 @@ void ConfigCCAttitudeWidget::timeout() {
disconnect(obj,SIGNAL(objectUpdated(UAVObject*)),this,SLOT(attitudeRawUpdated(UAVObject*))); disconnect(obj,SIGNAL(objectUpdated(UAVObject*)),this,SLOT(attitudeRawUpdated(UAVObject*)));
disconnect(&timer,SIGNAL(timeout()),this,SLOT(timeout())); disconnect(&timer,SIGNAL(timeout()),this,SLOT(timeout()));
QErrorMessage errmsg; QMessageBox msgBox;
errmsg.showMessage("Calibration timed out before receiving required updates"); msgBox.setText(tr("Calibration timed out before receiving required updates."));
errmsg.exec(); msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec();
} }
void ConfigCCAttitudeWidget::attitudeBiasChanged(int val) { void ConfigCCAttitudeWidget::attitudeBiasChanged(int val) {
@ -121,7 +124,7 @@ void ConfigCCAttitudeWidget::startAccelCalibration() {
y_accum.clear(); y_accum.clear();
z_accum.clear(); z_accum.clear();
ui->status->setText("Calibrating..."); ui->status->setText(tr("Calibrating..."));
// Set up to receive updates // Set up to receive updates
UAVDataObject * obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("AttitudeRaw"))); UAVDataObject * obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("AttitudeRaw")));