w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable generation of JTMSK short messages and reports.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6421 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-01-22 18:10:39 +00:00
parent a74d000c32
commit adb10ebfa7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mainwindow.cpp
View File

@ -3066,6 +3066,13 @@ void MainWindow::genStdMsgs(QString rpt) //genStdMsgs()
} else { } else {
int n=rpt.toInt(); int n=rpt.toInt();
rpt.sprintf("%+2.2d",n); rpt.sprintf("%+2.2d",n);
if(m_mode=="JTMSK" and m_bShMsgs) {
int i=t0.length()-1;
t0="<" + t0.mid(0,i) + "> ";
if(n<26) n=26;
if(n>28) n=28;
rpt.sprintf("%2.2d",n);
}
t=t0 + rpt; t=t0 + rpt;
msgtype(t, ui->tx2); msgtype(t, ui->tx2);
t=t0 + "R" + rpt; t=t0 + "R" + rpt;
@ -3303,6 +3310,7 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
msgsent[22]=0; msgsent[22]=0;
bool text=false; bool text=false;
if(itype==6) text=true; if(itype==6) text=true;
if(m_mode=="JTMSK" and t.mid(0,1)=="<") text=false;
QString t1; QString t1;
t1.fromLatin1(msgsent); t1.fromLatin1(msgsent);
if(text) t1=t1.mid(0,13); if(text) t1=t1.mid(0,13);
@ -3311,11 +3319,11 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
p.setColor(QPalette::Base,"#ffccff"); p.setColor(QPalette::Base,"#ffccff");
} else { } else {
p.setColor(QPalette::Base,Qt::white); p.setColor(QPalette::Base,Qt::white);
if(m_mode=="JTMSK" and t.mid(0,1)=="<") p.setColor(QPalette::Base,"#00ffff");
} }
tx->setPalette(p); tx->setPalette(p);
int len=t.length(); int len=t.length();
auto pos = tx->cursorPosition (); auto pos = tx->cursorPosition ();
// if(text) {
if(text && m_mode!="JTMSK" && t.mid(0,1)!="<") { if(text && m_mode!="JTMSK" && t.mid(0,1)!="<") {
len=qMin(len,13); len=qMin(len,13);
tx->setText(t.mid(0,len).toUpper()); tx->setText(t.mid(0,len).toUpper());
@ -3520,7 +3528,7 @@ void MainWindow::on_actionJTMSK_triggered()
VHF_features_enabled(true); VHF_features_enabled(true);
VHF_controls_visible(true); VHF_controls_visible(true);
ui->cbFast9->setVisible(false); ui->cbFast9->setVisible(false);
ui->cbShMsgs->setVisible(false); ui->cbShMsgs->setVisible(true);
ui->cbTx6->setVisible(false); ui->cbTx6->setVisible(false);
ui->sbSubmode->setVisible(false); ui->sbSubmode->setVisible(false);
WSPR_config(false); WSPR_config(false);
@ -4685,6 +4693,7 @@ void MainWindow::on_cbShMsgs_toggled(bool b)
{ {
ui->cbTx6->setEnabled(b); ui->cbTx6->setEnabled(b);
m_bShMsgs=b; m_bShMsgs=b;
if(m_bShMsgs and m_mode=="JTMSK") ui->rptSpinBox->setValue(26);
int itone0=itone[0]; int itone0=itone[0];
int ntx=m_ntx; int ntx=m_ntx;
genStdMsgs(m_rpt); genStdMsgs(m_rpt);