Merge pull request #561 from drowe67/ms-freq-list-locale

Properly convert frequency list entries to current locale.

Author: tmiw

USER_MANUAL.md

@@ -917,6 +917,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
         * Fix issue causing duplicate entries when filtering is enabled and users disconnect/reconnect. (PR #557)
     * Default to the audio from the current TX mode if no modes decode (works around Codec2 bug with 1600 mode). (PR #544)
     * Fix bug preventing proper restore of selected tabs. (PR #548)
+    * Properly handle frequency entry based on user's current location. (PR #561)
     * Improve labeling of PTT/CAT control options. (PR #550)
     * Clarify behavior of "On Top" menu option. (PR #549)
     * Work around Xcode issue preventing FreeDV from starting on macOS < 12. (PR #553)

src/config/ReportingConfiguration.cpp

@@ -19,6 +19,7 @@
 //
 //==========================================================================
 
+#include <wx/tokenzr.h>
 #include <inttypes.h>
 
 #include "../defines.h"
@@ -68,7 +69,58 @@ ReportingConfiguration::ReportingConfiguration()
     , freedvReporterRxRowBackgroundColor("/Reporting/FreeDV/RxRowBackgroundColor", "#379baf")
     , freedvReporterRxRowForegroundColor("/Reporting/FreeDV/RxRowForegroundColor", "#000000")
 {
-    // empty
+    // Special handling for the frequency list to properly handle locales
+    reportingFrequencyList.setLoadProcessor([](std::vector<wxString> list) {
+        std::vector<wxString> newList;
+        for (auto& val : list)
+        {
+            // Frequencies are unfortunately saved in US format (legacy behavior). We need 
+            // to manually parse and convert to Hz, then output MHz values in the user's current
+            // locale.
+            wxStringTokenizer tok(val, ".");
+            wxString wholeNumber = tok.GetNextToken();
+            wxString fraction = "0";
+            if (tok.HasMoreTokens())
+            {
+                fraction = tok.GetNextToken();
+            }
+
+            if (fraction.Length() < 6)
+            {
+                fraction += wxString('0', 6 - fraction.Length());
+            }
+
+            long hz = 0;
+            long mhz = 0;
+            wholeNumber.ToLong(&mhz);
+            fraction.ToLong(&hz);
+            uint64_t freq = mhz * 1000000 + hz;
+
+            float mhzFloat = freq / 1000000.0;
+            newList.push_back(wxString::Format("%.04f", mhzFloat));
+        }
+
+        return newList;
+    });
+
+    reportingFrequencyList.setSaveProcessor([](std::vector<wxString> list) {
+        std::vector<wxString> newList;
+        for (auto& val : list)
+        {
+            // Frequencies are unfortunately saved in US format (legacy behavior). We need 
+            // to manually parse and convert to Hz, then output MHz values in US format.
+            double mhz = 0.0;
+            val.ToDouble(&mhz);
+
+            uint64_t hz = mhz * 1000000;
+            uint64_t mhzInt = hz / 1000000;
+            hz = hz % 1000000;
+
+            wxString newVal = wxString::Format("%" PRIu64 ".%06" PRIu64, mhzInt, hz);
+            newList.push_back(newVal);
+        }
+        return newList;
+    });
 }
 
 void ReportingConfiguration::load(wxConfigBase* config)

src/dlg_options.cpp

@@ -903,11 +903,12 @@ void OptionsDlg::ExchangeData(int inout, bool storePersistent)
         wxGetApp().appConfiguration.reportingConfiguration.freedvReporterTxRowForegroundColor = txForegroundColor.GetAsString(wxC2S_HTML_SYNTAX);
 
         // Save new reporting frequency list.
-        wxGetApp().appConfiguration.reportingConfiguration.reportingFrequencyList->clear();
+        std::vector<wxString> tmpList;
         for (unsigned int index = 0; index < m_freqList->GetCount(); index++)
         {
-            wxGetApp().appConfiguration.reportingConfiguration.reportingFrequencyList->push_back(m_freqList->GetString(index));
+            tmpList.push_back(m_freqList->GetString(index));
         }
+        wxGetApp().appConfiguration.reportingConfiguration.reportingFrequencyList = tmpList;
 
         wxGetApp().appConfiguration.enableSpaceBarForPTT = m_ckboxEnableSpacebarForPTT->GetValue();