Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert #704 and use alternate solution. #710

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Revert #704 and use alternate solution. #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52fd708
Revert #704 and use alternate solution.
tmiw Apr 7, 2024
c56c328
Add PR #710 to changelog.
tmiw Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion USER_MANUAL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
* Fix typo in cardinal directions list. (PR #688)
* Shrink size of callsign list to prevent it from disappearing off the screen. (PR #692)
* Clean up memory leak in FreeDV Reporter window. (PR #705)
* Fix issue causing delayed filter updates when going from tracking band to frequency. (PR #704)
* Fix issue causing delayed filter updates when going from tracking band to frequency. (PR #710)
* Fix hanging issue with footswitch configured. (PR #707)
2. Enhancements:
* Add additional error reporting in case of PortAudio failures. (PR #695)
Expand Down
29 changes: 19 additions & 10 deletions src/gui/dialogs/freedv_reporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,12 @@ void FreeDVReporterDialog::OnFilterTrackingEnable(wxCommandEvent& event)
freq =
(FilterFrequency)wxGetApp().appConfiguration.reportingConfiguration.freedvReporterBandFilter.get();
}


// Force refresh of filters since the user expects this to happen immediately after changing a
// filter setting.
filteredFrequency_ = 0;
currentBandFilter_ = BAND_ALL;

setBandFilter(freq);
}

Expand Down Expand Up @@ -1044,18 +1049,22 @@ void FreeDVReporterDialog::refreshQSYButtonState()

void FreeDVReporterDialog::setBandFilter(FilterFrequency freq)
{
filteredFrequency_ = wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency;
currentBandFilter_ = freq;
if (filteredFrequency_ != wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency ||
currentBandFilter_ != freq)
{
filteredFrequency_ = wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency;
currentBandFilter_ = freq;

// Update displayed list based on new filter criteria.
clearAllEntries_(false);
// Update displayed list based on new filter criteria.
clearAllEntries_(false);

std::map<int, int> colResizeList;
for (auto& kvp : allReporterData_)
{
addOrUpdateListIfNotFiltered_(kvp.second, colResizeList);
std::map<int, int> colResizeList;
for (auto& kvp : allReporterData_)
{
addOrUpdateListIfNotFiltered_(kvp.second, colResizeList);
}
resizeChangedColumns_(colResizeList);
}
resizeChangedColumns_(colResizeList);
}

void FreeDVReporterDialog::sortColumn_(int col)
Expand Down
Loading