From 399aac84d157f5efb95fd3e390cdef539ca97949 Mon Sep 17 00:00:00 2001
From: Charlie Suckling <g3wdg1@gmail.com>
Date: Tue, 9 Feb 2021 17:07:22 +0100
Subject: [PATCH 1/2] Set default Tx Frequencies for Q65

---
 widgets/mainwindow.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 742243bd3..e5ee4fdf7 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -6417,6 +6417,8 @@ void MainWindow::on_actionQ65_triggered()
 //###  ui->sbSubmode->setMaximum(4);
   ui->sbSubmode->setMaximum(7);
   ui->sbSubmode->setValue(m_nSubMode);
+  //ui->TxFreqSpinBox->setValue(1000); //wdg
+  //if(m_nSubMode==4) ui->TxFreqSpinBox->setValue(700); //wdg
   QString fname {QDir::toNativeSeparators(m_config.temp_dir().absoluteFilePath ("red.dat"))};
   m_wideGraph->setRedFile(fname);
   m_wideGraph->setMode(m_mode);
@@ -7638,6 +7640,13 @@ void MainWindow::on_sbSubmode_valueChanged(int n)
   if(m_mode=="ISCAT") {
     if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012);
     if(m_nSubMode==1) ui->TxFreqSpinBox->setValue(560);
+  }
+    if(m_mode=="Q65") {
+     if((m_nSubMode==4 && m_TRperiod==60.0) || (m_nSubMode==3 && m_TRperiod==30.0) || (m_nSubMode==2 && m_TRperiod==15.0))
+         { ui->TxFreqSpinBox->setValue(700);
+     } else {
+      ui->TxFreqSpinBox->setValue(1000);//wdg
+     }
   }
   if(m_mode=="JT9") {
     if(m_nSubMode<4) {

From 6868556036f81cc3387ddf6070ad0672dec7f3e9 Mon Sep 17 00:00:00 2001
From: Charlie Suckling <g3wdg1@gmail.com>
Date: Thu, 11 Feb 2021 17:19:43 +0100
Subject: [PATCH 2/2] 
 Set-default-Tx-Frequencies-for-Q65-and-limit-mode-selection

---
 widgets/mainwindow.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index e5ee4fdf7..0a4ed8665 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -6414,11 +6414,7 @@ void MainWindow::on_actionQ65_triggered()
   m_hsymStop=49;
   ui->sbTR->values ({15, 30, 60, 120, 300});
   on_sbTR_valueChanged (ui->sbTR->value());
-//###  ui->sbSubmode->setMaximum(4);
-  ui->sbSubmode->setMaximum(7);
-  ui->sbSubmode->setValue(m_nSubMode);
-  //ui->TxFreqSpinBox->setValue(1000); //wdg
-  //if(m_nSubMode==4) ui->TxFreqSpinBox->setValue(700); //wdg
+  ui->sbSubmode->setValue(m_nSubMode); 
   QString fname {QDir::toNativeSeparators(m_config.temp_dir().absoluteFilePath ("red.dat"))};
   m_wideGraph->setRedFile(fname);
   m_wideGraph->setMode(m_mode);
@@ -7594,7 +7590,17 @@ void MainWindow::on_sbTR_valueChanged(int value)
                 ui->rh_decodes_headings_label->setText("UTC   dB   DT Freq    " + tr ("Message"));
               }
           }
-      }
+      
+       if ("Q65" == m_mode)
+         {
+         switch (value)
+             {
+              case 15: ui->sbSubmode->setMaximum (2); break;
+              case 30: ui->sbSubmode->setMaximum (3); break;
+              default: ui->sbSubmode->setMaximum (4); break;
+              }
+          }
+       } 
     m_fastGraph->setTRPeriod (value);
     m_modulator->setTRPeriod (value); // TODO - not thread safe
     m_detector->setTRPeriod (value);  // TODO - not thread safe
@@ -7645,7 +7651,7 @@ void MainWindow::on_sbSubmode_valueChanged(int n)
      if((m_nSubMode==4 && m_TRperiod==60.0) || (m_nSubMode==3 && m_TRperiod==30.0) || (m_nSubMode==2 && m_TRperiod==15.0))
          { ui->TxFreqSpinBox->setValue(700);
      } else {
-      ui->TxFreqSpinBox->setValue(1000);//wdg
+      ui->TxFreqSpinBox->setValue(1000);
      }
   }
   if(m_mode=="JT9") {