From 40ae967fa60c7508a934f72fab8dc82447213781 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 8 Mar 2023 11:09:15 -0500
Subject: [PATCH] Rationalize the switching among ActiveStations
 configurations.

---
 widgets/mainwindow.cpp | 47 ++++++++++++++++--------------------------
 widgets/mainwindow.h   |  1 +
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 036fd8e64..e89fc4ad9 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -1415,17 +1415,7 @@ void MainWindow::readSettings()
   if(displayMsgAvg) on_actionMessage_averaging_triggered();
   if (displayFoxLog) on_fox_log_action_triggered ();
   if (displayContestLog) on_contest_log_action_triggered ();
-  if(displayActiveStations) {
-    on_actionActiveStations_triggered();
-    if(m_mode=="Q65") {
-      QString t{""};
-      if(m_specOp==SpecOp::Q65_PILEUP) {
-        m_ActiveStationsWidget->displayRecentStations("Q65-pileup",t);
-      } else {
-        m_ActiveStationsWidget->displayRecentStations("Q65",t);
-      }
-    }
-  }
+  if(displayActiveStations) on_actionActiveStations_triggered();
 }
 
 void MainWindow::checkMSK144ContestType()
@@ -2086,13 +2076,7 @@ void MainWindow::on_actionSettings_triggered()               //Setup Dialog
     }
     ui->labDXped->setVisible(SpecOp::NONE != m_specOp);
     set_mode(m_mode);
-    if(m_ActiveStationsWidget!=NULL and m_mode=="Q65") {
-      if(m_specOp==SpecOp::Q65_PILEUP) {
-        m_ActiveStationsWidget->displayRecentStations("Q65-pileup","");
-      } else {
-        m_ActiveStationsWidget->displayRecentStations("Q65","");
-      }
-    }
+    configActiveStations();
   }
 }
 
@@ -2980,6 +2964,7 @@ void MainWindow::on_actionActiveStations_triggered()
   m_ActiveStationsWidget->showNormal();
   m_ActiveStationsWidget->raise();
   m_ActiveStationsWidget->activateWindow();
+  configActiveStations();
   connect(m_ActiveStationsWidget.data(), SIGNAL(callSandP(int)),this,SLOT(callSandP2(int)));
   connect(m_ActiveStationsWidget.data(), SIGNAL(activeStationsDisplay()),this,SLOT(ARRL_Digi_Display()));
   m_ActiveStationsWidget->setScore(m_score);
@@ -3624,7 +3609,6 @@ void MainWindow::refreshPileupList()
         memcpy(line,&list[36*i],36);
         t0=QString::fromLatin1(line)+"\n";
         m_callers[i]=t0;
-  //      qDebug() << "aa" << t0;
         t+=t0;
       }
       m_ActiveStationsWidget->setClickOK(false);
@@ -4959,14 +4943,14 @@ void MainWindow::guiUpdate()
     }
   }
 
-  if(m_mode=="FT8" or m_mode=="MSK144" or m_mode=="FT4" || "Q65" == m_mode) {
+  if(m_mode=="FT8" or m_mode=="MSK144" or m_mode=="FT4" or m_mode=="Q65") {
     if(ui->txrb1->isEnabled() and
        (SpecOp::NA_VHF==m_specOp or
         SpecOp::FIELD_DAY==m_specOp or
         SpecOp::RTTY==m_specOp or
         SpecOp::WW_DIGI==m_specOp or
         SpecOp::ARRL_DIGI==m_specOp or
-        SpecOp::Q65_PILEUP==m_specOp) ) {
+        SpecOp::Q65_PILEUP==m_specOp)) {
       //We're in a contest-like mode other than EU_VHF: start QSO with Tx2.
       ui->tx1->setEnabled(false);
       ui->txb1->setEnabled(false);
@@ -6833,13 +6817,7 @@ void MainWindow::displayWidgets(qint64 n)
   b=m_mode.startsWith("FST4");
   ui->sbNB->setVisible(b);
   genStdMsgs (m_rpt, true);
-  if(m_ActiveStationsWidget!=NULL and (m_mode=="Q65" or m_mode=="FT4" or m_mode=="FT8")) {
-    if(m_specOp==SpecOp::Q65_PILEUP) {
-      m_ActiveStationsWidget->displayRecentStations("Q65-pileup","");
-    } else {
-      m_ActiveStationsWidget->displayRecentStations(m_mode,"");
-    }
-  }
+  configActiveStations();
 }
 
 void MainWindow::on_actionFST4_triggered()
@@ -7052,7 +7030,6 @@ void MainWindow::on_actionFT8_triggered()
   } else {
     if (!(keep_frequency)) switch_mode (Modes::FT8);
   }
-
   if(m_specOp != SpecOp::HOUND) {
       ui->houndButton->setChecked(false);
       ui->houndButton->setStyleSheet("");
@@ -7086,6 +7063,7 @@ void MainWindow::on_actionFT8_triggered()
     m_bWarnedSplit=true;
   }
   statusChanged();
+  configActiveStations();
 }
 
 void MainWindow::on_actionJT4_triggered()
@@ -10432,6 +10410,17 @@ void MainWindow::set_mode (QString const& mode)
     else if ("Echo" == mode) on_actionEcho_triggered ();
 }
 
+void MainWindow::configActiveStations()
+{
+  if(m_ActiveStationsWidget!=NULL and (m_mode=="Q65" or m_mode=="FT4" or m_mode=="FT8")) {
+    if(m_specOp==SpecOp::Q65_PILEUP) {
+      m_ActiveStationsWidget->displayRecentStations("Q65-pileup","");
+    } else {
+      m_ActiveStationsWidget->displayRecentStations(m_mode,"");
+    }
+  }
+}
+
 void MainWindow::remote_configure (QString const& mode, quint32 frequency_tolerance
                                    , QString const& submode, bool fast_mode, quint32 tr_period, quint32 rx_df
                                    , QString const& dx_call, QString const& dx_grid, bool generate_messages)
diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h
index f38b41b5d..0cbb833ed 100644
--- a/widgets/mainwindow.h
+++ b/widgets/mainwindow.h
@@ -377,6 +377,7 @@ private:
   void chkFT4();
   bool elide_tx1_not_allowed () const;
   void readWidebandDecodes();
+  void configActiveStations();
 
   QProcessEnvironment const& m_env;
   NetworkAccessManager m_network_manager;