chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug on band change

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-09 10:02:45 -04:00
parent ecacddb165
commit 442ff4b21d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mainwindow.cpp
View File

@ -2060,18 +2060,18 @@ void MainWindow::displayDialFrequency ()
// lookup band // lookup band
auto const& band_name = m_config.bands ()->find (dial_frequency); auto const& band_name = m_config.bands ()->find (dial_frequency);
if (m_lastBand != band_name) if (m_lastBand != band_name){
{
// only change this when necessary as we get called a lot and it // only change this when necessary as we get called a lot and it
// would trash any user input to the band combo box line edit // would trash any user input to the band combo box line edit
ui->bandComboBox->setCurrentText (band_name); ui->bandComboBox->setCurrentText (band_name);
m_wideGraph->setRxBand (band_name); m_wideGraph->setRxBand (band_name);
m_lastBand = band_name; m_lastBand = band_name;
// TODO: jsherer - is this the only place?
clearActivity(); clearActivity();
} }
// TODO: jsherer - this doesn't validate anything else right? we are disabling this because as long as you're in a band, it's valid.
/*
// search working frequencies for one we are within 10kHz of (1 Mhz // search working frequencies for one we are within 10kHz of (1 Mhz
// of on VHF and up) // of on VHF and up)
bool valid {false}; bool valid {false};
@ -2092,6 +2092,9 @@ void MainWindow::displayDialFrequency ()
if (min_offset < 10000u || (m_config.enable_VHF_features() && min_offset < 1000000u)) { if (min_offset < 10000u || (m_config.enable_VHF_features() && min_offset < 1000000u)) {
valid = true; valid = true;
} }
*/
bool valid = !band_name.isEmpty();
update_dynamic_property (ui->labDialFreq, "oob", !valid); update_dynamic_property (ui->labDialFreq, "oob", !valid);
ui->labDialFreq->setText (Radio::pretty_frequency_MHz_string (dial_frequency)); ui->labDialFreq->setText (Radio::pretty_frequency_MHz_string (dial_frequency));
@ -6396,8 +6399,11 @@ void MainWindow::band_changed (Frequency f)
m_send_RR73 = false; // force user to reassess on new band m_send_RR73 = false; // force user to reassess on new band
} }
} }
m_lastBand.clear ();
// TODO: jsherer - is this relied upon anywhere?
//m_lastBand.clear ();
m_bandEdited = false; m_bandEdited = false;
psk_Reporter->sendReport(); // Upload any queued spots before changing band psk_Reporter->sendReport(); // Upload any queued spots before changing band
if (!m_transmitting) monitor (true); if (!m_transmitting) monitor (true);
if ("FreqCal" == m_mode) if ("FreqCal" == m_mode)