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

Working on Fox-mode code. This is an intermediate commit -- much still TBD.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8291 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-06 17:05:48 +00:00
parent f991f3053a
commit cac7b7c363
4 changed files with 298 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/decoder.f90
View File

@ -54,11 +54,11 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
10 if (params%nagain) then 10 if (params%nagain) then
open(13,file=trim(temp_dir)//'/decoded.txt',status='unknown', & open(13,file=trim(temp_dir)//'/decoded.txt',status='unknown', &
position='append',iostat=ios) position='append',iostat=ios)
if(params%nmode.eq.8) open(19,file=trim(temp_dir)//'/foxcalls.txt', & if(params%nmode.eq.8) open(19,file=trim(temp_dir)//'/houndcallers.txt', &
status='unknown',position='append',iostat=ios) status='unknown',position='append',iostat=ios)
else else
open(13,file=trim(temp_dir)//'/decoded.txt',status='unknown',iostat=ios) open(13,file=trim(temp_dir)//'/decoded.txt',status='unknown',iostat=ios)
if(params%nmode.eq.8) open(19,file=trim(temp_dir)//'/foxcalls.txt', & if(params%nmode.eq.8) open(19,file=trim(temp_dir)//'/houndcallers.txt', &
status='unknown',iostat=ios) status='unknown',iostat=ios)
endif endif
if(ios.ne.0) then if(ios.ne.0) then
@ -481,12 +481,11 @@ contains
c1=decoded0(1:i1-1)//' ' c1=decoded0(1:i1-1)//' '
c2=decoded0(i1+1:i2-1) c2=decoded0(i1+1:i2-1)
g2=decoded0(i2+1:i3-1) g2=decoded0(i2+1:i3-1)
!### CQ and .true. here are temporary ! ### if(c1.eq.params%mycall .and. i3-i2.eq.5 .and. isgrid4(g2) .and. &
if((c1.eq.params%mycall .or. c1.eq.'CQ' .or. .true.) .and. i3-i2.eq.5 & nint(freq).ge.1000) then
.and. isgrid4(g2)) then
n=params%nutc n=params%nutc
n15=(3600*(n/10000) + 60*mod((n/100),100) + mod(n,100))/15 n15=(3600*(n/10000) + 60*mod((n/100),100) + mod(n,100))/15
if(n15.lt.n15z) nwrap=nwrap+5760 !New UTC day if(n15.lt.n15z) nwrap=nwrap+5760 !New UTC day, handle the wrap
n15z=n15 n15z=n15
n15=n15+nwrap n15=n15+nwrap
nfox=nfox+1 nfox=nfox+1

352
mainwindow.cpp
View File

@ -870,10 +870,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_bDisplayedOnce=false; m_bDisplayedOnce=false;
m_wait=0; m_wait=0;
m_isort=-3; m_isort=-3;
m_min_dB=-30;
m_max_dB=30; m_max_dB=30;
m_CQtype="CQ"; m_CQtype="CQ";
m_toBeCalled="";
if(m_mode.startsWith ("WSPR") and m_pctx>0) { if(m_mode.startsWith ("WSPR") and m_pctx>0) {
QPalette palette {ui->sbTxPercent->palette ()}; QPalette palette {ui->sbTxPercent->palette ()};
@ -1733,7 +1731,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
doubleClickOnCall2(Qt::KeyboardModifier(Qt::ShiftModifier + Qt::ControlModifier + Qt::AltModifier)); doubleClickOnCall2(Qt::KeyboardModifier(Qt::ShiftModifier + Qt::ControlModifier + Qt::AltModifier));
return; return;
case Qt::Key_Backspace: case Qt::Key_Backspace:
qDebug() << "Key Backspace" << m_toBeCalled; qDebug() << "Key Backspace";
return; return;
} }
QMainWindow::keyPressEvent (e); QMainWindow::keyPressEvent (e);
@ -2363,6 +2361,11 @@ void MainWindow::read_wav_file (QString const& fname)
dec_data.params.kin = 0; dec_data.params.kin = 0;
dec_data.params.newdat = 0; dec_data.params.newdat = 0;
} }
if(basename.mid(0,10)=="000000_000") {
dec_data.params.nutc=15*basename.mid(10,3).toInt();
}
})); }));
} }
@ -2517,7 +2520,6 @@ void MainWindow::msgAvgDecode2()
void MainWindow::decode() //decode() void MainWindow::decode() //decode()
{ {
QDateTime now = QDateTime::currentDateTime(); QDateTime now = QDateTime::currentDateTime();
if( m_dateTimeLastTX.isValid () ) { if( m_dateTimeLastTX.isValid () ) {
qint64 isecs_since_tx = m_dateTimeLastTX.secsTo(now); qint64 isecs_since_tx = m_dateTimeLastTX.secsTo(now);
@ -2673,6 +2675,7 @@ void MainWindow::decode() //decode()
narg[12]=0; narg[12]=0;
narg[13]=-1; narg[13]=-1;
narg[14]=m_config.aggressive(); narg[14]=m_config.aggressive();
qDebug() << "a2" << dec_data.params.nutc;
memcpy(d2b,dec_data.d2,2*360000); memcpy(d2b,dec_data.d2,2*360000);
watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0], watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0],
&narg[0],&m_TRperiod,&m_msg[0][0], &narg[0],&m_TRperiod,&m_msg[0][0],
@ -2762,37 +2765,7 @@ void MainWindow::decodeDone ()
decodeBusy(false); decodeBusy(false);
m_RxLog=0; m_RxLog=0;
m_blankLine=true; m_blankLine=true;
if(m_config.bFox()) { if(m_config.bFox()) houndCallers();
QFile f(m_config.temp_dir().absoluteFilePath("foxcalls.txt"));
if(f.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream s(&f);
QString t="";
QString t0;
QString houndCall;
bool b;
while(!s.atEnd()) {
t0=s.readLine();
houndCall=t0.mid(0,6);
b=false;
if(ui->textBrowser3->toPlainText().indexOf(houndCall) >= 0) b=true;
if(ui->textBrowser4->toPlainText().indexOf(houndCall) >= 0) b=true;
if(!b) {
QString countryName,continent;
bool callWorkedBefore,countryWorkedBefore;
m_logBook.match(/*in*/houndCall,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
int i1=countryName.lastIndexOf(";");
continent=countryName.mid(i1+2,-1);
// qDebug() << "D" << t0 << continent;
t = t + t0 + " " + continent + "\n"; //Don't list calls already in QSO or in the stack
}
}
if(t.length()>30) {
m_isort=ui->comboBoxHoundSort->currentIndex();
QString t1=sortHoundCalls(t,m_isort,m_min_dB,m_max_dB);
ui->decodedTextBrowser->setText(t1);
}
}
}
} }
void MainWindow::readFromStdout() //readFromStdout void MainWindow::readFromStdout() //readFromStdout
@ -2860,32 +2833,13 @@ void MainWindow::readFromStdout() //readFromStdout
DecodedText decodedtext {QString::fromUtf8 (t.constData ()).remove (QRegularExpression {"\r|\n"}), "FT8" == m_mode && DecodedText decodedtext {QString::fromUtf8 (t.constData ()).remove (QRegularExpression {"\r|\n"}), "FT8" == m_mode &&
ui->cbVHFcontest->isChecked(), m_config.my_grid ()}; ui->cbVHFcontest->isChecked(), m_config.my_grid ()};
if(m_mode=="FT8" and m_config.bFox()) { if(m_mode=="FT8" and m_config.bFox() and
decodedtext.string().contains(" " + m_config.my_callsign() + " ") and
(decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) {
QString houndCall,houndGrid; QString houndCall,houndGrid;
decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid); decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid);
if(houndGrid.mid(0,2)=="R+" or houndGrid.mid(0,2)=="R-") { foxRxSequencer(houndCall,houndGrid);
QString a=ui->textBrowser3->toPlainText();
int i0=a.indexOf(houndCall);
if(i0 >= 0) {
QString b=a.mid(i0);
QStringList c=a.split("\n");
ui->textBrowser3->setText("");
for (int i=0; i<c.length(); i++) {
QString d=c.at(i);
if(d.indexOf(houndCall)<0 and d.indexOf("RR73")<0) {
ui->textBrowser3->displayFoxToBeCalled(d,"#ffffff");
} else {
if(d.indexOf("RR73")<0) {
int i1=qMax(d.indexOf("+"),d.indexOf("-"));
d=d.mid(0,i1-1) + " RR73";
} }
ui->textBrowser3->displayFoxToBeCalled(d,"#ff99ff");
}
}
}
}
}
//Left (Band activity) window //Left (Band activity) window
if(!bAvgMsg) { if(!bAvgMsg) {
if(m_mode=="FT8" and m_config.bFox()) { if(m_mode=="FT8" and m_config.bFox()) {
@ -3022,7 +2976,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
// look for type 2 compound call replies on our Tx and Rx offsets // look for type 2 compound call replies on our Tx and Rx offsets
&& ((within_tolerance && "DE" == message_words.at (1)) && ((within_tolerance && "DE" == message_words.at (1))
|| message_words.at (1).contains (m_baseCall))))) { || message_words.at (1).contains (m_baseCall))))) {
processMessage (message); if(!m_config.bFox()) processMessage (message);
} }
} }
} }
@ -3329,35 +3283,7 @@ void MainWindow::guiUpdate()
} }
if(m_modeTx=="FT8") { if(m_modeTx=="FT8") {
if(m_config.bFox()) { if(m_config.bFox()) {
QString msg[5]; foxTxSequencer();
QString t1;
QString t3=ui->textBrowser3->toPlainText() + "\n";
QString t4=ui->textBrowser4->toPlainText() + "\n";
int islots=t3.split("\n").size() - 1;
for(int i=0; i<m_Nslots; i++) {
msg[i]="";
if(i<islots and t3.length() >= 11) {
m_houndCall[i]=t3.split("\n").at(i).mid(0,7);
t1=t3.split("\n").at(i).mid(6,5);
if(t1.indexOf("-")>=0 or t1.indexOf("+")>6) m_houndRptSent[i]=t1;
msg[i]= m_houndCall[i] + m_config.my_callsign() + t1;
}
if(msg[i]=="") msg[i]=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() +
" " + m_config.my_grid().mid(0,4);
msg[i] += " ";
msg[i]=msg[i].mid(0,32);
if(msg[i].indexOf(" RR73 ") > 6) {
qDebug() << "Logit:" << m_houndCall[i] << m_houndRptSent[i];
}
ui->decodedTextBrowser2->displayTransmittedText(msg[i], m_modeTx,
300+60*i,m_config.color_TxMsg(),m_bFastMode);
foxcom_.i3bit[i]=0;
if(msg[i].indexOf("<")>0) foxcom_.i3bit[i]=1;
qDebug() << i << foxcom_.i3bit[i] << msg[i].trimmed();
strncpy(&foxcom_.cmsg[i][0], msg[i].toLatin1(),32);
}
foxcom_.nslots=m_Nslots;
foxgen_();
} else { } else {
m_i3bit=0; m_i3bit=0;
genft8_(message, MyGrid, &bcontest, &m_i3bit, msgsent, const_cast<char *> (ft8msgbits), genft8_(message, MyGrid, &bcontest, &m_i3bit, msgsent, const_cast<char *> (ft8msgbits),
@ -3897,34 +3823,10 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
} }
if(m_config.bFox() and m_decodedText2) { if(m_config.bFox() and m_decodedText2) {
if(m_nToBeCalled >= (m_Nslots + 10) or m_nFoxCallers==0) return; if(m_houndQueue.count()<10 and m_nSortedHounds>0) {
QString t=cursor.block().text(); QString t=cursor.block().text();
QString houndCall=t.split(" ",QString::SkipEmptyParts).at(0); selectHound(t);
if(ui->textBrowser3->toPlainText().indexOf(houndCall) >= 0) return; //Don't allow same call twice
if(ui->textBrowser4->toPlainText().indexOf(houndCall) >= 0) return; //Don't allow same call twice
QString houndGrid=t.split(" ",QString::SkipEmptyParts).at(1);
QString rpt=t.split(" ",QString::SkipEmptyParts).at(2);
ui->dxCallEntry->setText(houndCall);
ui->dxGridEntry->setText(houndGrid);
genStdMsgs(rpt);
on_txb2_clicked();
m_FoxCallers=m_FoxCallers.remove(t+"\n");
if(m_toBeCalled.length()>0) m_toBeCalled += "\n";
m_toBeCalled += t;
m_nToBeCalled++;
ui->decodedTextBrowser->clear();
ui->decodedTextBrowser->append(m_FoxCallers);
QString t1=houndCall + " ";
QString t2=rpt;
if(rpt.mid(0,1) != "-") t2="+" + rpt;
if(t2.length()==2) t2=t2.mid(0,1) + "0" + t2.mid(1,1);
t1=t1.mid(0,7) + t2;
if(m_nToBeCalled<= m_Nslots) {
ui->textBrowser3->displayFoxToBeCalled(t1,"#ffffff");
} else {
ui->textBrowser4->displayFoxToBeCalled(t1,"#ffffff");
} }
m_nFoxCallers--;
return; return;
} }
DecodedText message {cursor.block().text(), ("MSK144" == m_mode || "FT8" == m_mode) && DecodedText message {cursor.block().text(), ("MSK144" == m_mode || "FT8" == m_mode) &&
@ -4246,6 +4148,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
QString s1 = m_QSOText.trimmed (); QString s1 = m_QSOText.trimmed ();
QString s2 = message.string ().trimmed(); QString s2 = message.string ().trimmed();
if (s1!=s2 and !message.isTX()) { if (s1!=s2 and !message.isTX()) {
qDebug() << "bb" << s1 << s2;
ui->decodedTextBrowser2->displayDecodedText(message, m_baseCall, ui->decodedTextBrowser2->displayDecodedText(message, m_baseCall,
false, m_logBook,m_config.color_CQ(), m_config.color_MyCall(), false, m_logBook,m_config.color_CQ(), m_config.color_MyCall(),
m_config.color_DXCC(),m_config.color_NewCall(),m_config.ppfx()); m_config.color_DXCC(),m_config.color_NewCall(),m_config.ppfx());
@ -7099,8 +7002,46 @@ void MainWindow::write_transmit_entry (QString const& file_name)
} }
} }
QString MainWindow::sortHoundCalls(QString t, int isort, int min_dB, int max_dB) // -------------------------- Code for DXpedition Fox Mode ---------------------------
void MainWindow::on_sbNsig_valueChanged(int n)
{ {
m_Nsig=n;
}
void MainWindow::on_sbNslots_valueChanged(int n)
{
m_Nslots=n;
}
void MainWindow::on_sbMax_dB_valueChanged(int n)
{
m_max_dB=n;
}
void MainWindow::on_pbFoxReset_clicked()
{
ui->textBrowser3->setText("");
ui->textBrowser4->setText("");
}
void MainWindow::on_comboBoxHoundSort_activated(int index)
{
if(index!=-99) houndCallers(); //Silence compiler warning
}
//------------------------------------------------------------------------------
QString MainWindow::sortHoundCalls(QString t, int isort, int max_dB)
{
/* Called from "houndCallers()" to sort the list of calling stations by
* specified criteria.
* QString "t" contains a list of Hound callers read from file "houndcallers.txt".
* isort=0: random (shuffled) order
* 1: call
* 2: grid
* 3: SNR (top down)
* 4: distance (top down)
*/
QMap<QString,QString> map; QMap<QString,QString> map;
QStringList lines,lines2; QStringList lines,lines2;
QString msg,houndCall,t1; QString msg,houndCall,t1;
@ -7124,7 +7065,7 @@ QString MainWindow::sortHoundCalls(QString t, int isort, int min_dB, int max_dB)
for(auto a: map.keys()) { for(auto a: map.keys()) {
t1=map[a].split(" ",QString::SkipEmptyParts).at(2); t1=map[a].split(" ",QString::SkipEmptyParts).at(2);
int nsnr=t1.toInt(); // get snr int nsnr=t1.toInt(); // get snr
if(nsnr >= min_dB and nsnr <= max_dB) { // keep only if snr is in specified range if(nsnr <= max_dB) { // keep only if snr in specified range
if(isort==1) t += map[a] + "\n"; if(isort==1) t += map[a] + "\n";
if(isort==3 or isort==4) { if(isort==3 or isort==4) {
i=2; // sort Hound calls by snr i=2; // sort Hound calls by snr
@ -7178,44 +7119,175 @@ QString MainWindow::sortHoundCalls(QString t, int isort, int min_dB, int max_dB)
} }
} }
// QString uniqueCalls;
// uniqueCalls.sprintf(" Unique callers: %d",j);
// ui->labCallers->setText(uniqueCalls);
int i0=t.indexOf("\n") + 1; int i0=t.indexOf("\n") + 1;
m_nFoxCallers=0; m_nSortedHounds=0;
if(i0 > 0) m_nFoxCallers=qMin(t.length(),m_Nsig*i0)/i0; if(i0 > 0) {
m_FoxCallers=t.mid(0,m_Nsig*i0); m_nSortedHounds=qMin(t.length(),m_Nsig*i0)/i0; // Number of sorted & displayed Hounds
if(m_nFoxCallers>0) {
for(int i=0; i<m_nFoxCallers; i++) {
m_HoundsCalling[i]=m_FoxCallers.split("\n").at(i);
} }
} m_houndCallers=t.mid(0,m_Nsig*i0);
return m_FoxCallers;
return m_houndCallers;
} }
void MainWindow::on_sbNsig_valueChanged(int n) //------------------------------------------------------------------------------
void MainWindow::selectHound(QString line)
{ {
m_Nsig=n; /* Called from doubleClickOnCall() in DXpedition Fox mode.
* QString "line" is a user-selected selected line from left text window.
* The line may be selected by double-clicking; alternatively, hitting
* <Enter> is equivalent to double-clicking on the top-most line.
*/
QString houndCall=line.split(" ",QString::SkipEmptyParts).at(0);
// Don't add a call already enqueued or in QSO
if(ui->textBrowser3->toPlainText().indexOf(houndCall) >= 0) return;
if(ui->textBrowser4->toPlainText().indexOf(houndCall) >= 0) return;
QString houndGrid=line.split(" ",QString::SkipEmptyParts).at(1); // Hound caller's grid
QString rpt=line.split(" ",QString::SkipEmptyParts).at(2); // Hound SNR
ui->dxCallEntry->setText(houndCall); // Not necessary?
ui->dxGridEntry->setText(houndGrid);
genStdMsgs(rpt);
on_txb2_clicked();
m_houndCallers=m_houndCallers.remove(line+"\n"); // Remove t from sorted Hound list
m_nSortedHounds--;
ui->decodedTextBrowser->setText(m_houndCallers); // Populate left window with Hound callers
QString t1=houndCall + " ";
QString t2=rpt;
if(rpt.mid(0,1) != "-") t2="+" + rpt;
if(t2.length()==2) t2=t2.mid(0,1) + "0" + t2.mid(1,1);
t1=t1.mid(0,7) + t2;
m_houndQueue.enqueue(t1); // Put this hound into the queue
ui->textBrowser4->displayFoxToBeCalled(t1,"#ffffff"); // Add hound call and rpt to queue
} }
void MainWindow::on_sbNslots_valueChanged(int n) //------------------------------------------------------------------------------
void MainWindow::houndCallers()
{ {
m_Nslots=n; /* Called from decodeDone(), in DXpedition Fox mode. Reads decodes from file
* "houndcallers.txt", ignoring any that are not addressed to MyCall, are already
* in the stack, or with whom a QSO has been started. Others are considered to
* be Hounds eager for a QSO. We add caller information (Call, Grid, SNR, Freq,
* Distance, Age, and Continent) to a list, sort the list by specified criteria,
* and display the top N_Hounds entries in the left text window.
*/
QFile f(m_config.temp_dir().absoluteFilePath("houndcallers.txt"));
if(f.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream s(&f);
QString t="";
QString line,houndCall,paddedHoundCall;
m_nHoundsCalling=0;
// Read and process the file of Hound callers.
while(!s.atEnd()) {
line=s.readLine();
houndCall=line.mid(0,6);
paddedHoundCall=houndCall + " ";
if(!ui->textBrowser3->toPlainText().contains(paddedHoundCall) and
!ui->textBrowser4->toPlainText().contains(paddedHoundCall)) {
QString countryName,continent;
bool callWorkedBefore,countryWorkedBefore;
m_logBook.match(/*in*/houndCall,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
int i1=countryName.lastIndexOf(";");
continent=countryName.mid(i1+2,-1);
t = t + line + " " + continent + "\n";
m_nHoundsCalling++; // Total number of decoded Hounds calling Fox
}
}
// Sort and display accumulated list of Hound callers
if(t.length()>30) {
m_isort=ui->comboBoxHoundSort->currentIndex();
QString t1=sortHoundCalls(t,m_isort,m_max_dB);
ui->decodedTextBrowser->setText(t1);
}
f.close();
}
} }
void MainWindow::on_sbMax_dB_valueChanged(int n) void MainWindow::foxRxSequencer(QString houndCall, QString houndGrid)
{ {
m_max_dB=n; // Called from "readFromStdOut()" for decoded messages of the form "MyCall HoundCall R+rpt"
}
void MainWindow::on_pbFoxReset_clicked() QString inQSOmessages=ui->textBrowser3->toPlainText();
{ if(inQSOmessages.contains(" " + houndCall + " ")) {
qDebug() << "Received:" << houndCall << houndGrid;
QStringList inQSOmessagesList=inQSOmessages.split("\n");
ui->textBrowser3->setText(""); ui->textBrowser3->setText("");
ui->textBrowser4->setText(""); for (int i=0; i<inQSOmessagesList.length(); i++) {
QString t=inQSOmessagesList.at(i);
if(t.contains(" " + houndCall + " ")) {
m_houndRptRcvd[i]=houndGrid.mid(1);
int i1=qMax(t.indexOf("+"), t.indexOf("-"));
qDebug() << "yy" << i << i1 << m_houndRptRcvd[i] << t.trimmed();
m_bSendRR73[i]=true;
t=t.mid(0,i1-1) + " RR73";
ui->textBrowser3->displayFoxToBeCalled(t,"#ff99ff");
} else {
ui->textBrowser3->displayFoxToBeCalled(t,"#ffffff");
}
}
}
} }
void MainWindow::on_comboBoxHoundSort_activated(int index) void MainWindow::foxTxSequencer()
{ {
decodeDone(); QString msg[5];
QString inQSO="";
QString nextTxMessages=ui->textBrowser3->toPlainText();
// int islots=nextTxMessages.split("\n").size() - 1;
for(int i=0; i<m_Nslots; i++) {
msg[i]="";
int iz=nextTxMessages.split("\n").size();
qDebug() << "A" << i << iz << nextTxMessages.length();
if(i<iz and nextTxMessages.length() > 10) {
QString txMsg=nextTxMessages.split("\n").at(i);
m_houndCall[i]=txMsg.mid(0,7);
qDebug() << "A1" << txMsg;
int i1=qMax(txMsg.indexOf('+'),txMsg.indexOf('-'));
msg[i]= m_houndCall[i] + " " + m_config.my_callsign() + txMsg.mid(i1-1,4);
}
qDebug() << "B" << i << msg[i];
if(msg[i]=="") {
if(!m_houndQueue.isEmpty()) {
QString t=m_houndQueue.dequeue();
m_houndCall[i]=t.mid(0,6);
QString rpt=t.mid(7,3);
msg[i]= m_houndCall[i] + " " + m_config.my_callsign() + " " + rpt;
m_bSendRR73[i]=false;
QString tb4=ui->textBrowser4->toPlainText();
tb4=tb4.remove(t+"\n");
ui->textBrowser4->setText(tb4);
} else {
msg[i]=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() +
" " + m_config.my_grid().mid(0,4);
}
}
qDebug() << "C" << i << msg[i];
msg[i] += " ";
msg[i]=msg[i].mid(0,32);
ui->decodedTextBrowser2->displayTransmittedText(msg[i], m_modeTx,
300+60*i,m_config.color_TxMsg(),m_bFastMode);
foxcom_.i3bit[i]=0;
if(msg[i].indexOf("<")>0) foxcom_.i3bit[i]=1;
qDebug() << "Transmitted:" << i << foxcom_.i3bit[i] << msg[i].trimmed();
strncpy(&foxcom_.cmsg[i][0], msg[i].toLatin1(),32);
int i1=qMax(msg[i].indexOf("+"),msg[i].indexOf("-"));
if(i1>6) {
m_houndRptSent[i]=msg[i].mid(i1,3);
qDebug() << "zz" << i << m_houndCall[i] << m_houndRptSent[i] << m_houndRptRcvd[i];
}
if(m_bSendRR73[i]) {
qDebug() << "Logged:" << m_houndCall[i] << m_houndRptSent[i] << m_houndRptRcvd[i];
msg[i]="CQ";
m_bSendRR73[i]=false;
}
inQSO += (msg[i] + "\n");
}
// qDebug() << "TxSeq:" << inQSO;
ui->textBrowser3->setText(inQSO);
foxcom_.nslots=m_Nslots;
foxgen_();
} }

18
mainwindow.h
View File

@ -358,6 +358,7 @@ private:
Modulator * m_modulator; Modulator * m_modulator;
SoundOutput * m_soundOutput; SoundOutput * m_soundOutput;
QThread m_audioThread; QThread m_audioThread;
QQueue<QString> m_houndQueue;
qint64 m_msErase; qint64 m_msErase;
qint64 m_secBandChanged; qint64 m_secBandChanged;
@ -415,12 +416,10 @@ private:
qint32 m_i3bit; qint32 m_i3bit;
qint32 m_isort; qint32 m_isort;
qint32 m_max_dB; qint32 m_max_dB;
qint32 m_min_dB; qint32 m_nSortedHounds=0;
qint32 m_nFoxCallers=0; qint32 m_nHoundsCalling=0;
qint32 m_nToBeCalled=0;
qint32 m_Nsig=12; qint32 m_Nsig=12;
qint32 m_Nslots=5; qint32 m_Nslots=5;
qint32 m_nHoundsCalling=0;
bool m_btxok; //True if OK to transmit bool m_btxok; //True if OK to transmit
bool m_diskData; bool m_diskData;
@ -476,6 +475,7 @@ private:
bool m_bAutoReply; bool m_bAutoReply;
bool m_bCheckedContest; bool m_bCheckedContest;
bool m_bDXped; bool m_bDXped;
bool m_bSendRR73[5];
enum enum
{ {
@ -558,13 +558,11 @@ private:
QString m_calls; QString m_calls;
QString m_CQtype; QString m_CQtype;
QString m_opCall; QString m_opCall;
QString m_FoxCallers; QString m_houndCallers; //Sorted list of Hound callers
QString m_toBeCalled;
QString m_houndCall[5]; QString m_houndCall[5];
QString m_houndGrid[5]; QString m_houndGrid[5];
QString m_houndRptSent[5]; QString m_houndRptSent[5];
QString m_houndRptRcvd[5]; QString m_houndRptRcvd[5];
QString m_HoundsCalling[100];
QSet<QString> m_pfx; QSet<QString> m_pfx;
QSet<QString> m_sfx; QSet<QString> m_sfx;
@ -650,7 +648,7 @@ private:
, Frequency frequency , Frequency frequency
, QString const& his_call , QString const& his_call
, QString const& his_grid) const; , QString const& his_grid) const;
QString sortHoundCalls(QString t, int isort, int min_dB, int max_dB); QString sortHoundCalls(QString t, int isort, int max_dB);
void read_wav_file (QString const& fname); void read_wav_file (QString const& fname);
void decodeDone (); void decodeDone ();
void subProcessFailed (QProcess *, int exit_code, QProcess::ExitStatus); void subProcessFailed (QProcess *, int exit_code, QProcess::ExitStatus);
@ -668,6 +666,10 @@ private:
QChar current_submode () const; // returns QChar {0} if sub mode is QChar current_submode () const; // returns QChar {0} if sub mode is
// not appropriate // not appropriate
void write_transmit_entry (QString const& file_name); void write_transmit_entry (QString const& file_name);
void selectHound(QString t);
void houndCallers();
void foxRxSequencer(QString houndCall, QString houndGrid);
void foxTxSequencer();
}; };
extern int killbyname(const char* progName); extern int killbyname(const char* progName);

2
mainwindow.ui
View File

@ -1049,7 +1049,7 @@ QLabel[oob=&quot;true&quot;] {
<enum>QTabWidget::Triangular</enum> <enum>QTabWidget::Triangular</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">