From 82d0ce712aec3374c8dfcae1723dff9980cd2591 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Fri, 7 Jul 2017 23:11:24 +0000
Subject: [PATCH] Minimum JT9 decode offset maintained per band

This  change allows  allocations for  JT9+JT65  dual mode  to be  fine
tuned. This  in turn will hopefully  allow some space for  the new FT8
mode to be  shoehorned in on bands  with little or no  free space. For
example on  top band users could  set the lowest JT9  decode offset at
1000 Hz and  set the FT8 default working frequency  at 1.839 MHz. Thus
allowing 1000 Hz for JT65, 1000 Hz for JT9 and 1000 Hz for FT8.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7809 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 widegraph.cpp | 12 +++++-------
 widegraph.h   |  4 +++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/widegraph.cpp b/widegraph.cpp
index f6ee33b47..d6295a84c 100644
--- a/widegraph.cpp
+++ b/widegraph.cpp
@@ -84,15 +84,12 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
     ui->fStartSpinBox->setValue(ui->widePlot->startFreq());
     m_waterfallPalette=m_settings->value("WaterfallPalette","Default").toString();
     m_userPalette = WFPalette {m_settings->value("UserPalette").value<WFPalette::Colours> ()};
-    int m_fMin = m_settings->value ("Fmin", 2500).toInt ();
-    ui->fSplitSpinBox->setValue (m_fMin);
+    m_fMinPerBand = m_settings->value ("FminPerBand").toHash ();
     setRxRange ();
     ui->controls_widget->setVisible(!m_settings->value("HideControls",false).toBool());
     ui->cbControls->setChecked(!m_settings->value("HideControls",false).toBool());
   }
 
-  saveSettings ();		// update config with defaults
-
   int index=0;
   for (QString const& file:
          m_palettes_path.entryList(QDir::NoDotAndDotDot |
@@ -143,6 +140,7 @@ void WideGraph::saveSettings()                                           //saveS
   m_settings->setValue("Flatten",m_bFlatten);
   m_settings->setValue("UseRef",m_bRef);
   m_settings->setValue ("HideControls", ui->controls_widget->isHidden ());
+  m_settings->setValue ("FminPerBand", m_fMinPerBand);
 }
 
 void WideGraph::drawRed(int ia, int ib)
@@ -259,7 +257,7 @@ void WideGraph::setRxRange ()
 
 int WideGraph::Fmin()                                              //Fmin
 {
-  return "60m" == m_rxBand ? 0 : m_fMin;
+  return "60m" == m_rxBand ? 0 : m_fMinPerBand.value (m_rxBand, 2500).toUInt ();
 }
 
 int WideGraph::Fmax()                                              //Fmax
@@ -331,7 +329,7 @@ void WideGraph::on_spec2dComboBox_currentIndexChanged(const QString &arg1)
 
 void WideGraph::on_fSplitSpinBox_valueChanged(int n)              //fSplit
 {
-  if (m_rxBand != "60m") m_fMin=n;
+  if (m_rxBand != "60m") m_fMinPerBand[m_rxBand] = n;
   setRxRange ();
 }
 
@@ -361,7 +359,7 @@ void WideGraph::setRxBand (QString const& band)
     }
   else
     {
-      ui->fSplitSpinBox->setValue (m_fMin);
+      ui->fSplitSpinBox->setValue (m_fMinPerBand.value (band, 2500).toUInt ());
       ui->fSplitSpinBox->setEnabled (true);
     }
   ui->widePlot->setRxBand(band);
diff --git a/widegraph.h b/widegraph.h
index 6e373bd2d..32fed92fd 100644
--- a/widegraph.h
+++ b/widegraph.h
@@ -5,6 +5,8 @@
 #include <QDialog>
 #include <QScopedPointer>
 #include <QDir>
+#include <QHash>
+#include <QVariant>
 #include "WFPalette.hpp"
 
 #define MAX_SCREENSIZE 2048
@@ -96,7 +98,7 @@ private:
   qint32 m_TRperiod;
   qint32 m_nsps;
   qint32 m_ntr0;
-  qint32 m_fMin;
+  QHash<QString, QVariant> m_fMinPerBand;
   qint32 m_fMax;
   QString m_rxBand;
   qint32 m_nSubMode;