From b42d6d0ecfff4672171c983fe79ce27a739d8a67 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Fri, 5 May 2017 23:48:33 +0200 Subject: [PATCH] LP-505 Change the channel tooltip according to the RFBand used. --- .../src/plugins/config/configoplinkwidget.cpp | 18 ++++++++++++------ .../src/plugins/config/configoplinkwidget.h | 1 + ground/gcs/src/plugins/config/oplink.ui | 6 ------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ground/gcs/src/plugins/config/configoplinkwidget.cpp b/ground/gcs/src/plugins/config/configoplinkwidget.cpp index 66e0f3856..bfb1b557d 100644 --- a/ground/gcs/src/plugins/config/configoplinkwidget.cpp +++ b/ground/gcs/src/plugins/config/configoplinkwidget.cpp @@ -332,16 +332,19 @@ void ConfigOPLinkWidget::rfBandChanged() { switch (getComboboxSelectedOption(m_oplink->RFBand)) { case OPLinkSettings::RFBAND_915MHZ: - frequency_base = 900.0f; - frequency_step = FREQUENCY_STEP * 2.0f; + frequency_base = 900.0f; + frequency_step = FREQUENCY_STEP * 2.0f; + channel_tooltip = tr("Channel 0 is 900 MHz, channel 250 is 920 MHz, and the channel spacing is 80 KHz."); break; case OPLinkSettings::RFBAND_868MHZ: - frequency_base = 860.0f; - frequency_step = FREQUENCY_STEP * 2.0f; + frequency_base = 860.0f; + frequency_step = FREQUENCY_STEP * 2.0f; + channel_tooltip = tr("Channel 0 is 860 MHz, channel 250 is 880 MHz, and the channel spacing is 80 KHz."); break; case OPLinkSettings::RFBAND_433MHZ: - frequency_base = 430.0f; - frequency_step = FREQUENCY_STEP; + frequency_base = 430.0f; + frequency_step = FREQUENCY_STEP; + channel_tooltip = tr("Channel 0 is 430 MHz, channel 250 is 440 MHz, and the channel spacing is 40 KHz."); break; } @@ -386,6 +389,9 @@ void ConfigOPLinkWidget::updateFrequencyDisplay() m_oplink->MinFreq->setText("(" + QString::number(minFrequency, 'f', 3) + " MHz)"); m_oplink->MaxFreq->setText("(" + QString::number(maxFrequency, 'f', 3) + " MHz)"); + + m_oplink->MinimumChannel->setToolTip(channel_tooltip); + m_oplink->MaximumChannel->setToolTip(channel_tooltip); } void ConfigOPLinkWidget::mainPortChanged() diff --git a/ground/gcs/src/plugins/config/configoplinkwidget.h b/ground/gcs/src/plugins/config/configoplinkwidget.h index f8b72d4cb..7ea09347b 100644 --- a/ground/gcs/src/plugins/config/configoplinkwidget.h +++ b/ground/gcs/src/plugins/config/configoplinkwidget.h @@ -54,6 +54,7 @@ private: // Frequency display settings float frequency_base; float frequency_step; + QString channel_tooltip; // Is the status current? bool statusUpdated; diff --git a/ground/gcs/src/plugins/config/oplink.ui b/ground/gcs/src/plugins/config/oplink.ui index 7616704e2..262419ae2 100644 --- a/ground/gcs/src/plugins/config/oplink.ui +++ b/ground/gcs/src/plugins/config/oplink.ui @@ -1306,9 +1306,6 @@ false - - Channel 0 is 430 MHz, channel 250 is 440 MHz, and the channel spacing is 40 KHz. - 250 @@ -1433,9 +1430,6 @@ false - - Channel 0 is 430 MHz, channel 250 is 440 MHz, and the channel spacing is 40 KHz. - 250