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

Fix several bugs found when testing MSK144 op activities NA_VHF and EU_VHF.

Browse Source
This commit is contained in:
Joe Taylor 2018-08-27 11:26:09 -04:00
parent ef3f084c5c
commit 15b4463394
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
decodedtext.cpp
View File

@ -165,6 +165,12 @@ void DecodedText::deCallAndGrid(/*out*/QString& call, QString& grid) const
call = match.captured ("word2"); call = match.captured ("word2");
grid = match.captured ("word3"); grid = match.captured ("word3");
if ("R" == grid) grid = match.captured ("word4"); if ("R" == grid) grid = match.captured ("word4");
if(match.captured("word1")=="CQ" and call.length()>=3 and call.length()<=4
and !call.contains(QRegExp("0-9"))) {
//Second word has length 3 or 4 and contains no digits
call = match.captured ("word3");
grid = match.captured ("word4");
}
} }
unsigned DecodedText::timeInSeconds() const unsigned DecodedText::timeInSeconds() const

1
displaytext.cpp
View File

@ -178,7 +178,6 @@ QString DisplayText::appendWorkedB4(QString message, QString const& callsign, QS
logBook.match(/*in*/call,grid,/*out*/countryName,callWorkedBefore,countryWorkedBefore,gridB4); logBook.match(/*in*/call,grid,/*out*/countryName,callWorkedBefore,countryWorkedBefore,gridB4);
logBook.match(/*in*/call,grid,/*out*/countryName,callB4onBand,countryB4onBand,gridB4onBand, logBook.match(/*in*/call,grid,/*out*/countryName,callB4onBand,countryB4onBand,gridB4onBand,
/*in*/ currentBand); /*in*/ currentBand);
// if(gridB4) qDebug() << "aa" << grid << gridB4 << gridB4onBand;
message = message.trimmed (); message = message.trimmed ();
QString appendage{""}; QString appendage{""};

3
lib/77bit/wsjt-x_v2.0.txt
View File

@ -155,7 +155,8 @@ CQ TEST G4ABC/P IO91
G4ABC/P PA9XYZ JO22 G4ABC/P PA9XYZ JO22
PA9XYZ 590003 IO91NP PA9XYZ 590003 IO91NP
G4ABC/P R 570007 JO22DB G4ABC/P R 570007 JO22DB
PA9XYZ G4ABC/P RR73 PA9XYZ G4ABC/P RRR
G4ABC/P PA9XYZ 73
---------------------------------------------------------------------------------- ----------------------------------------------------------------------------------
8. Compound call 8. Compound call

17
mainwindow.cpp
View File

@ -3035,12 +3035,6 @@ void MainWindow::readFromStdout() //readFromStdout
QString deCall; QString deCall;
QString grid; QString grid;
decodedtext.deCallAndGrid(/*out*/deCall,grid); decodedtext.deCallAndGrid(/*out*/deCall,grid);
/*
qDebug() << "Worked" << deCall << grid << m_callWorked[deCall] << m_gridWorked[grid]
<< isWorked(int(CALL),deCall,float(m_freqNominal/1000000.0))
<< isWorked(int(CALL),deCall)
<< isWorked(int(GRID),grid);
*/
{ {
QString t=Radio::base_callsign(ui->dxCallEntry->text()); QString t=Radio::base_callsign(ui->dxCallEntry->text());
if((t==deCall or t=="") and rpt!="") m_rptRcvd=rpt; if((t==deCall or t=="") and rpt!="") m_rptRcvd=rpt;
@ -4106,7 +4100,7 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
QTextCursor cursor; QTextCursor cursor;
if(m_mode=="ISCAT") { if(m_mode=="ISCAT") {
MessageBox::information_message (this, MessageBox::information_message (this,
"Double-click not presently implemented for ISCAT mode"); "Double-click not available for ISCAT mode");
} }
if(m_decodedText2) { if(m_decodedText2) {
cursor=ui->decodedTextBrowser->textCursor(); cursor=ui->decodedTextBrowser->textCursor();
@ -4624,10 +4618,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
ui->tx2->clear (); ui->tx2->clear ();
ui->tx3->clear (); ui->tx3->clear ();
ui->tx4->clear (); ui->tx4->clear ();
if (unconditional) { // leave in place in case it needs if(unconditional) ui->tx5->lineEdit ()->clear (); //Test if it needs sending again
// sending again
ui->tx5->lineEdit ()->clear ();
}
ui->genMsg->clear (); ui->genMsg->clear ();
m_gen_message_is_cq = false; m_gen_message_is_cq = false;
return; return;
@ -4675,7 +4666,6 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
t=t0 + "R " + m_config.FieldDayExchange(); t=t0 + "R " + m_config.FieldDayExchange();
msgtype(t, ui->tx3); msgtype(t, ui->tx3);
m_send_RR73=true;
} }
QString rst; QString rst;
@ -4694,7 +4684,6 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
t=t0 + "R " + rst + t1; t=t0 + "R " + rst + t1;
msgtype(t, ui->tx3); msgtype(t, ui->tx3);
m_send_RR73=true;
} }
QString rs=rst.mid(0,2); QString rs=rst.mid(0,2);
@ -4707,7 +4696,6 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
a.sprintf("%4.4d ",ui->sbSerialNumber->value()); a.sprintf("%4.4d ",ui->sbSerialNumber->value());
t=t1 + " R " + rs + a + m_config.my_grid(); t=t1 + " R " + rs + a + m_config.my_grid();
msgtype(t, ui->tx3); msgtype(t, ui->tx3);
m_send_RR73=true;
} }
} }
if(m_mode=="MSK144" and m_bShMsgs) { if(m_mode=="MSK144" and m_bShMsgs) {
@ -5163,7 +5151,6 @@ void MainWindow::cabLog()
if(m_freqNominal>50000000) nfreq=m_freqNominal/1000000; if(m_freqNominal>50000000) nfreq=m_freqNominal/1000000;
QString t; QString t;
t.sprintf("QSO: %5d RY ",nfreq); t.sprintf("QSO: %5d RY ",nfreq);
qDebug() << t;
t=t + QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hhmm ") + t=t + QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd hhmm ") +
m_config.my_callsign().leftJustified(13,' ') + m_xSent.leftJustified(14,' ') + m_config.my_callsign().leftJustified(13,' ') + m_xSent.leftJustified(14,' ') +
m_hisCall.leftJustified(13,' ') + m_xRcvd; m_hisCall.leftJustified(13,' ') + m_xRcvd;