w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-04 14:17:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow Tx in QRA64 if NoQRA64 was selected. Likewise for JT65. Set default rpt=-24 for QRA64.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7542 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-20 14:54:56 +00:00
parent edf39d60b8
commit 65b9090903
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -1567,9 +1567,11 @@ void MainWindow::guiUpdate()
m_startAnother=false; m_startAnother=false;
on_actionOpen_next_in_directory_triggered(); on_actionOpen_next_in_directory_triggered();
} }
if(m_modeQRA64==0 and m_modeTx=="QRA64") on_pbTxMode_clicked();
if(m_modeJT65==0 and m_modeTx=="JT65") on_pbTxMode_clicked();
if(nsec != m_sec0) { //Once per second if(nsec != m_sec0) { //Once per second
// qDebug() << "A" << nsec%60; // qDebug() << "A" << nsec%60 << m_mode65 << m_modeQRA64 << m_modeTx;
soundInThread.setForceCenterFreqMHz(g_pWideGraph->m_dForceCenterFreq); soundInThread.setForceCenterFreqMHz(g_pWideGraph->m_dForceCenterFreq);
soundInThread.setForceCenterFreqBool(g_pWideGraph->m_bForceCenterFreq); soundInThread.setForceCenterFreqBool(g_pWideGraph->m_bForceCenterFreq);
@ -1773,6 +1775,7 @@ void MainWindow::genStdMsgs(QString rpt) //genStdMsgs()
QString t=t0; QString t=t0;
if(t0.indexOf("/")<0) t=t0 + m_myGrid.mid(0,4); if(t0.indexOf("/")<0) t=t0 + m_myGrid.mid(0,4);
msgtype(t, ui->tx1); msgtype(t, ui->tx1);
if(rpt == "" and m_modeTx=="QRA64") rpt="-24";
if(rpt == "" and m_modeTx=="JT65") { if(rpt == "" and m_modeTx=="JT65") {
t=t+" OOO"; t=t+" OOO";
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
@ -2069,6 +2072,7 @@ void MainWindow::on_actionErase_map65_tx_log_triggered() //Erase Tx log
void MainWindow::on_actionNoJT65_triggered() void MainWindow::on_actionNoJT65_triggered()
{ {
m_mode65=0;
m_modeJT65=0; m_modeJT65=0;
lab5->setStyleSheet(""); lab5->setStyleSheet("");
lab5->setText(""); lab5->setText("");
@ -2078,6 +2082,7 @@ void MainWindow::on_actionJT65A_triggered()
m_mode="JT65A"; m_mode="JT65A";
m_modeJT65=1; m_modeJT65=1;
m_mode65=1; m_mode65=1;
m_modeJT65=1;
m_TRperiod=60; m_TRperiod=60;
soundInThread.setPeriod(m_TRperiod); soundInThread.setPeriod(m_TRperiod);
soundOutThread.setPeriod(m_TRperiod); soundOutThread.setPeriod(m_TRperiod);
@ -2093,6 +2098,7 @@ void MainWindow::on_actionJT65B_triggered()
m_mode="JT65B"; m_mode="JT65B";
m_modeJT65=2; m_modeJT65=2;
m_mode65=2; m_mode65=2;
m_modeJT65=2;
m_TRperiod=60; m_TRperiod=60;
soundInThread.setPeriod(m_TRperiod); soundInThread.setPeriod(m_TRperiod);
soundOutThread.setPeriod(m_TRperiod); soundOutThread.setPeriod(m_TRperiod);