From 38cf525969945af285f9cd618616ee462dd5e57f Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Mon, 11 Apr 2016 23:29:29 +0000
Subject: [PATCH] Use fixed 1000Hz Tx DF in VHF & up QSO modes

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6610 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 58dfa8ce8..2c6b2b96f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4058,7 +4058,7 @@ void MainWindow::band_changed (Frequency f)
         // adjust DF:s
         int shift = f - m_freqNominal;
         ui->RxFreqSpinBox->setValue (ui->RxFreqSpinBox->value () - shift);
-        if (!m_mode.startsWith ("JT4")) // JT4 uses fixed 1000Hz Tx DF
+        if (!m_config.enable_VHF_features ()) // for VHF & up we fix the Tx DF
           {
             ui->TxFreqSpinBox->setValue (ui->TxFreqSpinBox->value () - shift);
           }
@@ -4291,8 +4291,8 @@ void MainWindow::setXIT(int n, Frequency base)
   m_XIT = 0;
   if (!m_bSimplex) {
     // m_bSimplex is false, so we can use split mode if requested
-    if (m_config.split_mode () && m_mode != "JT4") {
-      // Don't use XIT in JT4, we may be using Doppler control
+    if (m_config.split_mode () && !m_config.enable_VHF_features ()) {
+      // Don't use XIT for VHF & up
       m_XIT=(n/500)*500 - 1500;
     }
 
@@ -4324,9 +4324,10 @@ void MainWindow::setFreq4(int rxFreq, int txFreq)
     if (ui->TxFreqSpinBox->isEnabled ()) {
       ui->TxFreqSpinBox->setValue(txFreq);
     }
-    else if (m_mode=="JT4"
-             && m_freqNominal >= 432000000u
+    else if (m_config.enable_VHF_features ()
              && (Qt::ControlModifier & QApplication::keyboardModifiers ())) {
+      // for VHF & up we adjust Tx dial frequency to equalize Tx to Rx
+      // when user CTRL+clicks on waterfall
       auto temp = ui->TxFreqSpinBox->value ();
       m_freqNominal += txFreq - temp;
       m_freqTxNominal += txFreq - temp;