From 81575ab46242bb9df2d3d132b4baed77d4668d5a Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Sun, 29 May 2016 10:31:16 +0200 Subject: [PATCH 1/3] LP-311 Update text on Basic/Advanced GUI to be more informative. Added tooltip explaining in more detail. --- ground/gcs/src/plugins/config/stabilization.ui | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ground/gcs/src/plugins/config/stabilization.ui b/ground/gcs/src/plugins/config/stabilization.ui index 56ab3d919..95fadca4a 100644 --- a/ground/gcs/src/plugins/config/stabilization.ui +++ b/ground/gcs/src/plugins/config/stabilization.ui @@ -997,8 +997,11 @@ margin-top: -1px; + + <html><head/><body><p>When this option is selected the simplified version of the configuration view will be used. </p><p>This view hides some settings that are considered advanced and will make it easier for users to get a first working configuration.</p></body></html> + - Use Basic Configuration + Use Basic Configuration View false @@ -7873,8 +7876,11 @@ border-radius: 5; 0 + + <html><head/><body><p>When this option is selected the advanced version of the configuration view will be used. </p><p>This view shows all settings that are considered advanced and will enable users to to tweak all possible settings to fine tune configuration.</p></body></html> + - Use Advanced Configuration + Use Advanced Configuration View From cfcf659ea5acbd6f917462ea9e7accb22ba5569e Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Sun, 29 May 2016 10:31:26 +0200 Subject: [PATCH 2/3] Revert "LP-311 Remove basic/advanced stabilization tab auto-switch (autotune/txpid lock issues)" This reverts commit fad04833ede06139ddb91cd002529ded02164826. --- .../config/configstabilizationwidget.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp index 567e1a357..ce0d5b8f1 100644 --- a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp @@ -252,6 +252,23 @@ void ConfigStabilizationWidget::refreshWidgetsValues(UAVObject *o) ConfigTaskWidget::refreshWidgetsValues(o); updateThrottleCurveFromObject(); + + // Check and update basic/advanced checkboxes only if something connected + // Jump to advanced tab if something not "basic": Rate value out of slider limits or different Pitch/Roll values + if (ui->lowThrottleZeroIntegral_8->isEnabled() && !realtimeUpdates->isActive()) { + if ((ui->attitudeRollResponse->value() == ui->attitudePitchResponse->value()) && + (ui->rateRollResponse->value() == ui->ratePitchResponse->value()) && + (ui->rateRollResponse->value() <= ui->RateResponsivenessSlider->maximum()) && + (ui->ratePitchResponse->value() <= ui->RateResponsivenessSlider->maximum())) { + ui->basicResponsivenessCheckBox->setChecked(true); + ui->advancedResponsivenessCheckBox->setChecked(false); + ui->tabWidget->setCurrentIndex(0); + } else { + ui->basicResponsivenessCheckBox->setChecked(false); + ui->advancedResponsivenessCheckBox->setChecked(true); + ui->tabWidget->setCurrentIndex(1); + } + } } void ConfigStabilizationWidget::updateObjectsFromWidgets() From 76ed067a4f1abc82ee4b168be8def7f2542ef1e9 Mon Sep 17 00:00:00 2001 From: Fredrik Arvidsson Date: Sun, 29 May 2016 10:43:29 +0200 Subject: [PATCH 3/3] LP-311 Reverted previous commit that removed all logic and just removed the code where the tabs where switched. The Basic/Advanced checkbox code is still active though and will make the GUI consistent when loading configuration or changing values. --- ground/gcs/src/plugins/config/configstabilizationwidget.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp index ce0d5b8f1..ac3db5a28 100644 --- a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp @@ -254,7 +254,7 @@ void ConfigStabilizationWidget::refreshWidgetsValues(UAVObject *o) updateThrottleCurveFromObject(); // Check and update basic/advanced checkboxes only if something connected - // Jump to advanced tab if something not "basic": Rate value out of slider limits or different Pitch/Roll values + // if something not "basic": Rate value out of slider limits or different Pitch/Roll values if (ui->lowThrottleZeroIntegral_8->isEnabled() && !realtimeUpdates->isActive()) { if ((ui->attitudeRollResponse->value() == ui->attitudePitchResponse->value()) && (ui->rateRollResponse->value() == ui->ratePitchResponse->value()) && @@ -262,11 +262,9 @@ void ConfigStabilizationWidget::refreshWidgetsValues(UAVObject *o) (ui->ratePitchResponse->value() <= ui->RateResponsivenessSlider->maximum())) { ui->basicResponsivenessCheckBox->setChecked(true); ui->advancedResponsivenessCheckBox->setChecked(false); - ui->tabWidget->setCurrentIndex(0); } else { ui->basicResponsivenessCheckBox->setChecked(false); ui->advancedResponsivenessCheckBox->setChecked(true); - ui->tabWidget->setCurrentIndex(1); } } }