Introduce a 1-second delay before starting wsprd. (There is probably a better

way to make sure that the new .wav file is ready, before starting wsprd?)


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7242 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-26 19:01:46 +00:00
parent a4185e0665
commit a0d27d23f7
2 changed files with 16 additions and 4 deletions

View File

@ -4,9 +4,7 @@
#include <cinttypes> #include <cinttypes>
#include <limits> #include <limits>
#include <functional> #include <functional>
#include <fftw3.h> #include <fftw3.h>
#include <QLineEdit> #include <QLineEdit>
#include <QRegExpValidator> #include <QRegExpValidator>
#include <QRegExp> #include <QRegExp>
@ -610,9 +608,13 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ptt0Timer.setSingleShot(true); ptt0Timer.setSingleShot(true);
connect(&ptt0Timer, &QTimer::timeout, this, &MainWindow::stopTx2); connect(&ptt0Timer, &QTimer::timeout, this, &MainWindow::stopTx2);
ptt1Timer.setSingleShot(true); ptt1Timer.setSingleShot(true);
connect(&ptt1Timer, &QTimer::timeout, this, &MainWindow::startTx2); connect(&ptt1Timer, &QTimer::timeout, this, &MainWindow::startTx2);
p1Timer.setSingleShot(true);
connect(&p1Timer, &QTimer::timeout, this, &MainWindow::startP1);
logQSOTimer.setSingleShot(true); logQSOTimer.setSingleShot(true);
connect(&logQSOTimer, &QTimer::timeout, this, &MainWindow::on_logQSOButton_clicked); connect(&logQSOTimer, &QTimer::timeout, this, &MainWindow::on_logQSOButton_clicked);
@ -1180,7 +1182,8 @@ void MainWindow::dataSink(qint64 frames)
int i1=cmnd.indexOf("/wsprd "); int i1=cmnd.indexOf("/wsprd ");
cmnd=t3.mid(0,i1+7) + t3.mid(i1+7); cmnd=t3.mid(0,i1+7) + t3.mid(i1+7);
if (ui) ui->DecodeButton->setChecked (true); if (ui) ui->DecodeButton->setChecked (true);
p1.start(QDir::toNativeSeparators(cmnd)); m_cmndP1=QDir::toNativeSeparators(cmnd);
p1Timer.start(1000);
m_decoderBusy = true; m_decoderBusy = true;
statusUpdate (); statusUpdate ();
} }
@ -1188,6 +1191,12 @@ void MainWindow::dataSink(qint64 frames)
} }
} }
void MainWindow::startP1()
{
qDebug() << m_cmndP1;
p1.start(m_cmndP1);
}
QString MainWindow::save_wave_file (QString const& name, short const * data, int seconds, QString MainWindow::save_wave_file (QString const& name, short const * data, int seconds,
QString const& my_callsign, QString const& my_grid, QString const& mode, qint32 sub_mode, QString const& my_callsign, QString const& my_grid, QString const& mode, qint32 sub_mode,
Frequency frequency, QString const& his_call, QString const& his_grid) const Frequency frequency, QString const& his_call, QString const& his_grid) const

View File

@ -175,6 +175,7 @@ private slots:
void on_actionErase_ALL_TXT_triggered(); void on_actionErase_ALL_TXT_triggered();
void on_actionErase_wsjtx_log_adi_triggered(); void on_actionErase_wsjtx_log_adi_triggered();
void startTx2(); void startTx2();
void startP1();
void stopTx(); void stopTx();
void stopTx2(); void stopTx2();
void on_pbCallCQ_clicked(); void on_pbCallCQ_clicked();
@ -465,6 +466,7 @@ private:
QTimer RxQSYTimer; QTimer RxQSYTimer;
QTimer minuteTimer; QTimer minuteTimer;
QTimer splashTimer; QTimer splashTimer;
QTimer p1Timer;
QString m_path; QString m_path;
QString m_baseCall; QString m_baseCall;
@ -482,6 +484,7 @@ private:
QString m_qsoStart; QString m_qsoStart;
QString m_qsoStop; QString m_qsoStop;
QString m_cmnd; QString m_cmnd;
QString m_cmndP1;
QString m_msgSent0; QString m_msgSent0;
QString m_fileToSave; QString m_fileToSave;
QString m_calls; QString m_calls;