Avionics classes for Transponder, ADF, changed namespace to 2ndlevel

src/blackmisc/aviomodulator.h

@@ -1,8 +1,19 @@
+/*  Copyright (C) 2013 VATSIM Community
+ *  This Source Code Form is subject to the terms of the Mozilla Public
+ *  License, v. 2.0. If a copy of the MPL was not distributed with this
+ *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #ifndef AVIOMODULATORUNIT_H
 #define AVIOMODULATORUNIT_H
 #include "blackmisc/aviobase.h"
 
-namespace BlackMisc {
+using BlackMisc::PhysicalQuantities::CFrequency;
+using BlackMisc::PhysicalQuantities::CFrequencyUnit;
+
+namespace BlackMisc
+{
+namespace Aviation
+{
 
 /*!
  * \brief Base class for COM, NAV, Squawk units.
@@ -12,7 +23,6 @@ template <class AVIO> class CModulator : public CAvionicsBase
 private:
     CFrequency m_frequencyActive; //!< active frequency
     CFrequency m_frequencyStandby; //!< standby frequency
-    QString m_name; //!< name of the unit
 
 protected:
     int m_digits; //!< digits used
@@ -20,14 +30,14 @@ protected:
     /*!
      * \brief Default constructor
      */
-    CModulator() {}
+    CModulator() : CAvionicsBase("default") {}
     /*!
      * \brief Copy constructor
      * \param otherUnit
      */
     CModulator(const CModulator &otherUnit) :
         m_frequencyActive(otherUnit.m_frequencyActive), m_frequencyStandby(otherUnit.m_frequencyStandby),
-        m_name(otherUnit.m_name), m_digits(otherUnit.m_digits) {}
+        m_digits(otherUnit.m_digits), CAvionicsBase(otherUnit.getName()) {}
     /*!
      * \brief Constructor
      * \param name
@@ -35,8 +45,8 @@ protected:
      * \param standbyFrequency
      */
     CModulator(const QString &name, const CFrequency &activeFrequency, const CFrequency &standbyFrequency, int digits) :
-        m_name(name), m_frequencyActive(activeFrequency),
-        m_digits(digits), m_frequencyStandby(standbyFrequency) {}
+        m_frequencyActive(activeFrequency),
+        m_digits(digits), m_frequencyStandby(standbyFrequency), CAvionicsBase(name) { }
     /*!
      * \brief Meaningful string representation
      * \return
@@ -46,22 +56,30 @@ protected:
      * \brief Set active frequency
      * \param frequencyKHz
      */
-    void setFrequencyActiveKHz(double frequencyKHz) { this->m_frequencyActive = CFrequency(frequencyKHz, CFrequencyUnit::kHz()); }
+    void setFrequencyActiveKHz(double frequencyKHz) {
+        this->m_frequencyActive = CFrequency(frequencyKHz, CFrequencyUnit::kHz());
+    }
     /*!
      * \brief Set standby frequency
      * \param frequencyKHz
      */
-    void setFrequencyStandbyKHz(double frequencyKHz) { this->m_frequencyStandby = CFrequency(frequencyKHz, CFrequencyUnit::kHz()); }
+    void setFrequencyStandbyKHz(double frequencyKHz) {
+        this->m_frequencyStandby = CFrequency(frequencyKHz, CFrequencyUnit::kHz());
+    }
     /*!
      * \brief Set active frequency
      * \param frequencyMHz
      */
-    void setFrequencyActiveMHz(double frequencyMHz) { this->m_frequencyActive = CFrequency(frequencyMHz, CFrequencyUnit::MHz()); }
+    void setFrequencyActiveMHz(double frequencyMHz) {
+        this->m_frequencyActive = CFrequency(frequencyMHz, CFrequencyUnit::MHz());
+    }
     /*!
      * \brief Set standby frequency
      * \param frequencyMHz
      */
-    void setFrequencyStandbyMHz(double frequencyMHz) { this->m_frequencyStandby = CFrequency(frequencyMHz, CFrequencyUnit::MHz()); }
+    void setFrequencyStandbyMHz(double frequencyMHz) {
+        this->m_frequencyStandby = CFrequency(frequencyMHz, CFrequencyUnit::MHz());
+    }
     /*!
      * \brief Assigment operator =
      * \param otherModulator
@@ -84,84 +102,122 @@ protected:
      * \brief COM1
      * \return
      */
-    static const QString& NameCom1() { static QString n("COM1"); return n; }
+    static const QString& NameCom1() {
+        static QString n("COM1");
+        return n;
+    }
     /*!
      * \brief COM2
      * \return
      */
-    static const QString& NameCom2() { static QString n("COM2"); return n; }
+    static const QString& NameCom2() {
+        static QString n("COM2");
+        return n;
+    }
     /*!
      * \brief COM3
      * \return
      */
-    static const QString& NameCom3() { static QString n("COM3"); return n; }
+    static const QString& NameCom3() {
+        static QString n("COM3");
+        return n;
+    }
     /*!
      * \brief NAV1
      * \return
      */
-    static const QString& NameNav1() { static QString n("NAV1"); return n; }
+    static const QString& NameNav1() {
+        static QString n("NAV1");
+        return n;
+    }
     /*!
      * \brief NAV2
      * \return
      */
-    static const QString& NameNav2() { static QString n("NAV2"); return n; }
+    static const QString& NameNav2() {
+        static QString n("NAV2");
+        return n;
+    }
     /*!
      * \brief NAV2
      * \return
      */
-    static const QString& NameNav3() { static QString n("NAV2"); return n; }
+    static const QString& NameNav3() {
+        static QString n("NAV2");
+        return n;
+    }
     /*!
      * \brief ADF1
      * \return
      */
-    static const QString& NameAdf1() { static QString n("ADF1"); return n; }
+    static const QString& NameAdf1() {
+        static QString n("ADF1");
+        return n;
+    }
     /*!
      * \brief ADF2
      * \return
      */
-    static const QString& NameAdf2() { static QString n("ADF2"); return n; }
+    static const QString& NameAdf2() {
+        static QString n("ADF2");
+        return n;
+    }
     /*!
      * \brief Frequency not set
      * \return
      */
-    static const CFrequency& FrequencyNotSet() { static CFrequency f; return f; }
+    static const CFrequency& FrequencyNotSet() {
+        static CFrequency f;
+        return f;
+    }
 
 public:
     /*!
      * \brief Virtual destructor
      */
     virtual ~CModulator() {}
+    /*!
+     * \brief Default value
+     * \return
+     */
+    virtual bool isDefaultValue() const {
+        return this->m_frequencyActive == CModulator::FrequencyNotSet();
+    }
     /*!
      * \brief Toggle active and standby frequencies
      */
     void toggleActiveStandby();
-    /*!
-     * \brief Name
-     * \return
-     */
-    QString getName() const { return this->m_name; }
     /*!
      * \brief Active frequency
      * \return
      */
-    CFrequency getFrequencyActive() const { return this->m_frequencyActive; }
+    CFrequency getFrequencyActive() const {
+        return this->m_frequencyActive;
+    }
     /*!
      * \brief Standby frequency
      * \return
      */
-    CFrequency getFrequencyStandby() const { return this->m_frequencyActive; }
+    CFrequency getFrequencyStandby() const {
+        return this->m_frequencyActive;
+    }
     /*!
      * \brief Set active frequency
      * \param frequency
      */
-    void setFrequencyActive(const CFrequency &frequency) { this->m_frequencyActive = frequency; }
+    void setFrequencyActive(const CFrequency &frequency) {
+        this->m_frequencyActive = frequency;
+    }
     /*!
      * \brief Set standby frequency
      * \param frequency
      */
-    void setFrequencyStandby(const CFrequency &frequency) { this->m_frequencyStandby = frequency; }
+    void setFrequencyStandby(const CFrequency &frequency) {
+        this->m_frequencyStandby = frequency;
+    }
 };
 
+} // namespace
 } // namespace
 
 #endif // AVIOMODULATORUNIT_H