From 6b98c8547304a98826c663a30adfb9bc80b755b7 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Wed, 18 Sep 2024 18:25:28 +0200 Subject: [PATCH] Remove the Fox MaxDB function. Keep m_max_dB for now, just set it to 70 dB. --- widgets/mainwindow.cpp | 10 -- widgets/mainwindow.h | 1 - widgets/mainwindow.ui | 253 ++++++++++++++++++----------------------- 3 files changed, 110 insertions(+), 154 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 655e296b5..9f7260457 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1239,7 +1239,6 @@ void MainWindow::writeSettings() m_settings->setValue("HoundSort",ui->comboBoxHoundSort->currentIndex()); m_settings->setValue("FoxNlist",ui->sbNlist->value()); m_settings->setValue("FoxNslots",m_Nslots0); - m_settings->setValue("FoxMaxDB_v2",ui->sbMax_dB->value()); // original key abandoned m_settings->setValue ("SerialNumber",ui->sbSerialNumber->value ()); m_settings->setValue("FoxTextMsg", m_freeTextMsg0); m_settings->setValue("WorkDupes", ui->cbWorkDupes->isChecked()); @@ -1354,7 +1353,6 @@ void MainWindow::readSettings() m_Nslots=m_settings->value("FoxNslots",3).toInt(); m_Nslots0=m_Nslots; if(!m_config.superFox()) ui->sbNslots->setValue(m_Nslots); - ui->sbMax_dB->setValue(m_settings->value("FoxMaxDB_v2",70).toInt()); ui->sbSerialNumber->setValue (m_settings->value ("SerialNumber", 1).toInt ()); m_freeTextMsg0=m_settings->value("FoxTextMsg","").toString(); m_freeTextMsg=m_freeTextMsg0; @@ -10211,14 +10209,6 @@ void MainWindow::on_sbNslots_valueChanged(int n) if(!m_config.superFox()) m_Nslots0=n; } -void MainWindow::on_sbMax_dB_valueChanged(int n) -{ - m_max_dB=n; - if(m_specOp!=SpecOp::FOX) return; - QString t; - t = t.asprintf(" Max_dB %d",m_max_dB); - writeFoxQSO(t); -} void MainWindow::FoxReset(QString reason="") { QFile f(m_config.temp_dir().absoluteFilePath("houndcallers.txt")); diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index 6b7fd6597..1c3ca3178 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -330,7 +330,6 @@ private slots: void on_measure_check_box_stateChanged (int); void on_sbNlist_valueChanged(int n); void on_sbNslots_valueChanged(int n); - void on_sbMax_dB_valueChanged(int n); void on_sbF_Low_valueChanged(int n); void on_sbF_High_valueChanged(int n); void chk_FST4_freq_range(); diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index 11e58630a..9a0aa7790 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -42,7 +42,6 @@ 10 - 50 false @@ -186,7 +185,6 @@ 10 - 50 false @@ -2063,32 +2061,14 @@ Double-click to reset to the standard 73 message 6 - - - - - 9 - - + + - Queue - - - Qt::AlignCenter + Allow Dupes - - - - <html><head/><body><p>Transmit free text message at the next opportunity.</p></body></html> - - - Send msg - - - - + <html><head/><body><p>Enter a free text message.</p></body></html> @@ -2098,89 +2078,7 @@ Double-click to reset to the standard 73 message - - - - In Progress - - - Qt::AlignCenter - - - - - - - <html><head/><body><p>Clear all queues.</p></body></html> - - - Reset - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - <html><head/><body><p>Maximum number of callsigns to be displayed in the queue.</p></body></html> - - - N List - - - 5 - - - 100 - - - 12 - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - <html><head/><body><p>Set the maximum permitted SNR for callers to be included in the queue.</p></body></html> - - - Max dB - - - -15 - - - 70 - - - 30 - - - - + <html><head/><body><p>Select a specific CQ message.</p></body></html> @@ -2280,18 +2178,40 @@ Double-click to reset to the standard 73 message - - - - <html><head/><body><p>Include a CQ message along with other messages.</p></body></html> - + + - More CQs + In Progress + + + Qt::AlignCenter - - + + + + true + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QAbstractScrollArea::AdjustToContentsOnFirstShow + + + + + 0 @@ -2305,25 +2225,39 @@ Double-click to reset to the standard 73 message - <html><head/><body><p>Maximum number of concurrent streams for Fox transmissions.</p></body></html> - - - + <html><head/><body><p>Maximum number of callsigns to be displayed in the queue.</p></body></html> - N Slots + N List - 1 - - 5 - - 1 + + 100 - - 10 + + 12 + + + + + + + <html><head/><body><p>Transmit free text message at the next opportunity.</p></body></html> + + + Send msg + + + + + + + <html><head/><body><p>Clear all queues.</p></body></html> + + + Reset @@ -2392,13 +2326,20 @@ Double-click to reset to the standard 73 message - - - - true + + + + <html><head/><body><p>Include a CQ message along with other messages.</p></body></html> + + More CQs + + + + + - + 0 0 @@ -2409,12 +2350,45 @@ Double-click to reset to the standard 73 message 16777215 - - QAbstractScrollArea::AdjustToContentsOnFirstShow + + <html><head/><body><p>Maximum number of concurrent streams for Fox transmissions.</p></body></html> + + + + + + N Slots + + + 1 + + + 5 + + + 1 + + + 10 - + + + + + 9 + + + + Queue + + + Qt::AlignCenter + + + + @@ -2433,13 +2407,6 @@ Double-click to reset to the standard 73 message - - - - Allow Dupes - - - @@ -3244,7 +3211,7 @@ QPushButton[state="ok"] { 0 0 880 - 21 + 22