refs #314, modulator based classes to latest style

* removed exceptions
* removed tryGet methods
* adjusted samples
This commit is contained in:
Klaus Basan
2014-08-19 16:31:21 +02:00
parent 3fb5087ea8
commit 00a89fbbd7
5 changed files with 23 additions and 44 deletions

View File

@@ -30,9 +30,6 @@ namespace BlackMisc
CModulator(name, activeFrequency, standbyFrequency, digits)
{ }
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! Set active frequency
void setFrequencyActiveMHz(double frequencyMHz)
{
@@ -58,16 +55,16 @@ namespace BlackMisc
}
//! Valid civil aviation frequency?
bool isValidCivilNavigationFrequency(BlackMisc::PhysicalQuantities::CFrequency f) const
static bool isValidCivilNavigationFrequency(BlackMisc::PhysicalQuantities::CFrequency f)
{
double fr = f.valueRounded(BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz(), this->m_digits);
double fr = f.valueRounded(BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz(), 3);
return fr >= 108.0 && fr <= 117.95;
}
//! Valid military aviation frequency?
bool isValidMilitaryNavigationFrequency(BlackMisc::PhysicalQuantities::CFrequency f) const
static bool isValidMilitaryNavigationFrequency(BlackMisc::PhysicalQuantities::CFrequency f)
{
double fr = f.valueRounded(BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz(), this->m_digits);
double fr = f.valueRounded(BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz(), 3);
return fr >= 960.0 && fr <= 1215.0; // valid TACAN frequency
}
@@ -107,6 +104,13 @@ namespace BlackMisc
this->isValidMilitaryNavigationFrequency(this->getFrequencyStandby()));
return v;
}
private:
//! Easy access to derived class (CRTP template parameter)
CNavSystem const *derived() const { return static_cast<CNavSystem const *>(this); }
//! Easy access to derived class (CRTP template parameter)
CNavSystem *derived() { return static_cast<CNavSystem *>(this); }
};
} // namespace