w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patches from G3WDG to ease use of single-tone messages in QRA64. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7801 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-07-07 12:38:16 +00:00
parent eedee3a0c8
commit 34070d107d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -3790,7 +3790,7 @@ void MainWindow::genCQMsg ()
{ {
msgtype (QString {"CQ %1 %2"}.arg (m_config.my_callsign ()).arg (m_config.my_grid ().left (4)), ui->tx6); msgtype (QString {"CQ %1 %2"}.arg (m_config.my_callsign ()).arg (m_config.my_grid ().left (4)), ui->tx6);
} }
if (m_mode=="JT4") msgtype ("@1000 (TUNE)", ui->tx6); if ((m_mode=="JT4" or m_mode=="QRA64") and ui->cbShMsgs->isChecked()) msgtype ("@1000 (TUNE)", ui->tx6);
} }
else else
{ {
@ -3859,10 +3859,10 @@ void MainWindow::genStdMsgs(QString rpt)
msgtype(t, ui->tx3); msgtype(t, ui->tx3);
} }
t=t0 + "RRR"; t=t0 + "RRR";
if(m_mode=="JT4" and m_bShMsgs) t="@1500 (RRR)"; if((m_mode=="JT4" or m_mode=="QRA64") and m_bShMsgs) t="@1500 (RRR)";
msgtype(t, ui->tx4); msgtype(t, ui->tx4);
t=t0 + "73"; t=t0 + "73";
if(m_mode=="JT4" and m_bShMsgs) t="@1750 (73)"; if((m_mode=="JT4" or m_mode=="QRA64") and m_bShMsgs) t="@1750 (73)";
msgtype(t, ui->tx5->lineEdit ()); msgtype(t, ui->tx5->lineEdit ());
} }
@ -4344,7 +4344,7 @@ void MainWindow::on_actionJT4_triggered()
m_mode="JT4"; m_mode="JT4";
bool bVHF=m_config.enable_VHF_features(); bool bVHF=m_config.enable_VHF_features();
if(bVHF) { if(bVHF) {
displayWidgets(nWidgets("111110010010110110110000")); displayWidgets(nWidgets("111110010010111110110000"));
} else { } else {
displayWidgets(nWidgets("111010000000111000111100")); displayWidgets(nWidgets("111010000000111000111100"));
} }
@ -4531,7 +4531,7 @@ void MainWindow::on_actionQRA64_triggered()
on_actionJT65_triggered(); on_actionJT65_triggered();
m_nSubMode=n; m_nSubMode=n;
m_mode="QRA64"; m_mode="QRA64";
displayWidgets(nWidgets("111110000000111110000000")); displayWidgets(nWidgets("111110010010111110000000"));
m_modeTx="QRA64"; m_modeTx="QRA64";
ui->actionQRA64->setChecked(true); ui->actionQRA64->setChecked(true);
switch_mode (Modes::QRA64); switch_mode (Modes::QRA64);

2
plotter.cpp
View File

@ -215,7 +215,7 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed)
painter1.drawText (5, painter1.fontMetrics ().ascent (), t); painter1.drawText (5, painter1.fontMetrics ().ascent (), t);
} }
if(m_mode=="JT4") { if(m_mode=="JT4" or m_mode=="QRA64") {
QPen pen3(Qt::yellow); //Mark freqs of JT4 single-tone msgs QPen pen3(Qt::yellow); //Mark freqs of JT4 single-tone msgs
painter2D.setPen(pen3); painter2D.setPen(pen3);
Font.setWeight(QFont::Bold); Font.setWeight(QFont::Bold);