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

Added async frame counting

Browse Source
This commit is contained in:
Jordan Sherer 2018-10-15 22:06:31 -04:00
parent cf9c74b99e
commit 87a6e10bd6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mainwindow.cpp
View File

@ -7936,7 +7936,7 @@ void MainWindow::updateTextDisplay(){
} }
} }
#define USE_SYNC_FRAME_COUNT 1 #define USE_SYNC_FRAME_COUNT 0
void MainWindow::refreshTextDisplay(){ void MainWindow::refreshTextDisplay(){
auto text = ui->extFreeTextMsgEdit->toPlainText(); auto text = ui->extFreeTextMsgEdit->toPlainText();
@ -7967,7 +7967,6 @@ void MainWindow::refreshTextDisplay(){
#else #else
// prepare selected callsign for directed message // prepare selected callsign for directed message
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
m_txTextDirtyLastSelectedCall = selectedCall;
// prepare compound // prepare compound
bool compound = Radio::is_compound_callsign(m_config.my_callsign()); bool compound = Radio::is_compound_callsign(m_config.my_callsign());
@ -7983,7 +7982,7 @@ void MainWindow::refreshTextDisplay(){
); );
connect(t, &BuildMessageFramesThread::finished, t, &QObject::deleteLater); connect(t, &BuildMessageFramesThread::finished, t, &QObject::deleteLater);
connect(t, &BuildMessageFramesThread::resultReady, this, [this](const QStringList frames){ connect(t, &BuildMessageFramesThread::resultReady, this, [this, text](const QStringList frames){
QStringList textList; QStringList textList;
qDebug() << "frames:"; qDebug() << "frames:";
@ -7993,10 +7992,18 @@ void MainWindow::refreshTextDisplay(){
textList.append(dt.message()); textList.append(dt.message());
} }
updateFrameCountEstimate(frames.length()); auto transmitText = textList.join("");
updateTextStatsDisplay(textList.join(""), frames.length()); auto count = frames.length();
// ugh...i hate these globals
m_txTextDirtyLastSelectedCall = callsignSelected(true);
m_txTextDirtyLastText = text;
m_txFrameCountEstimate = count;
m_txTextDirty = false; m_txTextDirty = false;
updateTextStatsDisplay(transmitText, count);
updateTxButtonDisplay();
}); });
t->start(); t->start();
#endif #endif