w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-UR' into feat-a7-UR

Browse Source
This commit is contained in:
Joe Taylor 2022-01-10 11:39:53 -05:00
commit 9d7f323231
8 changed files with 620 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Configuration.cpp
View File

@ -920,6 +920,30 @@ void Configuration::set_location (QString const& grid_descriptor)
m_->dynamic_grid_ = grid_descriptor.trimmed ();
}
void Configuration::setSpecial_Hound()
{
m_->bSpecialOp_=true;
m_->ui_->gbSpecialOpActivity->setChecked(m_->bSpecialOp_);
m_->ui_->rbHound->setChecked(true);
m_->SelectedActivity_ = static_cast<int> (SpecialOperatingActivity::HOUND);
m_->write_settings();
}
void Configuration::setSpecial_Fox()
{
m_->bSpecialOp_=true;
m_->ui_->gbSpecialOpActivity->setChecked(m_->bSpecialOp_);
m_->ui_->rbFox->setChecked(true);
m_->SelectedActivity_ = static_cast<int> (SpecialOperatingActivity::FOX);
m_->write_settings();
}
void Configuration::setSpecial_None()
{
m_->bSpecialOp_=false;
m_->ui_->gbSpecialOpActivity->setChecked(m_->bSpecialOp_);
m_->write_settings();
}
namespace
{
#if defined (Q_OS_MAC)

3
Configuration.hpp
View File

@ -181,6 +181,9 @@ public:
bool highlight_by_mode () const;
bool highlight_only_fields () const;
bool include_WAE_entities () const;
void setSpecial_Hound();
void setSpecial_Fox();
void setSpecial_None();
enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, FOX, HOUND};
SpecialOperatingActivity special_op_id () const;

4
lib/ft8/ft8b.f90
View File

@ -451,11 +451,11 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,nzhsym,lapon, &
if(.not.nagain) then
xsnr=xsnr2
endif
if(nsync.le.10 .and. xsnr.lt.-24.0) then !bail out, likely false decode
if(nsync.le.6 .and. xsnr.lt.-25.0) then !bail out, likely false decode
nbadcrc=1
return
endif
if(xsnr .lt. -24.0) xsnr=-24.0
if(xsnr .lt. -25.0) xsnr=-25.0
return
enddo
return

5
lib/ft8_decode.f90
View File

@ -167,8 +167,9 @@ contains
if(ndepth.eq.1) npass=1
do ipass=1,npass
newdat=.true.
syncmin=1.3
if(ndepth.le.2) syncmin=1.6
syncmin=1.2
if(ndepth.eq.1) syncmin=1.6
if(ndepth.eq.2) syncmin=1.4
if(ipass.eq.1) then
lsubtract=.true.
ndeep=ndepth

63
widgets/mainwindow.cpp
View File

@ -3709,7 +3709,8 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
void MainWindow::pskPost (DecodedText const& decodedtext)
{
if (m_diskData || !m_config.spot_to_psk_reporter() || decodedtext.isLowConfidence ()) return;
if (m_diskData || !m_config.spot_to_psk_reporter() || decodedtext.isLowConfidence ()
|| (decodedtext.string().contains(m_baseCall) && dec_data.params.mygrid)) return; // prevent self spotting when running multiple instances
QString msgmode=m_mode;
QString deCall;
@ -6221,7 +6222,6 @@ void MainWindow::on_actionFT8_triggered()
m_bFast9=false;
m_bFastMode=false;
WSPR_config(false);
switch_mode (Modes::FT8);
m_nsps=6912;
m_FFTSize = m_nsps / 2;
Q_EMIT FFTSize (m_FFTSize);
@ -6272,6 +6272,8 @@ void MainWindow::on_actionFT8_triggered()
on_fox_log_action_triggered();
}
if(SpecOp::HOUND == m_config.special_op_id()) {
ui->houndButton->setChecked(true);
ui->houndButton->setStyleSheet("background-color: #ff0000;");
ui->txFirstCheckBox->setChecked(false);
ui->txFirstCheckBox->setEnabled(false);
ui->cbAutoSeq->setEnabled(false);
@ -6289,6 +6291,8 @@ void MainWindow::on_actionFT8_triggered()
ui->txb4->setEnabled(false);
ui->txb5->setEnabled(false);
ui->txb6->setEnabled(false);
} else {
switch_mode (Modes::FT8);
}
if (SpecOp::NONE < m_config.special_op_id () && SpecOp::FOX > m_config.special_op_id ()) {
@ -7034,6 +7038,7 @@ void MainWindow::on_rptSpinBox_valueChanged(int n)
void MainWindow::on_tuneButton_clicked (bool checked)
{
tuneATU_Timer.start (60000); // tune watchdog (60s)
static bool lastChecked = false;
if (lastChecked == checked) return;
lastChecked = checked;
@ -9443,3 +9448,57 @@ QString MainWindow::WSPR_message()
}
return msg2;
}
void MainWindow::on_houndButton_clicked (bool checked)
{
if (checked) {
ui->houndButton->setStyleSheet("background-color: #ff0000;");
m_config.setSpecial_Hound();
} else {
ui->houndButton->setStyleSheet("");
m_config.setSpecial_None();
}
on_actionFT8_triggered();
}
void MainWindow::on_ft8Button_clicked()
{
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
m_config.setSpecial_None();
on_actionFT8_triggered();
}
void MainWindow::on_ft4Button_clicked()
{
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
m_config.setSpecial_None();
on_actionFT4_triggered();
}
void MainWindow::on_msk144Button_clicked()
{
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
m_config.setSpecial_None();
on_actionMSK144_triggered();
}
void MainWindow::on_q65Button_clicked()
{
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
m_config.setSpecial_None();
on_actionQ65_triggered();
// ui->sbTR->setValue (m_settings->value ("TRPeriod", 30).toInt()); // set default TRPeriod to 30s
}
void MainWindow::on_fst4Button_clicked()
{
ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet("");
m_config.setSpecial_None();
on_actionFST4_triggered();
// ui->sbTR->setValue (m_settings->value ("TRPeriod", 60).toInt()); // set default TRPeriod to 60s
}

6
widgets/mainwindow.h
View File

@ -141,6 +141,12 @@ private:
private slots:
void initialize_fonts ();
void on_houndButton_clicked(bool checked);
void on_ft8Button_clicked();
void on_ft4Button_clicked();
void on_msk144Button_clicked();
void on_q65Button_clicked();
void on_fst4Button_clicked();
void on_tx1_editingFinished();
void on_tx2_editingFinished();
void on_tx3_editingFinished();

922
widgets/mainwindow.ui
View File

@ -2,6 +2,14 @@
<ui version="4.0">
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>882</width>
<height>718</height>
</rect>
</property>
<property name="windowTitle">
<string>WSJT-X by K1JT</string>
</property>
@ -552,362 +560,15 @@
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_5" rowstretch="1,0,0" columnstretch="0,0,1,4,0">
<item row="0" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QPushButton" name="readFreq">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="accessibleDescription">
<string>If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode.</string>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
font-family: helvetica;
font-size: 9pt;
font-weight: bold;
background-color: white;
color: black;
border-style: solid;
border-width:1px;
border-radius:10px;
border-color: gray;
max-width:20px;
max-height:20px;
min-width:20px;
min-height:20px;
}
QPushButton[state=&quot;error&quot;] {
background-color: red;
}
QPushButton[state=&quot;warning&quot;] {
background-color: orange;
}
QPushButton[state=&quot;ok&quot;] {
background-color: #00ff00;
}</string>
</property>
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="0" column="4">
<layout class="QGridLayout" name="gridLayout_5" rowstretch="1,0,0" columnstretch="0,0,0,1,4,0">
<item row="0" column="5">
<widget class="QLabel" name="label">
<property name="text">
<string> Pwr</string>
</property>
</widget>
</item>
<item row="1" column="4" rowspan="2">
<widget class="QSlider" name="outAttenuation">
<property name="toolTip">
<string>Adjust Tx audio level</string>
</property>
<property name="maximum">
<number>450</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>true</bool>
</property>
<property name="invertedControls">
<bool>true</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>50</number>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QWidget" name="DX_controls_widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QGridLayout" name="gridLayout_2" columnstretch="2,1">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>DX Call</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="indent">
<number>2</number>
</property>
<property name="buddy">
<cstring>dxCallEntry</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_4">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>DX Grid</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="indent">
<number>2</number>
</property>
<property name="buddy">
<cstring>dxGridEntry</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="dxCallEntry">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Callsign of station to be worked</string>
</property>
<property name="maxLength">
<number>11</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="dxGridEntry">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Locator of station to be worked</string>
</property>
<property name="text">
<string>`</string>
</property>
<property name="maxLength">
<number>6</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<widget class="QPushButton" name="lookupButton">
<property name="toolTip">
<string>Search for callsign in database</string>
</property>
<property name="text">
<string>&amp;Lookup</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="addButton">
<property name="toolTip">
<string>Add callsign and locator to database</string>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="labAz">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>Az: 251 16553 km</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="indent">
<number>4</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="2" column="1" colspan="2">
<item row="2" column="2" colspan="2">
<widget class="QLabel" name="labUTC">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@ -946,40 +607,7 @@ QPushButton[state=&quot;ok&quot;] {
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="labDialFreq">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>USB dial frequency</string>
</property>
<property name="styleSheet">
<string notr="true">QLabel {
font-family: MS Shell Dlg 2;
font-size: 16pt;
color : yellow;
background-color : black;
}
QLabel[oob=&quot;true&quot;] {
background-color: red;
}</string>
</property>
<property name="text">
<string>14.078 000</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>5</number>
</property>
</widget>
</item>
<item row="0" column="3" rowspan="3">
<item row="0" column="4" rowspan="3">
<widget class="QStackedWidget" name="controls_stack_widget">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@ -2761,10 +2389,44 @@ Double-click to reset to the standard 73 message</string>
</widget>
</widget>
</item>
<item row="0" column="0">
<widget class="BandComboBox" name="bandComboBox">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select operating band or enter frequency in MHz or enter kHz increment followed by k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="accessibleName">
<string>Frequency entry</string>
</property>
<property name="accessibleDescription">
<string>Select operating band or enter frequency in MHz or enter kHz increment followed by k.</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<widget class="QSpinBox" name="sbNB">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
@ -2818,28 +2480,489 @@ Yellow when too low</string>
</item>
</layout>
</item>
<item row="1" column="2" colspan="2">
<widget class="QWidget" name="DX_controls_widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QGridLayout" name="gridLayout_2" columnstretch="2,1">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="BandComboBox" name="bandComboBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select operating band or enter frequency in MHz or enter kHz increment followed by k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<widget class="QLabel" name="label_3">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="accessibleName">
<string>Frequency entry</string>
</property>
<property name="accessibleDescription">
<string>Select operating band or enter frequency in MHz or enter kHz increment followed by k.</string>
</property>
<property name="editable">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
<property name="text">
<string>DX Call</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="indent">
<number>2</number>
</property>
<property name="buddy">
<cstring>dxCallEntry</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_4">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>252</red>
<green>252</green>
<blue>252</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>175</green>
<blue>213</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>DX Grid</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="indent">
<number>2</number>
</property>
<property name="buddy">
<cstring>dxGridEntry</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="dxCallEntry">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Callsign of station to be worked</string>
</property>
<property name="maxLength">
<number>11</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="dxGridEntry">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Locator of station to be worked</string>
</property>
<property name="text">
<string>`</string>
</property>
<property name="maxLength">
<number>6</number>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<widget class="QPushButton" name="lookupButton">
<property name="toolTip">
<string>Search for callsign in database</string>
</property>
<property name="text">
<string>&amp;Lookup</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="addButton">
<property name="toolTip">
<string>Add callsign and locator to database</string>
</property>
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="labAz">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>Az: 251 16553 km</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="indent">
<number>4</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="1" column="5" rowspan="2">
<widget class="QSlider" name="outAttenuation">
<property name="toolTip">
<string>Adjust Tx audio level</string>
</property>
<property name="maximum">
<number>450</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>true</bool>
</property>
<property name="invertedControls">
<bool>true</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>50</number>
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QPushButton" name="readFreq">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="accessibleDescription">
<string>If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode.</string>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
font-family: helvetica;
font-size: 9pt;
font-weight: bold;
background-color: white;
color: black;
border-style: solid;
border-width:1px;
border-radius:10px;
border-color: gray;
max-width:20px;
max-height:20px;
min-width:20px;
min-height:20px;
}
QPushButton[state=&quot;error&quot;] {
background-color: red;
}
QPushButton[state=&quot;warning&quot;] {
background-color: orange;
}
QPushButton[state=&quot;ok&quot;] {
background-color: #00ff00;
}</string>
</property>
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QLabel" name="labDialFreq">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>USB dial frequency</string>
</property>
<property name="styleSheet">
<string notr="true">QLabel {
font-family: MS Shell Dlg 2;
font-size: 16pt;
color : yellow;
background-color : black;
}
QLabel[oob=&quot;true&quot;] {
background-color: red;
}</string>
</property>
<property name="text">
<string>14.078 000</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>5</number>
</property>
</widget>
</item>
<item row="1" column="1" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout_15">
<item>
<widget class="QPushButton" name="houndButton">
<property name="maximumSize">
<size>
<width>32</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Toggle FT8 hound mode on/off</string>
</property>
<property name="text">
<string>H</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ft8Button">
<property name="maximumSize">
<size>
<width>32</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Switch to FT8 mode</string>
</property>
<property name="text">
<string>FT8</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="ft4Button">
<property name="maximumSize">
<size>
<width>32</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Switch to FT4 mode</string>
</property>
<property name="text">
<string>FT4</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="msk144Button">
<property name="maximumSize">
<size>
<width>32</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Switch to MSK144 mode</string>
</property>
<property name="text">
<string>MSK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="q65Button">
<property name="maximumSize">
<size>
<width>32</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Switch to Q65 mode</string>
</property>
<property name="text">
<string>Q65</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="fst4Button">
<property name="maximumSize">
<size>
<width>32</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Switch to FST4 mode</string>
</property>
<property name="text">
<string>FST4</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
@ -2852,7 +2975,7 @@ Yellow when too low</string>
<rect>
<x>0</x>
<y>0</y>
<width>842</width>
<width>882</width>
<height>21</height>
</rect>
</property>
@ -3521,7 +3644,6 @@ Yellow when too low</string>
<tabstop>tuneButton</tabstop>
<tabstop>cbMenus</tabstop>
<tabstop>bandComboBox</tabstop>
<tabstop>readFreq</tabstop>
<tabstop>sbNB</tabstop>
<tabstop>dxCallEntry</tabstop>
<tabstop>dxGridEntry</tabstop>

2
widgets/signalmeter.cpp
View File

@ -77,7 +77,7 @@ SignalMeter::SignalMeter (QWidget * parent)
outer_layout->setSpacing (0);
auto inner_layout = new QHBoxLayout;
inner_layout->setContentsMargins (9, 0, 9, 0);
inner_layout->setContentsMargins (1, 0, 1, 0);
inner_layout->setSpacing (0);
m_meter = new MeterWidget;