Skip to content

Commit 5414585

Browse files
authored
FreeDV Reporter: Fix display issues on non-English systems. (#1217)
* FreeDV Reporter: Fix display issues on non-English systems. * Increment release to 2.3.0. * Add additional debugging for CAT control issue. * Revert "Add additional debugging for CAT control issue." This reverts commit c8749f6. * Add PR #1217 to changelog.
1 parent 8f6d76e commit 5414585

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

USER_MANUAL.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
879879

880880
1. Bugfixes:
881881
* Linux: fix semaphore wakeup timing to reduce audio dropouts. (PR #1220)
882+
* FreeDV Reporter: Fix display issues on non-English systems. (PR #1217)
882883
2. Enhancements:
883884
* FreeDV Reporter: Use ItemsAdded/ItemsDeleted instead of Cleared() for performance. (PR #1212)
884885
3. Build system:

src/gui/dialogs/freedv_reporter.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ FreeDVReporterDialog::FreeDVReporterDialog(wxWindow* parent, wxWindowID id, cons
182182
: wxFrame(parent, id, title, pos, size, style)
183183
, tipWindow_(nullptr)
184184
, UNKNOWN_STR("")
185-
, SNR_FORMAT_STR("%.01f")
186185
, ALL_LETTERS_RGX("^[A-Z]{2}$")
187186
, MS_REMOVAL_RGX("\\.[^+-]+")
188187
, TIMEZONE_RGX("([+-])([0-9]+):([0-9]+)$")
@@ -2750,7 +2749,7 @@ void FreeDVReporterDialog::FreeDVReporterDataModel::refreshAllRows()
27502749
}
27512750
else
27522751
{
2753-
newHeading = wxString::Format("%.0f", kvp.second->headingVal);
2752+
newHeading = wxNumberFormatter::ToString(kvp.second->headingVal, 0);
27542753
}
27552754

27562755
updated |= kvp.second->heading != newHeading;
@@ -2936,7 +2935,7 @@ void FreeDVReporterDialog::FreeDVReporterDataModel::onUserConnectFn_(std::string
29362935
}
29372936
else
29382937
{
2939-
temp->heading = wxString::Format("%.0f", temp->headingVal);
2938+
temp->heading = wxNumberFormatter::ToString(temp->headingVal, 0);
29402939
}
29412940
}
29422941
}
@@ -3236,7 +3235,7 @@ void FreeDVReporterDialog::FreeDVReporterDataModel::onReceiveUpdateFn_(std::stri
32363235
iter->second->lastRxCallsign = receivedCallsignWx;
32373236
iter->second->lastRxMode = rxModeWx;
32383237

3239-
wxString snrString = wxString::Format(parent_->SNR_FORMAT_STR, snr);
3238+
wxString snrString = wxNumberFormatter::ToString(snr, 1);
32403239
if (receivedCallsign == "" && rxMode == "")
32413240
{
32423241
// Frequency change--blank out SNR too.

src/gui/dialogs/freedv_reporter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ class FreeDVReporterDialog : public wxFrame
200200

201201
private:
202202
const wxString UNKNOWN_STR;
203-
const wxString SNR_FORMAT_STR;
204203
const wxString ALL_LETTERS_RGX;
205204
const wxString MS_REMOVAL_RGX;
206205
const wxString TIMEZONE_RGX;

0 commit comments

Comments
 (0)