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

Use the most recently edited "CQ xx: message in Tx6 as a template for subsequent regenerations. 

This means that "CQ DX", "CQ VT", etc., will be presistent until changed back.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8035 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-08-25 16:59:58 +00:00
parent 0a16a1e614
commit 99144dea23
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
mainwindow.cpp
View File

@ -856,6 +856,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_bDoubleClicked=false; m_bDoubleClicked=false;
m_bCallingCQ=false; m_bCallingCQ=false;
m_wait=0; m_wait=0;
m_CQtype="CQ";
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 ()};
@ -4000,34 +4001,27 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
void MainWindow::genCQMsg () void MainWindow::genCQMsg ()
{ {
if(m_config.my_callsign().size () && m_config.my_grid().size ()) if(m_config.my_callsign().size () && m_config.my_grid().size ()) {
{ auto const& grid = m_config.my_callsign () != m_baseCall && shortList (m_config.my_callsign ()) ? QString {} : m_config.my_grid ();
auto const& grid = m_config.my_callsign () != m_baseCall && shortList (m_config.my_callsign ()) ? QString {} : m_config.my_grid (); if (ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked ()) {
if (ui->cbCQTx->isEnabled () && ui->cbCQTx->isVisible () && ui->cbCQTx->isChecked ()) msgtype (QString {"CQ %1 %2 %3"}
{ .arg (m_freqNominal / 1000 - m_freqNominal / 1000000 * 1000, 3, 10, QChar {'0'})
msgtype (QString {"CQ %1 %2 %3"} .arg (m_config.my_callsign())
.arg (m_freqNominal / 1000 - m_freqNominal / 1000000 * 1000, 3, 10, QChar {'0'}) .arg (grid.left (4)),
.arg (m_config.my_callsign()) ui->tx6);
.arg (grid.left (4)), } else {
ui->tx6); msgtype (QString {"%1 %2 %3"}.arg(m_CQtype).arg(m_config.my_callsign()).arg(grid.left(4)),ui->tx6);
} }
else if ((m_mode=="JT4" or m_mode=="QRA64") and ui->cbShMsgs->isChecked()) {
{ if (ui->cbTx6->isChecked ()) {
msgtype (QString {"CQ %1 %2"}.arg (m_config.my_callsign ()).arg (grid.left (4)), ui->tx6); msgtype ("@1250 (SEND MSGS)", ui->tx6);
} } else {
if ((m_mode=="JT4" or m_mode=="QRA64") and ui->cbShMsgs->isChecked()) { msgtype ("@1000 (TUNE)", ui->tx6);
if (ui->cbTx6->isChecked ()) {
msgtype ("@1250 (SEND MSGS)", ui->tx6);
}
else {
msgtype ("@1000 (TUNE)", ui->tx6);
}
} }
} }
else } else {
{ ui->tx6->clear ();
ui->tx6->clear (); }
}
} }
void MainWindow::genStdMsgs(QString rpt, bool unconditional) void MainWindow::genStdMsgs(QString rpt, bool unconditional)
@ -4405,7 +4399,10 @@ void MainWindow::on_tx5_currentTextChanged (QString const& text) //tx5 edited
void MainWindow::on_tx6_editingFinished() //tx6 edited void MainWindow::on_tx6_editingFinished() //tx6 edited
{ {
QString t=ui->tx6->text(); QString t=ui->tx6->text().toUpper();
QString t1=t.split(" ").at(1);
m_CQtype="CQ";
if(t1.size()==2) m_CQtype="CQ " + t1;
msgtype(t, ui->tx6); msgtype(t, ui->tx6);
} }

1
mainwindow.h
View File

@ -532,6 +532,7 @@ private:
QString m_msgSent0; QString m_msgSent0;
QString m_fileToSave; QString m_fileToSave;
QString m_calls; QString m_calls;
QString m_CQtype;
QSet<QString> m_pfx; QSet<QString> m_pfx;
QSet<QString> m_sfx; QSet<QString> m_sfx;