mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-05 17:35:34 +08:00
Ref T120, refactoring of modulator related classes
* avoid virtual functions in modulator related classes * removed unused isDefaultValue() * using null values (which was not present when class was written) * removed destructor
This commit is contained in:
committed by
Mathew Sutcliffe
parent
f936f07c8d
commit
4d9ee1626d
@@ -33,9 +33,6 @@ namespace BlackMisc
|
||||
IndexEnabled
|
||||
};
|
||||
|
||||
//! Default value?
|
||||
virtual bool isDefaultValue() const;
|
||||
|
||||
//! Toggle active and standby frequencies
|
||||
void toggleActiveStandby();
|
||||
|
||||
@@ -45,12 +42,6 @@ namespace BlackMisc
|
||||
//! Standby frequency
|
||||
BlackMisc::PhysicalQuantities::CFrequency getFrequencyStandby() const;
|
||||
|
||||
//! Set active frequency
|
||||
virtual void setFrequencyActive(const BlackMisc::PhysicalQuantities::CFrequency &frequency);
|
||||
|
||||
//! Set standby frequency
|
||||
virtual void setFrequencyStandby(const BlackMisc::PhysicalQuantities::CFrequency &frequency);
|
||||
|
||||
//! Output volume 0..100
|
||||
int getVolumeOutput() const;
|
||||
|
||||
@@ -72,9 +63,6 @@ namespace BlackMisc
|
||||
//! Enabled?
|
||||
void setEnabled(bool enable);
|
||||
|
||||
//! Are set values valid?
|
||||
virtual bool validValues() const { return true; }
|
||||
|
||||
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex
|
||||
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
|
||||
|
||||
@@ -87,9 +75,6 @@ namespace BlackMisc
|
||||
//! \copydoc BlackMisc::Mixin::String::toQString
|
||||
QString convertToQString(bool i18n = false) const;
|
||||
|
||||
//! Destructor
|
||||
virtual ~CModulator();
|
||||
|
||||
protected:
|
||||
//! Default constructor
|
||||
CModulator();
|
||||
@@ -97,18 +82,18 @@ namespace BlackMisc
|
||||
//! Constructor
|
||||
CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency);
|
||||
|
||||
//! Set active frequency
|
||||
void setFrequencyActive(const BlackMisc::PhysicalQuantities::CFrequency &frequency);
|
||||
|
||||
//! Set standby frequency
|
||||
void setFrequencyStandby(const BlackMisc::PhysicalQuantities::CFrequency &frequency);
|
||||
|
||||
//! Set active frequency
|
||||
void setFrequencyActiveKHz(double frequencyKHz);
|
||||
|
||||
//! Set standby frequency
|
||||
void setFrequencyStandbyKHz(double frequencyKHz);
|
||||
|
||||
//! Set active frequency
|
||||
virtual void setFrequencyActiveMHz(double frequencyMHz);
|
||||
|
||||
//! Set standby frequency
|
||||
virtual void setFrequencyStandbyMHz(double frequencyMHz);
|
||||
|
||||
//! COM1
|
||||
static const QString &NameCom1();
|
||||
|
||||
@@ -133,9 +118,6 @@ namespace BlackMisc
|
||||
//! ADF2
|
||||
static const QString &NameAdf2();
|
||||
|
||||
//! Frequency not set
|
||||
static const BlackMisc::PhysicalQuantities::CFrequency &FrequencyNotSet();
|
||||
|
||||
private:
|
||||
QString m_name; //!< name of the unit
|
||||
BlackMisc::PhysicalQuantities::CFrequency m_frequencyActive; //!< active frequency
|
||||
|
||||
Reference in New Issue
Block a user