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-1685 - Fixes for review comments

Browse Source
This commit is contained in:
Alessio Morale 2015-02-14 17:23:27 +01:00
parent 1ad040229c
commit d9216d72fe
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
View File

@ -106,7 +106,7 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode5, 4, 0, true); addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode5, 4, 0, true);
addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode6, 5, 0, true); addWidgetBinding("ActuatorSettings", "BankMode", ui->cb_outputMode6, 5, 0, true);
systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager()); SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
connect(systemAlarmsObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateWarnings(UAVObject *))); connect(systemAlarmsObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateWarnings(UAVObject *)));
disconnect(this, SLOT(refreshWidgetsValues(UAVObject *))); disconnect(this, SLOT(refreshWidgetsValues(UAVObject *)));
@ -115,11 +115,13 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
refreshWidgetsValues(); refreshWidgetsValues();
updateEnableControls(); updateEnableControls();
setWarning("PIppo");
} }
ConfigOutputWidget::~ConfigOutputWidget() ConfigOutputWidget::~ConfigOutputWidget()
{ {
SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
disconnect(systemAlarmsObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateWarnings(UAVObject *)));
// Do nothing // Do nothing
} }
@ -150,6 +152,7 @@ void ConfigOutputWidget::sendAllChannelTests()
*/ */
void ConfigOutputWidget::runChannelTests(bool state) void ConfigOutputWidget::runChannelTests(bool state)
{ {
SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData(); SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData();
if (state && systemAlarms.Alarm[SystemAlarms::ALARM_ACTUATOR] != SystemAlarms::ALARM_OK) { if (state && systemAlarms.Alarm[SystemAlarms::ALARM_ACTUATOR] != SystemAlarms::ALARM_OK) {
@ -443,6 +446,7 @@ void ConfigOutputWidget::stopTests()
void ConfigOutputWidget::updateWarnings(UAVObject *) void ConfigOutputWidget::updateWarnings(UAVObject *)
{ {
SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData(); SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData();
if (systemAlarms.Alarm[SystemAlarms::ALARM_SYSTEMCONFIGURATION] > SystemAlarms::ALARM_WARNING) { if (systemAlarms.Alarm[SystemAlarms::ALARM_SYSTEMCONFIGURATION] > SystemAlarms::ALARM_WARNING) {
@ -457,6 +461,8 @@ void ConfigOutputWidget::updateWarnings(UAVObject *)
void ConfigOutputWidget::setWarning(QString message) void ConfigOutputWidget::setWarning(QString message)
{ {
QPixmap warningPic;
ui->gvWarning->scene()->clear(); ui->gvWarning->scene()->clear();
if (!message.isNull()) { if (!message.isNull()) {
warningPic.load(":/configgadget/images/error.svg"); warningPic.load(":/configgadget/images/error.svg");

2
ground/openpilotgcs/src/plugins/config/configoutputwidget.h
View File

@ -57,7 +57,6 @@ private:
Ui_OutputWidget *ui; Ui_OutputWidget *ui;
QList<QSlider> sliders; QList<QSlider> sliders;
QPixmap warningPic;
void updateChannelInSlider(QSlider *slider, QLabel *min, QLabel *max, QCheckBox *rev, int value); void updateChannelInSlider(QSlider *slider, QLabel *min, QLabel *max, QCheckBox *rev, int value);
void assignOutputChannel(UAVDataObject *obj, QString &str); void assignOutputChannel(UAVDataObject *obj, QString &str);
@ -72,7 +71,6 @@ private:
UAVObject::Metadata accInitialData; UAVObject::Metadata accInitialData;
SystemAlarms *systemAlarmsObj;
private slots: private slots:
void updateWarnings(UAVObject *); void updateWarnings(UAVObject *);
void stopTests(); void stopTests();