flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 02:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #396 move Blackmisc Math classes into subfolder

Browse Source
This commit is contained in:
Roland Winklmeier
2015-04-02 01:37:22 +02:00
parent 608091912c
commit a6ca57265e
21 changed files with 132 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/aviation/comsystem.cpp
View File

@@ -63,8 +63,8 @@ namespace BlackMisc
quint32 d = static_cast<quint32>(f / channelSpacingKHz);
frequency.switchUnit(CFrequencyUnit::MHz());
double f0 = frequency.valueRounded(CFrequencyUnit::MHz(), 3);
double f1 = CMath::round(d * (channelSpacingKHz / 1000.0), 3);
double f2 = CMath::round((d + 1) * (channelSpacingKHz / 1000.0), 3);
double f1 = CMathUtils::round(d * (channelSpacingKHz / 1000.0), 3);
double f2 = CMathUtils::round((d + 1) * (channelSpacingKHz / 1000.0), 3);
bool down = qAbs(f1 - f0) < qAbs(f2 - f0); // which is the closest value
frequency.setCurrentUnitValue(down ? f1 : f2);
}

6
src/blackmisc/aviation/modulator.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/propertyindex.h"
#include "blackmisc/aviation/avionicsbase.h"
#include "blackmisc/mathematics.h"
#include "blackmisc/math/mathutils.h"
#include "blackmisc/blackmiscfreefunctions.h"
namespace BlackMisc
@@ -126,14 +126,14 @@ namespace BlackMisc
//! Set active frequency
virtual void setFrequencyActiveMHz(double frequencyMHz)
{
frequencyMHz = Math::CMath::round(frequencyMHz, 3);
frequencyMHz = Math::CMathUtils::round(frequencyMHz, 3);
this->m_frequencyActive = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
}
//! Set standby frequency
virtual void setFrequencyStandbyMHz(double frequencyMHz)
{
frequencyMHz = Math::CMath::round(frequencyMHz, 3);
frequencyMHz = Math::CMathUtils::round(frequencyMHz, 3);
this->m_frequencyStandby = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
}