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

style fixes: mostly just things that make my eyes bleed :)

Browse Source
This commit is contained in:
Mathew Sutcliffe
2013-08-13 22:29:48 +01:00
parent e8b52b33d0
commit 2c781e8b36
50 changed files with 975 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/blackmisc/avioadfsystem.h
View File

@@ -29,6 +29,7 @@ private:
double fr = f.valueRounded(PhysicalQuantities::CFrequencyUnit::kHz(), this->m_digits);
return fr >= 190.0 && fr <= 1750.0;
}
/*!
* \brief Constructor
* \param validate
@@ -53,8 +54,8 @@ protected:
{
if (this->isDefaultValue()) return true; // special case
return
(this->isValidFrequency(this->getFrequencyActive()) &&
(this->isValidFrequency(this->getFrequencyStandby())));
this->isValidFrequency(this->getFrequencyActive()) &&
this->isValidFrequency(this->getFrequencyStandby());
}
/*!
@@ -73,16 +74,19 @@ protected:
if (!valid) throw std::range_error("Illegal values in CAdfSystem::validate");
return true;
}
public:
/*!
* Default constructor
*/
CAdfSystem() : CModulator() {}
/*!
* \brief Copy constructor
* \param otherSystem
* \param other
*/
CAdfSystem(const CAdfSystem &otherSystem) : CModulator(otherSystem) {}
CAdfSystem(const CAdfSystem &other) : CModulator(other) {}
/*!
* \brief Constructor
* \param name
@@ -95,24 +99,27 @@ public:
{
this->validate(true);
}
/*!
* \brief Set active frequency
* \param frequencyKHz
*/
void setFrequencyActiveKHz(double frequencyKHz)
{
CModulator::setFrequencyActiveKHz(frequencyKHz);
this->CModulator::setFrequencyActiveKHz(frequencyKHz);
this->validate(true);
}
/*!
* \brief Set standby frequency
* \param frequencyKHz
*/
void setFrequencyStandbyKHz(double frequencyKHz)
{
CModulator::setFrequencyStandbyKHz(frequencyKHz);
this->CModulator::setFrequencyStandbyKHz(frequencyKHz);
this->validate(true);
}
/*!
* \brief Assigment operator =
* \param otherSystem
@@ -120,9 +127,10 @@ public:
*/
CAdfSystem &operator =(const CAdfSystem &otherSystem)
{
CModulator::operator =(otherSystem);
return (*this);
this->CModulator::operator =(otherSystem);
return *this;
}
/*!
* \brief operator ==
* \param otherSystem
@@ -130,8 +138,9 @@ public:
*/
bool operator ==(const CAdfSystem &otherSystem) const
{
return CModulator::operator ==(otherSystem);
return this->CModulator::operator ==(otherSystem);
}
/*!
* \brief operator ==
* \param otherSystem
@@ -139,42 +148,43 @@ public:
*/
bool operator !=(const CAdfSystem &otherSystem) const
{
return CModulator::operator !=(otherSystem);
return this->CModulator::operator !=(otherSystem);
}
/*!
* Try to get a ADF unit with given name and frequency. Returns true in case an object
* has been sucessfully created, otherwise returns a default object and false.
* \param adfSystem
* \param[out] o_adfSystem
* \param name
* \param activeFrequencyKHz
* \param standbyFrequencyKHz
* \return
*/
static bool tryGetAdfSystem(CAdfSystem &adfSystem, const QString &name, double activeFrequencyKHz, double standbyFrequencyKHz = -1)
static bool tryGetAdfSystem(CAdfSystem &o_adfSystem, const QString &name, double activeFrequencyKHz, double standbyFrequencyKHz = -1)
{
adfSystem = CAdfSystem(false, name, PhysicalQuantities::CFrequency(activeFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyKHz < 0 ? activeFrequencyKHz : standbyFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()));
o_adfSystem = CAdfSystem(false, name, PhysicalQuantities::CFrequency(activeFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyKHz < 0 ? activeFrequencyKHz : standbyFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()));
bool s;
if (!(s = adfSystem.validate(false))) adfSystem = CAdfSystem(); // reset to default
if (!(s = o_adfSystem.validate(false))) o_adfSystem = CAdfSystem(); // reset to default
return s;
}
/*!
* Try to get a ADF unit with given name and frequency. Returns true in case an object
* has been sucessfully created, otherwise returns a default object.
* \param adfSystem
* \param[out] o_adfSystem
* \param name
* \param activeFrequency
* \param standbyFrequency
* \return
*/
static bool tryGetAdfSystem(CAdfSystem &adfSystem, const QString &name, PhysicalQuantities::CFrequency activeFrequency, PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
static bool tryGetAdfSystem(CAdfSystem &o_adfSystem, const QString &name, PhysicalQuantities::CFrequency activeFrequency, PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
adfSystem = CAdfSystem(false, name, activeFrequency, standbyFrequency);
o_adfSystem = CAdfSystem(false, name, activeFrequency, standbyFrequency);
bool s;
if (!(s = adfSystem.validate(false))) adfSystem = CAdfSystem(); // reset to default
if (!(s = o_adfSystem.validate(false))) o_adfSystem = CAdfSystem(); // reset to default
return s;
}
/*!
* \brief ADF1 unit
* \param activeFrequencyKHz
@@ -185,6 +195,7 @@ public:
{
return CAdfSystem(CModulator::NameCom1(), PhysicalQuantities::CFrequency(activeFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyKHz < 0 ? activeFrequencyKHz : standbyFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()));
}
/*!
* \brief ADF1 unit
* \param activeFrequency
@@ -195,28 +206,31 @@ public:
{
return CAdfSystem(CModulator::NameCom1(), activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency);
}
/*!
* \brief Try to get ADF unit
* \param adfSystem
* \param[out] o_adfSystem
* \param activeFrequencyKHz
* \param standbyFrequencyKHz
* \return
*/
static bool tryGetAdf1Unit(CAdfSystem &adfSystem, double activeFrequencyKHz, double standbyFrequencyKHz = -1)
static bool tryGetAdf1Unit(CAdfSystem &o_adfSystem, double activeFrequencyKHz, double standbyFrequencyKHz = -1)
{
return CAdfSystem::tryGetAdfSystem(adfSystem, CModulator::NameCom1(), activeFrequencyKHz, standbyFrequencyKHz);
return CAdfSystem::tryGetAdfSystem(o_adfSystem, CModulator::NameCom1(), activeFrequencyKHz, standbyFrequencyKHz);
}
/*!
* \brief Try to get ADF unit
* \param adfSystem
* \param[out] o_adfSystem
* \param activeFrequency
* \param standbyFrequency
* \return
*/
static bool tryGetAdf1Unit(CAdfSystem &adfSystem, PhysicalQuantities::CFrequency activeFrequency, PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
static bool tryGetAdf1Unit(CAdfSystem &o_adfSystem, PhysicalQuantities::CFrequency activeFrequency, PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CAdfSystem::tryGetAdfSystem(adfSystem, CModulator::NameCom1(), activeFrequency, standbyFrequency);
return CAdfSystem::tryGetAdfSystem(o_adfSystem, CModulator::NameCom1(), activeFrequency, standbyFrequency);
}
/*!
* \brief ADF2 unit
* \param activeFrequencyKHz
@@ -227,6 +241,7 @@ public:
{
return CAdfSystem(CModulator::NameCom2(), PhysicalQuantities::CFrequency(activeFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyKHz < 0 ? activeFrequencyKHz : standbyFrequencyKHz, PhysicalQuantities::CFrequencyUnit::MHz()));
}
/*!
* \brief ADF2 unit
* \param activeFrequency
@@ -237,32 +252,35 @@ public:
{
return CAdfSystem(CModulator::NameCom2(), activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency);
}
/*!
* \brief Try to get ADF unit
* \param adfSystem
* \param[out] o_adfSystem
* \param activeFrequencyKHz
* \param standbyFrequencyKHz
* \return
*/
static bool tryGetAdf2System(CAdfSystem &adfSystem, double activeFrequencyKHz, double standbyFrequencyKHz = -1)
static bool tryGetAdf2System(CAdfSystem &o_adfSystem, double activeFrequencyKHz, double standbyFrequencyKHz = -1)
{
return CAdfSystem::tryGetAdfSystem(adfSystem, CModulator::NameCom2(), activeFrequencyKHz, standbyFrequencyKHz);
return CAdfSystem::tryGetAdfSystem(o_adfSystem, CModulator::NameCom2(), activeFrequencyKHz, standbyFrequencyKHz);
}
/*!
* \brief Try to get ADF unit
* \param adfSystem
* \param[out] o_adfSystem
* \param activeFrequency
* \param standbyFrequency
* \return
*/
static bool tryGetAdf2System(CAdfSystem &adfSystem, PhysicalQuantities::CFrequency activeFrequency, PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
static bool tryGetAdf2System(CAdfSystem &o_adfSystem, PhysicalQuantities::CFrequency activeFrequency, PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CAdfSystem::tryGetAdfSystem(adfSystem, CModulator::NameCom2(), activeFrequency, standbyFrequency);
return CAdfSystem::tryGetAdfSystem(o_adfSystem, CModulator::NameCom2(), activeFrequency, standbyFrequency);
}
};
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAdfSystem)
#endif // BLACKMISC_AVIOADFSYSTEM_H