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

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

View File

@@ -24,7 +24,8 @@ private:
* \param f
* \return
*/
bool isValidCivilAviationFrequency(BlackMisc::PhysicalQuantities::CFrequency f) const {
bool isValidCivilAviationFrequency(BlackMisc::PhysicalQuantities::CFrequency f) const
{
double fr = f.valueRounded(BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz(), this->m_digits);
return fr >= 118.0 && fr <= 136.975;
}
@@ -34,7 +35,8 @@ private:
* \param f
* \return
*/
bool isValidMilitaryFrequency(BlackMisc::PhysicalQuantities::CFrequency f) const {
bool isValidMilitaryFrequency(BlackMisc::PhysicalQuantities::CFrequency f) const
{
double fr = f.valueRounded(BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz(), this->m_digits);
return fr >= 220.0 && fr <= 399.95;
}
@@ -49,7 +51,8 @@ private:
*
*/
CComSystem(bool validate, const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency, int digits = 3):
CModulator(name, activeFrequency, standbyFrequency, digits) {
CModulator(name, activeFrequency, standbyFrequency, digits)
{
this->validate(validate);
}
@@ -58,7 +61,8 @@ protected:
* \brief Are the set values valid / in range?
* \return
*/
bool validValues() const {
bool validValues() const
{
if (this->isDefaultValue()) return true; // special case
return
(this->isValidCivilAviationFrequency(this->getFrequencyActive()) ||
@@ -71,10 +75,11 @@ protected:
* \brief Validate values by assert and exception
* \param strict
* \throws std::range_error
* \remarks Cannot be virtualsince already used in constructor
* \remarks Cannot be virtual because used in constructor
* \return
*/
bool validate(bool strict = true) const {
bool validate(bool strict = true) const
{
if (this->isDefaultValue()) return true;
bool valid = this->validValues();
if (!strict) return valid;
@@ -91,9 +96,9 @@ public:
/*!
* \brief Copy constructor
* \param otherSystem
* \param other
*/
CComSystem(const CComSystem &otherSystem) : CModulator(otherSystem) {}
CComSystem(const CComSystem &other) : CModulator(other) {}
/*!
* \brief Constructor
@@ -103,7 +108,8 @@ public:
* \param digits
*/
CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet(), int digits = 3):
CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency, digits) {
CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency, digits)
{
this->validate(true);
}
@@ -111,8 +117,9 @@ public:
* \brief Set active frequency
* \param frequencyMHz
*/
void setFrequencyActiveMHz(double frequencyMHz) {
CModulator::setFrequencyActiveMHz(frequencyMHz);
void setFrequencyActiveMHz(double frequencyMHz)
{
this->CModulator::setFrequencyActiveMHz(frequencyMHz);
this->validate(true);
}
@@ -120,15 +127,17 @@ public:
* \brief Set standby frequency
* \param frequencyMHz
*/
void setFrequencyStandbyMHz(double frequencyMHz) {
CModulator::setFrequencyStandbyMHz(frequencyMHz);
void setFrequencyStandbyMHz(double frequencyMHz)
{
this->CModulator::setFrequencyStandbyMHz(frequencyMHz);
this->validate(true);
}
/*!
* \brief Set UNICOM frequency as active
*/
void setActiveUnicom() {
void setActiveUnicom()
{
this->toggleActiveStandby();
this->setFrequencyActive(BlackMisc::PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyUnicom());
}
@@ -136,67 +145,74 @@ public:
/*!
* \brief Set International Air Distress 121.5MHz
*/
void setActiveInternationalAirDistress() {
void setActiveInternationalAirDistress()
{
this->toggleActiveStandby();
this->setFrequencyActive(BlackMisc::PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress());
}
/*!
* \brief Assigment operator =
* \param otherSystem
* \param other
* \return
*/
CComSystem& operator =(const CComSystem &otherSystem) {
CModulator::operator =(otherSystem);
return (*this);
CComSystem& operator =(const CComSystem &other)
{
this->CModulator::operator =(other);
return *this;
}
/*!
* \brief operator ==
* \param otherSystem
* \param other
* \return
*/
bool operator ==(const CComSystem &otherSystem) const {
return CModulator::operator ==(otherSystem);
bool operator ==(const CComSystem &other) const
{
return this->CModulator::operator ==(other);
}
/*!
* \brief operator ==
* \param otherSystem
* \brief operator !=
* \param other
* \return
*/
bool operator !=(const CComSystem &otherSystem) const {
return CModulator::operator !=(otherSystem);
bool operator !=(const CComSystem &other) const
{
return this->CModulator::operator !=(other);
}
/*!
* Try to get a COM unit with given name and frequency. Returns true in case an object
* has been sucessfully created, otherwise returns a default object.
* \param comSystem
* \param[out] o_comSystem
* \param name
* \param activeFrequencyMHz
* \param standbyFrequencyMHz
* \return
*/
static bool tryGetComSystem(CComSystem &comSystem, const QString &name, double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
comSystem = CComSystem(false, name, BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
static bool tryGetComSystem(CComSystem &o_comSystem, const QString &name, double activeFrequencyMHz, double standbyFrequencyMHz = -1)
{
o_comSystem = CComSystem(false, name, BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
bool s;
if (!(s = comSystem.validate(false))) comSystem = CComSystem(); // reset to default
if (!(s = o_comSystem.validate(false))) o_comSystem = CComSystem(); // reset to default
return s;
}
/*!
* Try to get a COM unit with given name and frequency. Returns true in case an object
* has been sucessfully created, otherwise returns a default object.
* \param comSystem
* \param[out] o_comSystem
* \param name
* \param activeFrequency
* \param standbyFrequency
* \return
*/
static bool tryGetComSystem(CComSystem &comSystem, const QString &name, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
comSystem = CComSystem(false, name, activeFrequency, standbyFrequency);
static bool tryGetComSystem(CComSystem &o_comSystem, const QString &name, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
o_comSystem = CComSystem(false, name, activeFrequency, standbyFrequency);
bool s;
if (!(s = comSystem.validate(false))) comSystem = CComSystem(); // reset to default
if (!(s = o_comSystem.validate(false))) o_comSystem = CComSystem(); // reset to default
return s;
}
@@ -206,7 +222,8 @@ public:
* \param standbyFrequencyMHz
* \return
*/
static CComSystem getCom1System(double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
static CComSystem getCom1System(double activeFrequencyMHz, double standbyFrequencyMHz = -1)
{
return CComSystem(CModulator::NameCom1(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
}
@@ -216,28 +233,33 @@ public:
* \param standbyFrequency
* \return
*/
static CComSystem getCom1System(BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
return CComSystem(CModulator::NameCom1(), activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency);
static CComSystem getCom1System(BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CComSystem(CModulator::NameCom1(), activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency);
}
/*!
* \brief Try to get COM unit
* \param comSystem
* \param[out] o_comSystem
* \param activeFrequencyMHz
* \param standbyFrequencyMHz
* \return
*/
static bool tryGetCom1Unit(CComSystem &comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom1(), activeFrequencyMHz, standbyFrequencyMHz);
static bool tryGetCom1Unit(CComSystem &o_comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1)
{
return CComSystem::tryGetComSystem(o_comSystem, CModulator::NameCom1(), activeFrequencyMHz, standbyFrequencyMHz);
}
/*!
* \brief Try to get COM unit
* \param comSystem
* \param[out] o_comSystem
* \param activeFrequency
* \param standbyFrequency
* \return
*/
static bool tryGetCom1Unit(CComSystem &comSystem, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom1(), activeFrequency, standbyFrequency);
static bool tryGetCom1Unit(CComSystem &o_comSystem, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CComSystem::tryGetComSystem(o_comSystem, CModulator::NameCom1(), activeFrequency, standbyFrequency);
}
/*!
@@ -246,7 +268,8 @@ public:
* \param standbyFrequencyMHz
* \return
*/
static CComSystem getCom2System(double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
static CComSystem getCom2System(double activeFrequencyMHz, double standbyFrequencyMHz = -1)
{
return CComSystem(CModulator::NameCom2(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
}
@@ -256,30 +279,33 @@ public:
* \param standbyFrequency
* \return
*/
static CComSystem getCom2System(BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
static CComSystem getCom2System(BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CComSystem(CModulator::NameCom2(), activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency);
}
/*!
* \brief Try to get COM unit
* \param comSystem
* \param[out] o_comSystem
* \param activeFrequencyMHz
* \param standbyFrequencyMHz
* \return
*/
static bool tryGetCom2System(CComSystem &comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom2(), activeFrequencyMHz, standbyFrequencyMHz);
static bool tryGetCom2System(CComSystem &o_comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1)
{
return CComSystem::tryGetComSystem(o_comSystem, CModulator::NameCom2(), activeFrequencyMHz, standbyFrequencyMHz);
}
/*!
* \brief Try to get COM unit
* \param comSystem
* \param[out] o_comSystem
* \param activeFrequency
* \param standbyFrequency
* \return
*/
static bool tryGetCom2System(CComSystem &comSystem, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom2(), activeFrequency, standbyFrequency);
static bool tryGetCom2System(CComSystem &o_comSystem, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CComSystem::tryGetComSystem(o_comSystem, CModulator::NameCom2(), activeFrequency, standbyFrequency);
}
/*!
@@ -288,7 +314,8 @@ public:
* \param standbyFrequencyMHz
* \return
*/
static CComSystem getCom3System(double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
static CComSystem getCom3System(double activeFrequencyMHz, double standbyFrequencyMHz = -1)
{
return CComSystem(CModulator::NameCom3(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
}
@@ -298,38 +325,39 @@ public:
* \param standbyFrequency
* \return
*/
static CComSystem getCom3System(BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
static CComSystem getCom3System(BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CComSystem(CModulator::NameCom3(), activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency);
}
/*!
* \brief Try to get COM unit
* \param comSystem
* \param[out] o_comSystem
* \param activeFrequencyMHz
* \param standbyFrequencyMHz
* \return
*/
static bool tryGetCom3System(CComSystem &comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1) {
return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom3(), activeFrequencyMHz, standbyFrequencyMHz);
static bool tryGetCom3System(CComSystem &o_comSystem, double activeFrequencyMHz, double standbyFrequencyMHz = -1)
{
return CComSystem::tryGetComSystem(o_comSystem, CModulator::NameCom3(), activeFrequencyMHz, standbyFrequencyMHz);
}
/*!
* \brief Try to get COM unit
* \param comSystem
* \param[out] o_comSystem
* \param activeFrequency
* \param standbyFrequency
* \return
*/
static bool tryGetCom3System(CComSystem &comSystem, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet()) {
return CComSystem::tryGetComSystem(comSystem, CModulator::NameCom3(), activeFrequency, standbyFrequency);
static bool tryGetCom3System(CComSystem &o_comSystem, BlackMisc::PhysicalQuantities::CFrequency activeFrequency, BlackMisc::PhysicalQuantities::CFrequency standbyFrequency = CModulator::FrequencyNotSet())
{
return CComSystem::tryGetComSystem(o_comSystem, CModulator::NameCom3(), activeFrequency, standbyFrequency);
}
};
} // namespace
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem)
#endif // include guard