From bc32b6a6ff08a16cf6b94b5177f67c60b842175a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 30 Oct 2016 21:38:52 +0000 Subject: [PATCH] Correct a bug that could switch to a JT65 shorthand message if Tx5 window 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 --- mainwindow.cpp | 11 +++++------ wsjtx.pro | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index fdeb8a0ed..eaa2d16f0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -605,9 +605,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, // Free text macros model to widget hook up. ui->tx5->setModel (m_config.macros ()); - connect (ui->tx5->lineEdit () - , &QLineEdit::editingFinished - , [this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit ()->text ());}); + connect (ui->tx5->lineEdit(), &QLineEdit::editingFinished, + [this] () {on_tx5_currentTextChanged (ui->tx5->lineEdit()->text());}); ui->freeTextMsg->setModel (m_config.macros ()); connect (ui->freeTextMsg->lineEdit () , &QLineEdit::editingFinished @@ -3769,17 +3768,17 @@ void MainWindow::msgtype(QString t, QLineEdit* tx) //msgtype() { char message[29]; char msgsent[29]; + int itone0[NUM_ISCAT_SYMBOLS]; //Dummy array, data not used int len1=22; QByteArray s=t.toUpper().toLocal8Bit(); ba2msg(s,message); int ichk=1,itype=0; -// gen9_(message,&ichk,msgsent,const_cast(itone),&itype,len1,len1); - gen65_(message,&ichk,msgsent,const_cast(itone),&itype,len1,len1); + gen65_(message,&ichk,msgsent,itone0,&itype,len1,len1); msgsent[22]=0; bool text=false; bool short65=false; 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; QString t1; t1.fromLatin1(msgsent); diff --git a/wsjtx.pro b/wsjtx.pro index e97fa02ba..e2159ae29 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -65,7 +65,7 @@ SOURCES += \ WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \ main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.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 HEADERS += qt_helpers.hpp \