1
0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-23 20:48:33 -04:00

Remove the Fox MaxDB function. Keep m_max_dB for now, just set it to 70 dB.

This commit is contained in:
Uwe Risse 2024-09-18 18:25:28 +02:00
parent 463f655236
commit 6b98c85473
3 changed files with 110 additions and 154 deletions

View File

@ -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"));

View File

@ -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();

View File

@ -42,7 +42,6 @@
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@ -186,7 +185,6 @@
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
@ -2063,32 +2061,14 @@ Double-click to reset to the standard 73 message</string>
<property name="horizontalSpacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_queue">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<item row="0" column="2">
<widget class="QCheckBox" name="cbWorkDupes">
<property name="text">
<string>Queue</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<string>Allow Dupes</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QCheckBox" name="cbSendMsg">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Transmit free text message at the next opportunity.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Send msg</string>
</property>
</widget>
</item>
<item row="8" column="2">
<item row="7" column="2">
<widget class="QPushButton" name="pbFreeText">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a free text message.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -2098,89 +2078,7 @@ Double-click to reset to the standard 73 message</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_inProcess">
<property name="text">
<string>In Progress</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QPushButton" name="pbFoxReset">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Clear all queues.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="sbNlist">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of callsigns to be displayed in the queue.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>N List </string>
</property>
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>12</number>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QSpinBox" name="sbMax_dB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the maximum permitted SNR for callers to be included in the queue.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>Max dB </string>
</property>
<property name="minimum">
<number>-15</number>
</property>
<property name="maximum">
<number>70</number>
</property>
<property name="value">
<number>30</number>
</property>
</widget>
</item>
<item row="5" column="2">
<item row="4" column="2">
<widget class="QComboBox" name="comboBoxCQ">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a specific CQ message.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -2280,18 +2178,40 @@ Double-click to reset to the standard 73 message</string>
</item>
</widget>
</item>
<item row="6" column="2">
<widget class="QCheckBox" name="cbMoreCQs">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Include a CQ message along with other messages.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<item row="0" column="1">
<widget class="QLabel" name="label_inProcess">
<property name="text">
<string>More CQs</string>
<string>In Progress</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QSpinBox" name="sbNslots">
<item row="1" column="1" rowspan="9">
<widget class="DisplayText" name="foxTxListTextBrowser">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QSpinBox" name="sbNlist">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -2305,25 +2225,39 @@ Double-click to reset to the standard 73 message</string>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of concurrent streams for Fox transmissions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="suffix">
<string/>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of callsigns to be displayed in the queue.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>N Slots </string>
<string>N List </string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>5</number>
</property>
<property name="value">
<number>1</number>
<property name="maximum">
<number>100</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
<property name="value">
<number>12</number>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QCheckBox" name="cbSendMsg">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Transmit free text message at the next opportunity.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Send msg</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QPushButton" name="pbFoxReset">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Clear all queues.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
@ -2392,13 +2326,20 @@ Double-click to reset to the standard 73 message</string>
</item>
</widget>
</item>
<item row="1" column="1" rowspan="10">
<widget class="DisplayText" name="foxTxListTextBrowser">
<property name="enabled">
<bool>true</bool>
<item row="5" column="2">
<widget class="QCheckBox" name="cbMoreCQs">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Include a CQ message along with other messages.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>More CQs</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QSpinBox" name="sbNslots">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -2409,12 +2350,45 @@ Double-click to reset to the standard 73 message</string>
<height>16777215</height>
</size>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of concurrent streams for Fox transmissions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="suffix">
<string/>
</property>
<property name="prefix">
<string>N Slots </string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>5</number>
</property>
<property name="value">
<number>1</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="10">
<item row="0" column="0">
<widget class="QLabel" name="label_queue">
<property name="font">
<font>
<pointsize>9</pointsize>
</font>
</property>
<property name="text">
<string>Queue</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="9">
<widget class="DisplayText" name="houndQueueTextBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
@ -2433,13 +2407,6 @@ Double-click to reset to the standard 73 message</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="cbWorkDupes">
<property name="text">
<string>Allow Dupes</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
@ -3244,7 +3211,7 @@ QPushButton[state=&quot;ok&quot;] {
<x>0</x>
<y>0</y>
<width>880</width>
<height>21</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">