From 2f686e9c50a789d60a03b6cceb6deb82d8f4c6b1 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Sat, 16 May 2020 14:41:22 -0400
Subject: [PATCH] Added clear activity functions to the menu.

---
 mainwindow.cpp | 77 ++++++++++++++++++++++++++++++++++----------------
 mainwindow.h   |  7 +++++
 mainwindow.ui  | 45 ++++++++++++++++++++++++++++-
 3 files changed, 104 insertions(+), 25 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 78d38a0..74e3b33 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3023,6 +3023,22 @@ void MainWindow::on_actionFocus_Call_Activity_Table_triggered(){
     ui->tableWidgetCalls->setFocus();
 }
 
+void MainWindow::on_actionClear_All_Activity_triggered(){
+    clearActivity();
+}
+
+void MainWindow::on_actionClear_Band_Activity_triggered(){
+    clearBandActivity();
+}
+
+void MainWindow::on_actionClear_RX_Activity_triggered(){
+    clearRXActivity();
+}
+
+void MainWindow::on_actionClear_Call_Activity_triggered(){
+    clearCallActivity();
+}
+
 void MainWindow::on_actionSetOffset_triggered(){
     bool ok = false;
     auto currentFreq = currentFreqOffset();
@@ -7071,29 +7087,41 @@ void MainWindow::restoreActivity(QString key){
 
 void MainWindow::clearActivity(){
     qDebug() << "clear activity";
-    m_bandActivity.clear();
-    m_callActivity.clear();
+
     m_callSeenHeartbeat.clear();
     m_compoundCallCache.clear();
     m_rxCallCache.clear();
     m_rxCallQueue.clear();
     m_rxRecentCache.clear();
     m_rxDirectedCache.clear();
-    m_rxFrameBlockNumbers.clear();
-    m_rxActivityQueue.clear();
     m_rxCommandQueue.clear();
     m_lastTxMessage.clear();
-    m_heardGraphIncoming.clear();
-    m_heardGraphOutgoing.clear();
 
     refreshInboxCounts();
     resetTimeDeltaAverage();
 
-    clearTableWidget(ui->tableWidgetCalls);
-    createGroupCallsignTableRows(ui->tableWidgetCalls, "");
+    clearBandActivity();
+    clearRXActivity();
+    clearCallActivity();
 
+    displayActivity(true);
+}
+
+void MainWindow::clearBandActivity(){
+    qDebug() << "clear band activity";
+    m_bandActivity.clear();
     clearTableWidget(ui->tableWidgetRXAll);
 
+    resetTimeDeltaAverage();
+    displayBandActivity();
+}
+
+void MainWindow::clearRXActivity(){
+    qDebug() << "clear rx activity";
+
+    m_rxFrameBlockNumbers.clear();
+    m_rxActivityQueue.clear();
+
     ui->textEditRX->clear();
     ui->freeTextMsg->clear();
     ui->extFreeTextMsg->clear();
@@ -7102,8 +7130,21 @@ void MainWindow::clearActivity(){
     ui->extFreeTextMsgEdit->clear();
     ui->extFreeTextMsgEdit->setReadOnly(false);
     update_dynamic_property(ui->extFreeTextMsgEdit, "transmitting", false);
+}
 
-    displayActivity(true);
+void MainWindow::clearCallActivity(){
+    qDebug() << "clear call activity";
+
+    m_callActivity.clear();
+
+    m_heardGraphIncoming.clear();
+    m_heardGraphOutgoing.clear();
+
+    clearTableWidget(ui->tableWidgetCalls);
+    createGroupCallsignTableRows(ui->tableWidgetCalls, "");
+
+    resetTimeDeltaAverage();
+    displayCallActivity();
 }
 
 void MainWindow::createGroupCallsignTableRows(QTableWidget *table, QString const &selectedCall){
@@ -8726,21 +8767,12 @@ void MainWindow::on_rbFreeText_clicked(bool checked)
 void MainWindow::on_clearAction_triggered(QObject * sender){
     // TODO: jsherer - abstract this into a tableWidgetRXAllReset function
     if(sender == ui->tableWidgetRXAll){
-        m_bandActivity.clear();
-        clearTableWidget(ui->tableWidgetRXAll);
-        resetTimeDeltaAverage();
-        displayBandActivity();
+        clearBandActivity();
     }
 
     // TODO: jsherer - abstract this into a tableWidgetCallsReset function
     if(sender == ui->tableWidgetCalls){
-        m_callActivity.clear();
-        m_heardGraphIncoming.clear();
-        m_heardGraphOutgoing.clear();
-        clearTableWidget((ui->tableWidgetCalls));
-        createGroupCallsignTableRows(ui->tableWidgetCalls, "");
-        resetTimeDeltaAverage();
-        displayCallActivity();
+        clearCallActivity();
     }
 
     if(sender == ui->extFreeTextMsgEdit){
@@ -8749,10 +8781,7 @@ void MainWindow::on_clearAction_triggered(QObject * sender){
     }
 
     if(sender == ui->textEditRX){
-        // TODO: jsherer - move these
-        ui->textEditRX->clear();
-        m_rxFrameBlockNumbers.clear();
-        m_rxActivityQueue.clear();
+        clearRXActivity();
     }
 }
 
diff --git a/mainwindow.h b/mainwindow.h
index 1fdc867..b9863f5 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -146,6 +146,9 @@ public slots:
   void cacheActivity(QString key);
   void restoreActivity(QString key);
   void clearActivity();
+  void clearBandActivity();
+  void clearRXActivity();
+  void clearCallActivity();
   void createGroupCallsignTableRows(QTableWidget *table, const QString &selectedCall);
   void displayTextForFreq(QString text, int freq, QDateTime date, bool isTx, bool isNewLine, bool isLast);
   void writeNoticeTextToUI(QDateTime date, QString text);
@@ -201,6 +204,10 @@ private slots:
   void on_actionFocus_Message_Reply_Area_triggered();
   void on_actionFocus_Band_Activity_Table_triggered();
   void on_actionFocus_Call_Activity_Table_triggered();
+  void on_actionClear_All_Activity_triggered();
+  void on_actionClear_Band_Activity_triggered();
+  void on_actionClear_RX_Activity_triggered();
+  void on_actionClear_Call_Activity_triggered();
   void on_actionSetOffset_triggered();
   void on_actionShow_Fullscreen_triggered(bool checked);
   void on_actionShow_Statusbar_triggered(bool checked);
diff --git a/mainwindow.ui b/mainwindow.ui
index 2107591..2a11eed 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -4682,6 +4682,7 @@ list. The list can be maintained in Settings (F2).</string>
     <addaction name="separator"/>
     <addaction name="actionShow_Waterfall"/>
     <addaction name="actionShow_Waterfall_Controls"/>
+    <addaction name="actionShow_Waterfall_Time_Drift_Controls"/>
     <addaction name="separator"/>
     <addaction name="actionShow_Fullscreen"/>
     <addaction name="actionShow_Statusbar"/>
@@ -4715,6 +4716,16 @@ list. The list can be maintained in Settings (F2).</string>
      <addaction name="actionFocus_Band_Activity_Table"/>
      <addaction name="actionFocus_Call_Activity_Table"/>
     </widget>
+    <widget class="QMenu" name="menuClear_Activity">
+     <property name="title">
+      <string>Clear &amp;Activity...</string>
+     </property>
+     <addaction name="actionClear_All_Activity"/>
+     <addaction name="separator"/>
+     <addaction name="actionClear_Band_Activity"/>
+     <addaction name="actionClear_RX_Activity"/>
+     <addaction name="actionClear_Call_Activity"/>
+    </widget>
     <addaction name="actionEnable_Monitor_RX"/>
     <addaction name="actionEnable_Transmitter_TX"/>
     <addaction name="actionEnable_Reporting_SPOT"/>
@@ -4727,6 +4738,7 @@ list. The list can be maintained in Settings (F2).</string>
     <addaction name="actionHeartbeat"/>
     <addaction name="actionCQ"/>
     <addaction name="separator"/>
+    <addaction name="menuClear_Activity"/>
    </widget>
    <widget class="QMenu" name="menuModeJS8">
     <property name="title">
@@ -5443,7 +5455,7 @@ list. The list can be maintained in Settings (F2).</string>
   </action>
   <action name="actionReset_Window_Sizes">
    <property name="text">
-    <string>Reset Frame Sizes</string>
+    <string>Reset Frame Si&amp;zes</string>
    </property>
   </action>
   <action name="actionSort_Band_Activity">
@@ -5771,6 +5783,37 @@ list. The list can be maintained in Settings (F2).</string>
     <string>Enable Automatic Timing Synchronization (S&amp;YNC)</string>
    </property>
   </action>
+  <action name="actionShow_Waterfall_Time_Drift_Controls">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Time &amp;Drift Controls...</string>
+   </property>
+  </action>
+  <action name="actionClear_All_Activity">
+   <property name="text">
+    <string>Clear &amp;All Activity</string>
+   </property>
+  </action>
+  <action name="actionClear_Band_Activity">
+   <property name="text">
+    <string>Clear &amp;Band Activity</string>
+   </property>
+  </action>
+  <action name="actionClear_RX_Activity">
+   <property name="text">
+    <string>Clear &amp;RX Activity</string>
+   </property>
+  </action>
+  <action name="actionClear_Call_Activity">
+   <property name="text">
+    <string>Clear &amp;Call Activity</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>