w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-17 09:31:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correct a bug that could switch to a JT65 shorthand message if Tx5 window

Browse Source 
is edited to (say) "73 ...".


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7267 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-30 21:38:52 +00:00
parent 09094b3b28
commit bc32b6a6ff
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mainwindow.cpp
View File

@ -605,9 +605,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
// Free text macros model to widget hook up. // Free text macros model to widget hook up.
ui->tx5->setModel (m_config.macros ()); ui->tx5->setModel (m_config.macros ());
connect (ui->tx5->lineEdit () connect (ui->tx5->lineEdit(), &QLineEdit::editingFinished,
, &QLineEdit::editingFinished [this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit()->text());});
, [this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit ()->text ());});
ui->freeTextMsg->setModel (m_config.macros ()); ui->freeTextMsg->setModel (m_config.macros ());
connect (ui->freeTextMsg->lineEdit () connect (ui->freeTextMsg->lineEdit ()
, &QLineEdit::editingFinished , &QLineEdit::editingFinished
@ -3769,17 +3768,17 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype()
{ {
char message[29]; char message[29];
char msgsent[29]; char msgsent[29];
int itone0[NUM_ISCAT_SYMBOLS]; //Dummy array, data not used
int len1=22; int len1=22;
QByteArray s=t.toUpper().toLocal8Bit(); QByteArray s=t.toUpper().toLocal8Bit();
ba2msg(s,message); ba2msg(s,message);
int ichk=1,itype=0; int ichk=1,itype=0;
// gen9_(message,&ichk,msgsent,const_cast<int *>(itone),&itype,len1,len1); gen65_(message,&ichk,msgsent,itone0,&itype,len1,len1);
gen65_(message,&ichk,msgsent,const_cast<int *>(itone),&itype,len1,len1);
msgsent[22]=0; msgsent[22]=0;
bool text=false; bool text=false;
bool short65=false; bool short65=false;
if(itype==6) text=true; if(itype==6) text=true;
if(itype==7) short65=true; if(itype==7 and m_config.enable_VHF_features() and (m_mode=="JT65" or m_mode=="MSK144")) short65=true;
if(m_mode=="MSK144" and t.mid(0,1)=="<") text=false; if(m_mode=="MSK144" and t.mid(0,1)=="<") text=false;
QString t1; QString t1;
t1.fromLatin1(msgsent); t1.fromLatin1(msgsent);

2
wsjtx.pro
View File

@ -65,7 +65,7 @@ SOURCES += \
WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \ WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \
main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \ main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \
echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \ echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp \ WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
MultiSettings.cpp MultiSettings.cpp
HEADERS += qt_helpers.hpp \ HEADERS += qt_helpers.hpp \