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

Back out r8508 changes to mainwindow.cpp, that was unintended.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2018-02-19 18:05:06 +00:00
parent f92da0eb57
commit 319d639e98
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mainwindow.cpp
View File

@ -2727,7 +2727,6 @@ void MainWindow::decode() //decode()
} else { } else {
memcpy(to, from, qMin(mem_jt9->size(), size)); memcpy(to, from, qMin(mem_jt9->size(), size));
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow jt9 to start QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow jt9 to start
qDebug() << "aa" << dec_data.params.nutc;
decodeBusy(true); decodeBusy(true);
} }
} }
@ -2800,7 +2799,6 @@ void MainWindow::writeAllTxt(QString message)
void MainWindow::decodeDone () void MainWindow::decodeDone ()
{ {
qDebug() << "yy";
dec_data.params.nagain=0; dec_data.params.nagain=0;
dec_data.params.ndiskdat=0; dec_data.params.ndiskdat=0;
m_nclearave=0; m_nclearave=0;
@ -2810,14 +2808,12 @@ void MainWindow::decodeDone ()
m_RxLog=0; m_RxLog=0;
m_blankLine=true; m_blankLine=true;
if(m_config.bFox()) houndCallers(); if(m_config.bFox()) houndCallers();
qDebug() << "zz";
} }
void MainWindow::readFromStdout() //readFromStdout void MainWindow::readFromStdout() //readFromStdout
{ {
while(proc_jt9.canReadLine()) { while(proc_jt9.canReadLine()) {
QByteArray t=proc_jt9.readLine(); QByteArray t=proc_jt9.readLine();
qDebug() << "bb" << t;
if(m_mode=="FT8" and !m_config.bHound() and t.contains(";")) { if(m_mode=="FT8" and !m_config.bHound() and t.contains(";")) {
if(t.contains("<...>")) continue; if(t.contains("<...>")) continue;
if(!m_bWarnedHound) { if(!m_bWarnedHound) {
@ -7488,7 +7484,7 @@ void MainWindow::foxTxSequencer()
* is to be started. * is to be started.
* *
* Determine what the Tx message(s) will be for each active slot, call * Determine what the Tx message(s) will be for each active slot, call
* foxgenWaveform() to generate and accumulate the corresponding waveform. * foxgen() to generate and accumulate the corresponding waveform.
*/ */
qint64 now=QDateTime::currentMSecsSinceEpoch()/1000; qint64 now=QDateTime::currentMSecsSinceEpoch()/1000;
@ -7512,12 +7508,13 @@ void MainWindow::foxTxSequencer()
rm_tb4(hc2); //Remove this hound from tb4 rm_tb4(hc2); //Remove this hound from tb4
fm = hc1 + " RR73; " + hc2 + " <" + m_config.my_callsign() + "> " + rpt; //Tx msg fm = hc1 + " RR73; " + hc2 + " <" + m_config.my_callsign() + "> " + rpt; //Tx msg
} }
// Log this QSO!
// Log this QSO!
m_hisCall=hc1; m_hisCall=hc1;
m_hisGrid=m_foxQSO[hc1].grid; m_hisGrid=m_foxQSO[hc1].grid;
m_rptSent=m_foxQSO[hc1].sent; m_rptSent=m_foxQSO[hc1].sent;
m_rptRcvd=m_foxQSO[hc1].rcvd; m_rptRcvd=m_foxQSO[hc1].rcvd;
// qDebug() << "Fox Logged :" << islot << m_hisCall << m_hisGrid << m_rptSent
// << m_rptRcvd << m_lastBand;
QDateTime logTime {QDateTime::currentDateTimeUtc ()}; QDateTime logTime {QDateTime::currentDateTimeUtc ()};
QString logLine=logTime.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall + QString logLine=logTime.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall +
" " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand; " " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand;
@ -7525,10 +7522,9 @@ void MainWindow::foxTxSequencer()
m_msgAvgWidget->foxAddLog(logLine); m_msgAvgWidget->foxAddLog(logLine);
} }
on_logQSOButton_clicked(); on_logQSOButton_clicked();
m_foxRateQueue.enqueue(now); //Add present time in seconds to Rate queue.
m_foxRateQueue.enqueue(now); //Add present time in seconds to the Rate queue. m_loggedByFox[hc1] += (m_lastBand + " ");
m_loggedByFox[hc1] += (m_lastBand + " "); //Note this Hound logged on current band if(m_foxQSOqueue.contains(hc1)) m_foxQSOqueue.removeOne(hc1);
if(m_foxQSOqueue.contains(hc1)) m_foxQSOqueue.removeOne(hc1); //Remove hc1 from QSOqueue
islot++; islot++;
foxGenWaveform(islot-1,fm); //Generate tx waveform foxGenWaveform(islot-1,fm); //Generate tx waveform