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

Added better debounce logic for text counting

Browse Source
This commit is contained in:
Jordan Sherer 2018-10-03 08:59:14 -04:00
parent c26a042a92
commit 119499afa4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mainwindow.cpp
View File

@ -1396,7 +1396,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
*/ */
m_txTextDirtyDebounce.setSingleShot(true); m_txTextDirtyDebounce.setSingleShot(true);
m_txTextDirtyDebounce.setInterval(100);
connect(&m_txTextDirtyDebounce, &QTimer::timeout, this, &MainWindow::buildMessageFramesAndUpdateCountDisplay); connect(&m_txTextDirtyDebounce, &QTimer::timeout, this, &MainWindow::buildMessageFramesAndUpdateCountDisplay);
QTimer::singleShot(0, this, &MainWindow::initializeDummyData); QTimer::singleShot(0, this, &MainWindow::initializeDummyData);
@ -8702,7 +8701,7 @@ void MainWindow::updateButtonDisplay(){
int count = m_txFrameCount; int count = m_txFrameCount;
int sent = count - m_txFrameQueue.count(); int sent = count - m_txFrameQueue.count();
ui->startTxButton->setText(m_tune ? "Tuning" : QString("Sending (%1/%2)").arg(sent).arg(count)); ui->startTxButton->setText(m_tune ? "Tuning" : QString("Sending (%1/%2)").arg(sent).arg(count));
} else if(m_txTextDirty) { } else if(m_txTextDirty && (m_txTextDirtyLastText != ui->extFreeTextMsgEdit->toPlainText() || m_txTextDirtyLastSelectedCall != selectedCallsign)){
if(m_txTextDirtyDebounce.isActive()){ if(m_txTextDirtyDebounce.isActive()){
m_txTextDirtyDebounce.stop(); m_txTextDirtyDebounce.stop();
@ -8717,6 +8716,7 @@ void MainWindow::buildMessageFramesAndUpdateCountDisplay(){
qDebug() << "buildMessageFramesAndUpdateCountDisplay"; qDebug() << "buildMessageFramesAndUpdateCountDisplay";
auto text = ui->extFreeTextMsgEdit->toPlainText(); auto text = ui->extFreeTextMsgEdit->toPlainText();
m_txTextDirtyLastText = text;
#if USE_SYNC_FRAME_COUNT #if USE_SYNC_FRAME_COUNT
int count = countMessageFrames(text); int count = countMessageFrames(text);
@ -8724,6 +8724,7 @@ void MainWindow::buildMessageFramesAndUpdateCountDisplay(){
#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());

2
mainwindow.h
View File

@ -730,6 +730,8 @@ private:
int m_txFrameCount; int m_txFrameCount;
QTimer m_txTextDirtyDebounce; QTimer m_txTextDirtyDebounce;
bool m_txTextDirty; bool m_txTextDirty;
QString m_txTextDirtyLastText;
QString m_txTextDirtyLastSelectedCall;
QString m_lastTxMessage; QString m_lastTxMessage;
QDateTime m_lastTxTime; QDateTime m_lastTxTime;