flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 03:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improved rounding to 25KHz in COM units

Browse Source
This commit is contained in:
Klaus Basan
2014-01-20 13:16:01 +01:00
parent 3859dcef4f
commit c01dcd85df
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/aviocomsystem.cpp
View File

@@ -40,6 +40,7 @@ namespace BlackMisc
void CComSystem::setFrequencyActiveMHz(double frequencyMHz) void CComSystem::setFrequencyActiveMHz(double frequencyMHz)
{ {
CFrequency f(frequencyMHz, CFrequencyUnit::MHz()); CFrequency f(frequencyMHz, CFrequencyUnit::MHz());
if (f == this->getFrequencyActive()) return; // save all the comparisons / rounding
CComSystem::roundTo25KHz(f); CComSystem::roundTo25KHz(f);
this->CModulator::setFrequencyActive(f); this->CModulator::setFrequencyActive(f);
this->validate(true); this->validate(true);
@@ -48,6 +49,7 @@ namespace BlackMisc
void CComSystem::setFrequencyStandbyMHz(double frequencyMHz) void CComSystem::setFrequencyStandbyMHz(double frequencyMHz)
{ {
CFrequency f(frequencyMHz, CFrequencyUnit::MHz()); CFrequency f(frequencyMHz, CFrequencyUnit::MHz());
if (f == this->getFrequencyStandby()) return; // save all the comparisons / rounding
CComSystem::roundTo25KHz(f); CComSystem::roundTo25KHz(f);
this->CModulator::setFrequencyStandby(f); this->CModulator::setFrequencyStandby(f);
this->validate(true); this->validate(true);
@@ -60,7 +62,12 @@ namespace BlackMisc
{ {
double f = frequency.valueRounded(CFrequencyUnit::kHz(), 0); double f = frequency.valueRounded(CFrequencyUnit::kHz(), 0);
quint32 d = static_cast<quint32>(f / 25.0); quint32 d = static_cast<quint32>(f / 25.0);
frequency.setCurrentUnitValue(d * (25.0 / 1000.0)); frequency.switchUnit(CFrequencyUnit::MHz());
double f0 = frequency.valueRounded(CFrequencyUnit::MHz(), 3);
double f1 = CMath::round(d * (25.0 / 1000.0), 3);
double f2 = CMath::round((d + 1) * (25.0 / 1000.0), 3);
bool down = qAbs(f1 - f0) < qAbs(f2 - f0); // which is the closest value
frequency.setCurrentUnitValue(down ? f1 : f2);
} }
} // namespace } // namespace
} }