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

Uncrustify

Browse Source
This commit is contained in:
m_thread 2015-02-23 00:01:22 +01:00
parent 9e6d71120b
commit 14d4156d1f
3 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,7 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
ConfigOutputWidget::~ConfigOutputWidget() ConfigOutputWidget::~ConfigOutputWidget()
{ {
SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager()); SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
disconnect(systemAlarmsObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateWarnings(UAVObject *))); disconnect(systemAlarmsObj, SIGNAL(objectUpdated(UAVObject *)), this, SLOT(updateWarnings(UAVObject *)));
foreach(OutputBankControls controls, m_banks) { foreach(OutputBankControls controls, m_banks) {
disconnect(controls.modeCombo(), SIGNAL(currentIndexChanged(int)), this, SLOT(onBankTypeChange(int))); disconnect(controls.modeCombo(), SIGNAL(currentIndexChanged(int)), this, SLOT(onBankTypeChange(int)));
@ -367,6 +368,7 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *obj)
int i = 0; int i = 0;
foreach(QString banklabel, bankLabels) { foreach(QString banklabel, bankLabels) {
OutputBankControls controls = m_banks.at(i); OutputBankControls controls = m_banks.at(i);
controls.label()->setText(banklabel); controls.label()->setText(banklabel);
int index = controls.rateCombo()->findData(actuatorSettingsData.BankUpdateFreq[i]); int index = controls.rateCombo()->findData(actuatorSettingsData.BankUpdateFreq[i]);
if (index == -1) { if (index == -1) {
@ -444,6 +446,7 @@ void ConfigOutputWidget::openHelp()
void ConfigOutputWidget::onBankTypeChange() void ConfigOutputWidget::onBankTypeChange()
{ {
QComboBox *bankModeCombo = qobject_cast<QComboBox *>(sender()); QComboBox *bankModeCombo = qobject_cast<QComboBox *>(sender());
if (bankModeCombo != NULL) { if (bankModeCombo != NULL) {
foreach(OutputBankControls controls, m_banks) { foreach(OutputBankControls controls, m_banks) {
if (controls.modeCombo() == bankModeCombo) { if (controls.modeCombo() == bankModeCombo) {
@ -489,9 +492,7 @@ void ConfigOutputWidget::setWarning(QString message)
OutputBankControls::OutputBankControls(MixerSettings *mixer, QLabel *label, QColor color, QComboBox *rateCombo, QComboBox *modeCombo) : OutputBankControls::OutputBankControls(MixerSettings *mixer, QLabel *label, QColor color, QComboBox *rateCombo, QComboBox *modeCombo) :
m_mixer(mixer), m_label(label), m_color(color), m_rateCombo(rateCombo), m_modeCombo(modeCombo) m_mixer(mixer), m_label(label), m_color(color), m_rateCombo(rateCombo), m_modeCombo(modeCombo)
{ {}
}
OutputBankControls::~OutputBankControls() OutputBankControls::~OutputBankControls()
{ {}
}

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

@ -49,10 +49,22 @@ public:
OutputBankControls(MixerSettings *mixer, QLabel *label, QColor color, QComboBox *rateCombo, QComboBox *modeCombo); OutputBankControls(MixerSettings *mixer, QLabel *label, QColor color, QComboBox *rateCombo, QComboBox *modeCombo);
virtual ~OutputBankControls(); virtual ~OutputBankControls();
QLabel *label() const { return m_label; } QLabel *label() const
QColor color() const { return m_color; } {
QComboBox *rateCombo() const { return m_rateCombo; } return m_label;
QComboBox *modeCombo() const { return m_modeCombo; } }
QColor color() const
{
return m_color;
}
QComboBox *rateCombo() const
{
return m_rateCombo;
}
QComboBox *modeCombo() const
{
return m_modeCombo;
}
private: private:
MixerSettings *m_mixer; MixerSettings *m_mixer;