From 592316fc42a900c134e9d6a0b6a6c32db2f42416 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Fri, 6 Oct 2017 16:18:17 +0000 Subject: [PATCH] Add an accessor method to Configuration to get the current calibration parameters git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8163 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Configuration.cpp | 4 ++++ Configuration.hpp | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/Configuration.cpp b/Configuration.cpp index f4b8f445c..eaefa925d 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -672,6 +672,10 @@ QDir Configuration::azel_directory () const {return m_->azel_directory_;} QString Configuration::rig_name () const {return m_->rig_params_.rig_name;} bool Configuration::pwrBandTxMemory () const {return m_->pwrBandTxMemory_;} bool Configuration::pwrBandTuneMemory () const {return m_->pwrBandTuneMemory_;} +auto Configuration::calibration_params () const -> CalibrationParams +{ + return {m_->frequency_calibration_intercept_, m_->frequency_calibration_slope_ppm_}; +} void Configuration::adjust_calibration_parameters (double intercept, double slope_ppm) { diff --git a/Configuration.hpp b/Configuration.hpp index aca0736c8..58b7bde7d 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -159,6 +159,12 @@ public: QColor color_NewCall () const; bool pwrBandTxMemory () const; bool pwrBandTuneMemory () const; + struct CalibrationParams + { + double intercept; + double slope_ppm; + }; + CalibrationParams calibration_params () const; // Adjust the current calibration parameters, both arguments are in // Hertz. They will be added to the current values.