refs #196, encapsulated transponder mode selection (combo box)

* promoted QComboBox in GUI
* features automatic reset for ident
* Conversion to CTransponder::TransponderMode from string
This commit is contained in:
Klaus Basan
2014-03-27 01:13:19 +01:00
parent a4e6f0e20c
commit 5bdb8659ca
8 changed files with 241 additions and 149 deletions

View File

@@ -47,89 +47,18 @@ namespace BlackMisc
/*
* Mode as readable string
*/
QString CTransponder::getModeAsString() const
CTransponder::TransponderMode CTransponder::modeFromString(const QString &modeString)
{
QString m;
switch (this->getTransponderMode())
{
case StateIdent:
m = "Ident";
break;
case StateStandby:
m = "Standby";
break;
case ModeC:
m = "Mode C";
break;
case ModeS:
m = "Mode S";
break;
case ModeMil1:
m = "Mil.Mode 1";
break;
case ModeMil2:
m = "Mil.Mode 2";
break;
case ModeMil3:
m = "Mil.Mode 3";
break;
case ModeMil4:
m = "Mil.Mode 4";
break;
case ModeMil5:
m = "Mil.Mode 5";
break;
default:
throw std::range_error("Illegal Transponder Mode");
}
return m;
}
/*
* Mode as readable string
*/
void CTransponder::setModeAsString(const QString &m)
{
if (m.startsWith("Ident", Qt::CaseInsensitive))
{
this->setTransponderMode(StateIdent);
}
else if (m.startsWith("Standby", Qt::CaseInsensitive) || m.startsWith("Stdby", Qt::CaseInsensitive))
{
this->setTransponderMode(StateStandby);
}
else if (m.startsWith("Mode C", Qt::CaseInsensitive))
{
this->setTransponderMode(ModeC);
}
else if (m.startsWith("Mode S", Qt::CaseInsensitive))
{
this->setTransponderMode(ModeS);
}
else if (m.contains("Mode 1", Qt::CaseInsensitive))
{
this->setTransponderMode(ModeMil1);
}
else if (m.contains("Mode 2", Qt::CaseInsensitive))
{
this->setTransponderMode(ModeMil2);
}
else if (m.contains("Mode 3", Qt::CaseInsensitive))
{
this->setTransponderMode(ModeMil3);
}
else if (m.contains("Mode 4", Qt::CaseInsensitive))
{
this->setTransponderMode(ModeMil4);
}
else if (m.contains("Mode 5", Qt::CaseInsensitive))
{
this->setTransponderMode(ModeMil5);
}
else
{
throw std::range_error("Illegal Transponder Mode");
}
if (modeString.startsWith("Ident", Qt::CaseInsensitive)) return StateIdent;
if (modeString.startsWith("Standby", Qt::CaseInsensitive) || modeString.startsWith("Stdby", Qt::CaseInsensitive)) return StateStandby;
if (modeString.startsWith("Mode C", Qt::CaseInsensitive)) return ModeC;
if (modeString.startsWith("Mode S", Qt::CaseInsensitive)) return ModeS;
if (modeString.contains("Mode 1", Qt::CaseInsensitive)) return ModeMil1;
if (modeString.contains("Mode 2", Qt::CaseInsensitive)) return ModeMil2;
if (modeString.contains("Mode 3", Qt::CaseInsensitive)) return ModeMil3;
if (modeString.contains("Mode 4", Qt::CaseInsensitive)) return ModeMil4;
if (modeString.contains("Mode 5", Qt::CaseInsensitive)) return ModeMil5;
return StateStandby;
}
/*
@@ -239,6 +168,47 @@ namespace BlackMisc
qDBusRegisterMetaType<CTransponder>();
}
/*
* Mode as readable string
*/
const QString &CTransponder::modeAsString(CTransponder::TransponderMode mode)
{
static QString m;
switch (mode)
{
case StateIdent:
m = "Ident";
break;
case StateStandby:
m = "Standby";
break;
case ModeC:
m = "Mode C";
break;
case ModeS:
m = "Mode S";
break;
case ModeMil1:
m = "Mil.Mode 1";
break;
case ModeMil2:
m = "Mil.Mode 2";
break;
case ModeMil3:
m = "Mil.Mode 3";
break;
case ModeMil4:
m = "Mil.Mode 4";
break;
case ModeMil5:
m = "Mil.Mode 5";
break;
default:
qFatal("Illegal Transponder Mode");
}
return m;
}
/*
* Members
*/

View File

@@ -45,7 +45,7 @@ namespace BlackMisc
* \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 since already used in constructor
* \return
*/
bool validate(bool strict = true) const;
@@ -64,7 +64,7 @@ namespace BlackMisc
public:
//! \brief Default constructor
CTransponder() : CAvionicsBase("transponder"), m_transponderCode(0), m_transponderMode(ModeS) {}
CTransponder() : CAvionicsBase("transponder"), m_transponderCode(0), m_transponderMode(StateStandby) {}
//! \brief Copy constructor
CTransponder(const CTransponder &other) : CAvionicsBase(other.getName()),
@@ -133,10 +133,16 @@ namespace BlackMisc
}
//! \brief Transponder mode as string
QString getModeAsString() const;
QString getModeAsString() const
{
return CTransponder::modeAsString(this->getTransponderMode());
}
//! \brief Transponder mode as string
void setModeAsString(const QString &mode);
void setModeAsString(const QString &mode)
{
this->setTransponderMode(CTransponder::modeFromString(mode));
}
//! \brief Transponder mode
TransponderMode getTransponderMode() const
@@ -144,6 +150,9 @@ namespace BlackMisc
return this->m_transponderMode;
}
//! \brief Transponder mode as string
static const QString &modeAsString(TransponderMode mode);
//! \brief Transponder code
qint32 getTransponderCode() const
{
@@ -166,6 +175,9 @@ namespace BlackMisc
//! \brief Set transponder code
void setTransponderCode(const QString &transponderCode);
//! \brief Mode from string
static TransponderMode modeFromString(const QString &modeString);
//! \brief Set transponder mode
void setTransponderMode(TransponderMode mode)
{