w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-01 08:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into hound-list-changes

Browse Source
This commit is contained in:
Brian Moran
2022-11-19 07:06:16 -08:00
parent 31676f0cc5 f59e9cba04
commit 0820a86d37
26 changed files with 1060 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/mainwindow.cpp
+15 -5
View File
@@ -769,7 +769,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
// Hook up working frequencies.
ui->bandComboBox->setModel (m_config.frequencies ());
ui->bandComboBox->setModelColumn (FrequencyList_v2::frequency_mhz_column);
ui->bandComboBox->setModelColumn (FrequencyList_v2_101::frequency_mhz_column);
// Enable live band combo box entry validation and action.
auto band_validator = new LiveFrequencyValidator {ui->bandComboBox
@@ -1021,6 +1021,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_wideGraph->setMode(m_mode);
connect (&minuteTimer, &QTimer::timeout, this, &MainWindow::on_the_minute);
connect (&minuteTimer, &QTimer::timeout, this, &MainWindow::invalidate_frequencies_filter);
minuteTimer.setSingleShot (true);
minuteTimer.start (ms_minute_error () + 60 * 1000);
@@ -1065,6 +1067,14 @@ void MainWindow::splash_done ()
m_splash && m_splash->close ();
}
void MainWindow::invalidate_frequencies_filter ()
{
// every interval, invalidate the frequency filter, so that if any
// working frequency goes in/out of scope, we pick it up.
m_config.frequencies ()->filter_refresh ();
ui->bandComboBox->update ();
}
void MainWindow::on_the_minute ()
{
if (minuteTimer.isSingleShot ())
@@ -7208,7 +7218,7 @@ void MainWindow::on_actionFreqCal_triggered()
void MainWindow::switch_mode (Mode mode)
{
m_fastGraph->setMode(m_mode);
m_config.frequencies ()->filter (m_config.region (), mode);
m_config.frequencies ()->filter (m_config.region (), mode, true); // filter on current time
auto const& row = m_config.frequencies ()->best_working_frequency (m_freqNominal);
ui->bandComboBox->setCurrentIndex (row);
if (row >= 0) {
@@ -7453,7 +7463,7 @@ void MainWindow::on_actionOpen_log_directory_triggered ()
void MainWindow::on_bandComboBox_currentIndexChanged (int index)
{
auto const& frequencies = m_config.frequencies ();
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2::frequency_column));
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2_101::frequency_column));
Frequency frequency {m_freqNominal};
if (source_index.isValid ())
{
@@ -7481,7 +7491,7 @@ void MainWindow::on_bandComboBox_editTextChanged (QString const& text)
void MainWindow::on_bandComboBox_activated (int index)
{
auto const& frequencies = m_config.frequencies ();
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2::frequency_column));
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2_101::frequency_column));
Frequency frequency {m_freqNominal};
if (source_index.isValid ())
{
@@ -7496,7 +7506,7 @@ void MainWindow::band_changed (Frequency f)
{
// Don't allow a7 decodes during the first period because they can be leftovers from the previous band
no_a7_decodes = true;
QTimer::singleShot ((int(1000.0*m_TRperiod)), [=] {no_a7_decodes = false;});
QTimer::singleShot ((int(1500.0*m_TRperiod)), [=] {no_a7_decodes = false;});
// Set the attenuation value if options are checked
if (m_config.pwrBandTxMemory() && !m_tune) {