From 3490057f699c6492c084e71390012773bd2c2af9 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Mon, 27 Jul 2015 23:25:38 +0200 Subject: [PATCH] LP-56 - Add link checkbox for acro+ roll/pitch factors --- .../plugins/config/configstabilizationwidget.cpp | 12 +++++++++++ .../src/plugins/config/stabilization.ui | 23 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp index bdeed6138..4a507f7c0 100644 --- a/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configstabilizationwidget.cpp @@ -91,6 +91,9 @@ ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTa connect(ui->checkBox_3, SIGNAL(toggled(bool)), this, SLOT(linkCheckBoxes(bool))); addWidget(ui->checkBox_3); + connect(ui->checkBoxLinkAcroFactors, SIGNAL(toggled(bool)), this, SLOT(linkCheckBoxes(bool))); + addWidget(ui->checkBoxLinkAcroFactors); + addWidget(ui->pushButton_2); addWidget(ui->pushButton_3); addWidget(ui->pushButton_4); @@ -568,6 +571,8 @@ void ConfigStabilizationWidget::linkCheckBoxes(bool value) ui->basicResponsivenessCheckBox->setChecked(!value); ui->basicResponsivenessControls->setEnabled(!value); ui->advancedResponsivenessControls->setEnabled(value); + } else if(sender() == ui->checkBoxLinkAcroFactors) { + processLinkedWidgets(ui->AcroFactorRollSlider); } } @@ -608,6 +613,13 @@ void ConfigStabilizationWidget::processLinkedWidgets(QWidget *widget) ui->ratePitchKi_4->setValue(ui->RateResponsivenessSlider->value()); } } + if (ui->checkBoxLinkAcroFactors->isChecked()) { + if (widget == ui->AcroFactorRollSlider) { + ui->AcroFactorPitchSlider->setValue(ui->AcroFactorRollSlider->value()); + } else if (widget == ui->AcroFactorPitchSlider) { + ui->AcroFactorRollSlider->setValue(ui->AcroFactorPitchSlider->value()); + } + } } void ConfigStabilizationWidget::onBoardConnected() diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index 38fbee8d6..f1ee17b2f 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -195,6 +195,29 @@ margin-top: -1px; Acro+ + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + <html><head/><body><p>Link roll &amp; pitch sliders to move together, thus giving same value for both roll &amp; pitch when setting up a symetrical vehicle that requires both to be the same</p></body></html> + + + + + + Link Roll and Pitch + + + -- 2.11.4.GIT