chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with checksummed messages not obeying the disable typeahead flag

Browse Source
This commit is contained in:
Jordan Sherer 2019-11-10 11:54:29 -05:00
parent 18dec96843
commit d7985797a0
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mainwindow.cpp
View File

@ -6416,20 +6416,20 @@ bool MainWindow::ensureCreateMessageReady(const QString &text){
return true; return true;
} }
QString MainWindow::createMessage(QString const& text){ QString MainWindow::createMessage(QString const& text, bool *pDisableTypeahead){
return createMessageTransmitQueue(replaceMacros(text, buildMacroValues(), false), true, false); return createMessageTransmitQueue(replaceMacros(text, buildMacroValues(), false), true, false, pDisableTypeahead);
} }
QString MainWindow::appendMessage(QString const& text, bool isData){ QString MainWindow::appendMessage(QString const& text, bool isData, bool *pDisableTypeahead){
return createMessageTransmitQueue(replaceMacros(text, buildMacroValues(), false), false, isData); return createMessageTransmitQueue(replaceMacros(text, buildMacroValues(), false), false, isData, pDisableTypeahead);
} }
QString MainWindow::createMessageTransmitQueue(QString const& text, bool reset, bool isData){ QString MainWindow::createMessageTransmitQueue(QString const& text, bool reset, bool isData, bool *pDisableTypeahead){
if(reset){ if(reset){
resetMessageTransmitQueue(); resetMessageTransmitQueue();
} }
auto frames = buildMessageFrames(text, isData); auto frames = buildMessageFrames(text, isData, pDisableTypeahead);
QStringList lines; QStringList lines;
foreach(auto frame, frames){ foreach(auto frame, frames){
@ -6521,7 +6521,7 @@ int MainWindow::currentFreqOffset(){
return ui->RxFreqSpinBox->value(); return ui->RxFreqSpinBox->value();
} }
QList<QPair<QString, int>> MainWindow::buildMessageFrames(const QString &text, bool isData){ QList<QPair<QString, int>> MainWindow::buildMessageFrames(const QString &text, bool isData, bool *pDisableTypeahead){
// prepare selected callsign for directed message // prepare selected callsign for directed message
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
@ -6545,10 +6545,9 @@ QList<QPair<QString, int>> MainWindow::buildMessageFrames(const QString &text, b
m_nSubMode, m_nSubMode,
&info); &info);
if(!info.dirCmd.isEmpty() && Varicode::isCommandChecksumed(info.dirCmd)){ if(pDisableTypeahead){
// checksummed commands should not allow typeahead // checksummed commands should not allow typeahead
// TODO: jsherer - i don't like setting this here, but it works for now... *pDisableTypeahead = (!info.dirCmd.isEmpty() && Varicode::isCommandChecksumed(info.dirCmd));
ui->extFreeTextMsgEdit->setReadOnly(true);
} }
#if 0 #if 0
@ -6574,6 +6573,7 @@ bool MainWindow::prepareNextMessageFrame()
m_i3bit = Varicode::JS8Call; m_i3bit = Varicode::JS8Call;
// typeahead // typeahead
bool shouldDisableTypeahead = false;
if(ui->extFreeTextMsgEdit->isDirty() && !ui->extFreeTextMsgEdit->isEmpty()){ if(ui->extFreeTextMsgEdit->isDirty() && !ui->extFreeTextMsgEdit->isEmpty()){
// block edit events while computing next frame // block edit events while computing next frame
QString newText; QString newText;
@ -6585,7 +6585,7 @@ bool MainWindow::prepareNextMessageFrame()
m_txFrameQueue.clear(); m_txFrameQueue.clear();
m_txFrameCount = 0; m_txFrameCount = 0;
newText = appendMessage(unsent, shouldForceDataForTypeahead); newText = appendMessage(unsent, shouldForceDataForTypeahead, &shouldDisableTypeahead);
// if this was the last frame, append a newline // if this was the last frame, append a newline
if(i3bitLast){ if(i3bitLast){
@ -6595,7 +6595,7 @@ bool MainWindow::prepareNextMessageFrame()
qDebug () << "unsent replaced to" << "\n" << newText; qDebug () << "unsent replaced to" << "\n" << newText;
} }
ui->extFreeTextMsgEdit->setReadOnly(false); ui->extFreeTextMsgEdit->setReadOnly(shouldDisableTypeahead);
ui->extFreeTextMsgEdit->replaceUnsentText(newText, true); ui->extFreeTextMsgEdit->replaceUnsentText(newText, true);
ui->extFreeTextMsgEdit->setClean(); ui->extFreeTextMsgEdit->setClean();
} }

8
mainwindow.h
View File

@ -156,9 +156,9 @@ public slots:
bool ensureKeyNotStuck(QString const& text); bool ensureKeyNotStuck(QString const& text);
bool ensureNotIdle(); bool ensureNotIdle();
bool ensureCreateMessageReady(const QString &text); bool ensureCreateMessageReady(const QString &text);
QString createMessage(QString const& text); QString createMessage(QString const& text, bool *pDisableTypeahead);
QString appendMessage(QString const& text, bool isData); QString appendMessage(QString const& text, bool isData, bool *pDisableTypeahead);
QString createMessageTransmitQueue(QString const& text, bool reset, bool isData); QString createMessageTransmitQueue(QString const& text, bool reset, bool isData, bool *pDisableTypeahead);
void resetMessageTransmitQueue(); void resetMessageTransmitQueue();
QPair<QString, int> popMessageFrame(); QPair<QString, int> popMessageFrame();
void tryNotify(const QString &key); void tryNotify(const QString &key);
@ -344,7 +344,7 @@ private slots:
void on_nextFreeTextMsg_currentTextChanged (QString const&); void on_nextFreeTextMsg_currentTextChanged (QString const&);
void on_extFreeTextMsgEdit_currentTextChanged (QString const&); void on_extFreeTextMsgEdit_currentTextChanged (QString const&);
int currentFreqOffset(); int currentFreqOffset();
QList<QPair<QString, int>> buildMessageFrames(QString const& text, bool isData); QList<QPair<QString, int>> buildMessageFrames(QString const& text, bool isData, bool *pDisableTypeahead);
bool prepareNextMessageFrame(); bool prepareNextMessageFrame();
bool isFreqOffsetFree(int f, int bw); bool isFreqOffsetFree(int f, int bw);
int findFreeFreqOffset(int fmin, int fmax, int bw); int findFreeFreqOffset(int fmin, int fmax, int bw);