refs #349, some convenience functions

This commit is contained in:
Klaus Basan
2014-12-02 23:30:25 +01:00
parent 78e4900243
commit 927a533040
4 changed files with 37 additions and 3 deletions

View File

@@ -63,14 +63,14 @@ namespace BlackMisc
/* /*
* Set cockpit data * Set cockpit data
*/ */
void CAircraft::setCockpit(const CComSystem &com1, const CComSystem &com2, qint32 transponderCode) void CAircraft::setCockpit(const CComSystem &com1, const CComSystem &com2, int transponderCode, CTransponder::TransponderMode transponderMode)
{ {
this->setCom1System(com1); this->setCom1System(com1);
this->setCom2System(com2); this->setCom2System(com2);
this->m_transponder.setTransponderCode(transponderCode); this->m_transponder.setTransponderCode(transponderCode);
this->m_transponder.setTransponderMode(transponderMode);
} }
/* /*
* Changed data * Changed data
*/ */

View File

@@ -174,7 +174,7 @@ namespace BlackMisc
void setCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder); void setCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder);
//! Cockpit data //! Cockpit data
void setCockpit(const CComSystem &com1, const CComSystem &com2, qint32 transponderCode); void setCockpit(const CComSystem &com1, const CComSystem &com2, int transponderCode, CTransponder::TransponderMode mode);
//! Own SELCAL code //! Own SELCAL code
void setSelcal(const BlackMisc::Aviation::CSelcal &selcal) { this->m_selcal = selcal; } void setSelcal(const BlackMisc::Aviation::CSelcal &selcal) { this->m_selcal = selcal; }
@@ -205,6 +205,12 @@ namespace BlackMisc
//! Set transponder //! Set transponder
void setTransponder(const CTransponder &transponder) { this->m_transponder = transponder; } void setTransponder(const CTransponder &transponder) { this->m_transponder = transponder; }
//! Set transponder mode
void setTransponderMode(CTransponder::TransponderMode mode) { this->m_transponder.setTransponderMode(mode); }
//! Set transponder code
void setTransponderCode(int code) { this->m_transponder.setTransponderCode(code); }
//! Get transponder code //! Get transponder code
QString getTransponderCodeFormatted() const { return this->m_transponder.getTransponderCodeFormatted(); } QString getTransponderCodeFormatted() const { return this->m_transponder.getTransponderCodeFormatted(); }

View File

@@ -26,6 +26,25 @@ namespace BlackMisc
return CTransponder::isValidTransponderCode(this->m_transponderCode); return CTransponder::isValidTransponderCode(this->m_transponderCode);
} }
bool CTransponder::isInNormalSendingMode() const
{
switch (this->m_transponderMode)
{
case ModeA:
case ModeC:
case ModeMil1:
case ModeMil2:
case ModeMil3:
case ModeMil4:
case ModeMil5:
return true;
case StateIdent:
case StateStandby:
default:
return false;
}
}
/* /*
* String representation * String representation
*/ */

View File

@@ -88,6 +88,15 @@ namespace BlackMisc
return modeAsString(this->getTransponderMode()); return modeAsString(this->getTransponderMode());
} }
//! In any sending mode such as MIL1 oder ModeS
bool isInNormalSendingMode() const;
//! Standby?
bool isInStandby() const { return StateStandby == m_transponderMode; }
//! Standby?
bool isIdentifying() const { return StateIdent == m_transponderMode; }
//! Transponder mode as string //! Transponder mode as string
void setModeAsString(const QString &mode) void setModeAsString(const QString &mode)
{ {