diff --git a/doc/user_guide/en/wsjtx-main.adoc b/doc/user_guide/en/wsjtx-main.adoc
index 4d3d4890a..74b0660f9 100644
--- a/doc/user_guide/en/wsjtx-main.adoc
+++ b/doc/user_guide/en/wsjtx-main.adoc
@@ -137,14 +137,14 @@ include::tutorial-example2.adoc[]
== Making QSOs
include::make-qso.adoc[]
-[[WSPR]]
-== WSPR Mode
-include::wspr.adoc[]
-
[[VHF_AND_UP]]
== VHF+ Features
include::vhf-features.adoc[]
+[[WSPR]]
+== WSPR Mode
+include::wspr.adoc[]
+
[[COMMAND_REF]]
== On-Screen Controls
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2af953025..ebd8eaa04 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -473,7 +473,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->actionJT65->setActionGroup(modeGroup);
ui->actionJT9_JT65->setActionGroup(modeGroup);
ui->actionJT4->setActionGroup(modeGroup);
- ui->actionWSPR_2->setActionGroup(modeGroup);
+ ui->actionWSPR->setActionGroup(modeGroup);
ui->actionEcho->setActionGroup(modeGroup);
ui->actionISCAT->setActionGroup(modeGroup);
ui->actionMSK144->setActionGroup(modeGroup);
@@ -776,7 +776,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
if(m_mode=="JT9") on_actionJT9_triggered();
if(m_mode=="JT65") on_actionJT65_triggered();
if(m_mode=="JT9+JT65") on_actionJT9_JT65_triggered();
- if(m_mode=="WSPR") on_actionWSPR_2_triggered();
+ if(m_mode=="WSPR") on_actionWSPR_triggered();
if(m_mode=="Echo") on_actionEcho_triggered();
if(m_mode=="ISCAT") on_actionISCAT_triggered();
if(m_mode=="MSK144") on_actionMSK144_triggered();
@@ -4207,7 +4207,7 @@ void MainWindow::on_actionJT4_triggered()
}
}
-void MainWindow::on_actionWSPR_2_triggered()
+void MainWindow::on_actionWSPR_triggered()
{
m_mode="WSPR";
WSPR_config(true);
@@ -4223,7 +4223,7 @@ void MainWindow::on_actionWSPR_2_triggered()
m_hsymStop=396;
m_toneSpacing=12000.0/8192.0;
setup_status_bar (false);
- ui->actionWSPR_2->setChecked(true);
+ ui->actionWSPR->setChecked(true);
VHF_features_enabled(false);
ui->ClrAvgButton->setVisible(false);
m_wideGraph->setPeriod(m_TRperiod,m_nsps);
diff --git a/mainwindow.h b/mainwindow.h
index 8d7ff1a14..20d43620d 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -224,7 +224,7 @@ private slots:
void on_cbTx6_toggled(bool b);
void networkError (QString const&);
void on_ClrAvgButton_clicked();
- void on_actionWSPR_2_triggered();
+ void on_actionWSPR_triggered();
void on_syncSpinBox_valueChanged(int n);
void on_TxPowerComboBox_currentIndexChanged(const QString &arg1);
void on_sbTxPercent_valueChanged(int n);
diff --git a/mainwindow.ui b/mainwindow.ui
index 7ac28dda5..e183c14e4 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2371,7 +2371,7 @@ QPushButton[state="ok"] {
-
+
@@ -2760,7 +2760,7 @@ QPushButton[state="ok"] {
Enable deep search
-
+
true
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 092a3c5ed..0a653f5b8 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -1,6 +1,7 @@
set (SAMPLE_FILES
JT9+JT65/130610_2343.wav
JT9/130418_1742.wav
+ JT65/JT65B/DL7UAE_040308_002400.wav
)
set (contents_file_name contents_${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.json)
diff --git a/samples/ISCAT/ISCAT-A/VK7MO_110401_235515.wav b/samples/ISCAT/ISCAT-A/VK7MO_110401_235515.wav
new file mode 100644
index 000000000..ca8cbf217
Binary files /dev/null and b/samples/ISCAT/ISCAT-A/VK7MO_110401_235515.wav differ
diff --git a/samples/ISCAT/ISCAT-B/K0AWU_100714_115000.wav b/samples/ISCAT/ISCAT-B/K0AWU_100714_115000.wav
new file mode 100644
index 000000000..405ba8646
Binary files /dev/null and b/samples/ISCAT/ISCAT-B/K0AWU_100714_115000.wav differ
diff --git a/samples/JT4/JT4A/DF2ZC_070926_040700.WAV b/samples/JT4/JT4A/DF2ZC_070926_040700.WAV
new file mode 100644
index 000000000..76b2b1069
Binary files /dev/null and b/samples/JT4/JT4A/DF2ZC_070926_040700.WAV differ
diff --git a/samples/JT4/JT4F/OK1KIR_141105_175700.WAV b/samples/JT4/JT4F/OK1KIR_141105_175700.WAV
new file mode 100644
index 000000000..5c260cd55
Binary files /dev/null and b/samples/JT4/JT4F/OK1KIR_141105_175700.WAV differ
diff --git a/samples/JT65/JT65B/DL7UAE_040308_002400.wav b/samples/JT65/JT65B/DL7UAE_040308_002400.wav
new file mode 100644
index 000000000..f0d3d58fb
Binary files /dev/null and b/samples/JT65/JT65B/DL7UAE_040308_002400.wav differ
diff --git a/samples/MSK144/160915_113100.wav b/samples/MSK144/160915_113100.wav
new file mode 100644
index 000000000..295f11d6e
Binary files /dev/null and b/samples/MSK144/160915_113100.wav differ
diff --git a/samples/MSK144/160915_113230.wav b/samples/MSK144/160915_113230.wav
new file mode 100644
index 000000000..f1337a709
Binary files /dev/null and b/samples/MSK144/160915_113230.wav differ
diff --git a/samples/QRA64/QRA64A/160707_1554.wav b/samples/QRA64/QRA64A/160707_1554.wav
new file mode 100644
index 000000000..947d63ada
Binary files /dev/null and b/samples/QRA64/QRA64A/160707_1554.wav differ
diff --git a/samples/QRA64/QRA64A/160729_0056.wav b/samples/QRA64/QRA64A/160729_0056.wav
new file mode 100644
index 000000000..5507a6582
Binary files /dev/null and b/samples/QRA64/QRA64A/160729_0056.wav differ
diff --git a/samples/WSPR/150426_0918.wav b/samples/WSPR/150426_0918.wav
new file mode 100644
index 000000000..c53ec20ab
Binary files /dev/null and b/samples/WSPR/150426_0918.wav differ
diff --git a/wsjtx.pro b/wsjtx.pro
index fa42195dc..5c5e0d8cc 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -65,7 +65,7 @@ SOURCES += \
WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \
main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \
echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
- WSPRBandHopping.cpp MessageAggregator.cpp
+ WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp
HEADERS += qt_helpers.hpp \
pimpl_h.hpp pimpl_impl.hpp \
@@ -80,7 +80,7 @@ HEADERS += qt_helpers.hpp \
Configuration.hpp wsprnet.h signalmeter.h meterwidget.h \
logbook/logbook.h logbook/countrydat.h logbook/countriesworked.h logbook/adif.h \
messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
- WsprTxScheduler.h
+ WsprTxScheduler.h SampleDownloader.hpp
INCLUDEPATH += qmake_only