From 7bd86ca177366475604deffbe1307dbd222ff500 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Sun, 24 Mar 2019 09:59:24 -0400 Subject: [PATCH] Fixed #94: swap heard graph on band change --- mainwindow.cpp | 28 +++++++++++++++++++--------- mainwindow.h | 8 +++++--- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 79fee3e..03ca5a8 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -5605,22 +5605,32 @@ void MainWindow::on_tx6_editingFinished() //tx6 edited } void MainWindow::cacheActivity(QString key){ - m_callActivityCache[key] = m_callActivity; - m_bandActivityCache[key] = m_bandActivity; - m_rxTextCache[key] = ui->textEditRX->toHtml(); + m_callActivityBandCache[key] = m_callActivity; + m_bandActivityBandCache[key] = m_bandActivity; + m_rxTextBandCache[key] = ui->textEditRX->toHtml(); + m_heardGraphIncomingBandCache[key] = m_heardGraphIncoming; + m_heardGraphOutgoingBandCache[key] = m_heardGraphOutgoing; } void MainWindow::restoreActivity(QString key){ - if(m_callActivityCache.contains(key)){ - m_callActivity = m_callActivityCache[key]; + if(m_callActivityBandCache.contains(key)){ + m_callActivity = m_callActivityBandCache[key]; } - if(m_bandActivityCache.contains(key)){ - m_bandActivity = m_bandActivityCache[key]; + if(m_bandActivityBandCache.contains(key)){ + m_bandActivity = m_bandActivityBandCache[key]; } - if(m_rxTextCache.contains(key)){ - ui->textEditRX->setHtml(m_rxTextCache[key]); + if(m_rxTextBandCache.contains(key)){ + ui->textEditRX->setHtml(m_rxTextBandCache[key]); + } + + if(m_heardGraphIncomingBandCache.contains(key)){ + m_heardGraphIncoming = m_heardGraphIncomingBandCache[key]; + } + + if(m_heardGraphOutgoingBandCache.contains(key)){ + m_heardGraphOutgoing = m_heardGraphOutgoingBandCache[key]; } displayActivity(true); diff --git a/mainwindow.h b/mainwindow.h index 3ef7b9a..d9e7cac 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -828,9 +828,11 @@ private: QMap m_rxInboxCountCache; // call -> count - QMap> m_callActivityCache; // band -> call activity - QMap>> m_bandActivityCache; // band -> band activity - QMap m_rxTextCache; // band -> rx text + QMap> m_callActivityBandCache; // band -> call activity + QMap>> m_bandActivityBandCache; // band -> band activity + QMap m_rxTextBandCache; // band -> rx text + QMap>> m_heardGraphOutgoingBandCache; // band -> heard in + QMap>> m_heardGraphIncomingBandCache; // band -> heard out JSCChecker * m_checker;