From 2fb7cfbdcc8d86403771e70213dc285586437d22 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 21 Feb 2018 15:48:56 +0000 Subject: [PATCH] Fix the way tx status label is set for Fox transmissions. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8517 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 12 +++++------- mainwindow.h | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index f51b7755a..7d170fc83 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3618,11 +3618,7 @@ void MainWindow::guiUpdate() if(m_transmitting) { char s[41]; if(m_config.bFox() and ui->tabWidget->currentIndex()==2) { - if(foxcom_.nslots==1) { - sprintf(s,"Tx: %s",foxcom_.cmsg[0]); - } else { - sprintf(s,"Tx: %d Slots",foxcom_.nslots); - } + sprintf(s,"Tx: %d Slots",foxcom_.nslots); } else { sprintf(s,"Tx: %s",msgsent); } @@ -3643,8 +3639,9 @@ void MainWindow::guiUpdate() } else { s[40]=0; QString t{QString::fromLatin1(s)}; -// if(m_mode=="FT8" and m_i3bit==1) t="Tx: RR73 NOW " + t.mid(4); -// if(m_mode=="FT8" and m_i3bit==2) t="Tx: NIL NOW " + t.mid(4); + if(m_config.bFox() and ui->tabWidget->currentIndex()==2 and foxcom_.nslots==1) { + t=m_fm1.trimmed(); + } tx_status_label.setText(t.trimmed()); } } @@ -7655,6 +7652,7 @@ void MainWindow::foxGenWaveform(int i,QString fm) foxcom_.i3bit[i]=0; if(fm.indexOf("<")>0) foxcom_.i3bit[i]=1; strncpy(&foxcom_.cmsg[i][0],fm.toLatin1(),40); //Copy this message into cmsg[i] + if(i==0) m_fm1=fm; QString t; t.sprintf(" Tx %d: ",i+1); writeFoxQSO(t + fm.trimmed()); diff --git a/mainwindow.h b/mainwindow.h index 218028dfc..d843a9e82 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -569,6 +569,7 @@ private: QString m_opCall; QString m_houndCallers; //Sorted list of Hound callers QString m_fm0; + QString m_fm1; QSet m_pfx; QSet m_sfx;