flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T301, some transponder code style fixes

Browse Source
This commit is contained in:
Klaus Basan
2018-08-12 02:56:31 +02:00
parent 2461cfb0ba
commit 38e2a3ee3d
3 changed files with 59 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/blackgui/components/transpondermodeselector.cpp
View File

@@ -20,27 +20,27 @@ namespace BlackGui
CTransponderModeSelector::CTransponderModeSelector(QWidget *parent) : QComboBox(parent)
{
QComboBox::insertItems(0, CTransponderModeSelector::modes());
this->m_resetTimer.setObjectName(this->objectName().append(":m_resetTimer"));
connect(&this->m_resetTimer, &QTimer::timeout, this, &CTransponderModeSelector::resetTransponderMode);
m_resetTimer.setObjectName(this->objectName().append(":m_resetTimer"));
connect(&m_resetTimer, &QTimer::timeout, this, &CTransponderModeSelector::resetTransponderMode);
connect(this, &CTransponderModeSelector::currentTextChanged, this, &CTransponderModeSelector::setSelectedTransponderModeAsString);
this->m_resetTimer.setInterval(5000);
m_resetTimer.setInterval(5000);
}
const QString &CTransponderModeSelector::transponderStateStandby()
{
static const QString s(BlackMisc::Aviation::CTransponder::modeAsString(BlackMisc::Aviation::CTransponder::StateStandby));
static const QString s(CTransponder::modeAsString(CTransponder::StateStandby));
return s;
}
const QString &CTransponderModeSelector::transponderStateIdent()
{
static const QString s(BlackMisc::Aviation::CTransponder::modeAsString(BlackMisc::Aviation::CTransponder::StateIdent));
static const QString s(CTransponder::modeAsString(CTransponder::StateIdent));
return s;
}
const QString &CTransponderModeSelector::transponderModeC()
{
static const QString s(BlackMisc::Aviation::CTransponder::modeAsString(BlackMisc::Aviation::CTransponder::ModeC));
static const QString s(CTransponder::modeAsString(CTransponder::ModeC));
return s;
}
@@ -57,31 +57,31 @@ namespace BlackGui
BlackMisc::Aviation::CTransponder::TransponderMode CTransponderModeSelector::getSelectedTransponderMode() const
{
return this->m_currentMode;
return m_currentMode;
}
bool CTransponderModeSelector::isIdentSelected() const
{
return this->getSelectedTransponderMode() == BlackMisc::Aviation::CTransponder::StateIdent;
return this->getSelectedTransponderMode() == CTransponder::StateIdent;
}
void CTransponderModeSelector::setSelectedTransponderMode(CTransponder::TransponderMode mode)
{
if (mode != CTransponder::StateIdent) { this->m_resetMode = mode; }
if (this->m_currentMode == mode) { return; }
if (this->m_currentMode == CTransponder::StateIdent) { emit this->transponderStateIdentEnded(); }
this->m_currentMode = mode;
if (mode != CTransponder::StateIdent) { m_resetMode = mode; }
if (m_currentMode == mode) { return; }
if (m_currentMode == CTransponder::StateIdent) { emit this->transponderStateIdentEnded(); }
m_currentMode = mode;
const QString m = CTransponder::modeAsString(mode);
QComboBox::setCurrentText(m);
if (mode == CTransponder::StateIdent)
{
this->m_resetTimer.start();
m_resetTimer.start();
}
else
{
this->m_resetTimer.stop();
m_resetTimer.stop();
}
emit this->transponderModeChanged(this->m_currentMode);
emit this->transponderModeChanged(m_currentMode);
}
void CTransponderModeSelector::setSelectedTransponderModeStateIdent()
@@ -92,14 +92,14 @@ namespace BlackGui
void CTransponderModeSelector::setSelectedTransponderModeAsString(const QString &mode)
{
CTransponder::TransponderMode m = CTransponder::modeFromString(mode);
if (this->m_currentMode == m) return; // nothing to change
if (m_currentMode == m) return; // nothing to change
this->setSelectedTransponderMode(m);
}
void CTransponderModeSelector::resetTransponderMode()
{
if (!this->isIdentSelected()) return; // avoid unnecessary events
this->setSelectedTransponderMode(this->m_resetMode);
this->setSelectedTransponderMode(m_resetMode);
}
} // ns
} // ns

100
src/blackmisc/aviation/transponder.cpp
View File

@@ -39,27 +39,27 @@ namespace BlackMisc
m_transponderCode(0), m_transponderMode(transponderMode)
{
bool ok = false;
this->m_transponderCode = transponderCode.toInt(&ok);
if (!ok) this->m_transponderCode = -1; // will cause assert / exception
m_transponderCode = transponderCode.toInt(&ok);
if (!ok) m_transponderCode = -1; // will cause assert / exception
}
CTransponder::CTransponder(const QString &transponderCode, const QString &transponderMode) :
m_transponderCode(0), m_transponderMode(StateStandby)
{
bool ok = false;
this->m_transponderCode = transponderCode.toInt(&ok);
if (!ok) this->m_transponderCode = -1; // will cause assert / exception
m_transponderCode = transponderCode.toInt(&ok);
if (!ok) m_transponderCode = -1; // will cause assert / exception
this->setModeAsString(transponderMode);
}
bool CTransponder::validValues() const
{
return CTransponder::isValidTransponderCode(this->m_transponderCode);
return CTransponder::isValidTransponderCode(m_transponderCode);
}
bool CTransponder::isInNormalSendingMode() const
{
switch (this->m_transponderMode)
switch (m_transponderMode)
{
case ModeA:
case ModeC:
@@ -99,7 +99,7 @@ namespace BlackMisc
QString CTransponder::getTransponderCodeFormatted() const
{
QString f("0000");
f = f.append(QString::number(this->m_transponderCode));
f = f.append(QString::number(m_transponderCode));
return f.right(4);
}
@@ -127,7 +127,7 @@ namespace BlackMisc
{
if (transponderCode.isEmpty() || transponderCode.length() > 4) return false;
bool number;
qint32 tc = transponderCode.toInt(&number);
int tc = transponderCode.toInt(&number);
if (!number) return false;
if (tc < 0 || tc > 7777) return false;
thread_local const QRegularExpression rx("^[0-7]{1,4}$");
@@ -147,79 +147,59 @@ namespace BlackMisc
const QString &CTransponder::modeAsString(CTransponder::TransponderMode mode)
{
static QString m;
static const QString i("Ident");
static const QString s("Standby");
static const QString mc("Mode C");
static const QString ms("Mode S");
static const QString m1("Mil.Mode 1");
static const QString m2("Mil.Mode 2");
static const QString m3("Mil.Mode 3");
static const QString m4("Mil.Mode 4");
static const QString m5("Mil.Mode 5");
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");
case StateIdent: return i;
case StateStandby: return s;
case ModeC: return mc;
case ModeS: return ms;
case ModeMil1: return m1;
case ModeMil2: return m2;
case ModeMil3: return m3;
case ModeMil4: return m4;
case ModeMil5: return m5;
default: qFatal("Illegal Transponder Mode");
}
return m;
return i;
}
CVariant CTransponder::propertyByIndex(const CPropertyIndex &index) const
{
if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexMode:
return CVariant::from(this->getTransponderMode());
case IndexModeAsString:
return CVariant::from(this->getModeAsString());
case IndexTransponderCode:
return CVariant::from(this->getTransponderCode());
case IndexTransponderCodeFormatted:
return CVariant::from(this->getTransponderCodeFormatted());
case IndexTransponderCodeAndModeFormatted:
return CVariant::from(this->getTransponderCodeAndModeFormatted());
default:
break;
case IndexMode: return CVariant::from(this->getTransponderMode());
case IndexModeAsString: return CVariant::from(this->getModeAsString());
case IndexTransponderCode: return CVariant::from(this->getTransponderCode());
case IndexTransponderCodeFormatted: return CVariant::from(this->getTransponderCodeFormatted());
case IndexTransponderCodeAndModeFormatted: return CVariant::from(this->getTransponderCodeAndModeFormatted());
default: break;
}
Q_ASSERT_X(false, "CTransponder", "index unknown");
QString m = QString("no property, index ").append(index.toQString());
const QString m = QString("no property, index ").append(index.toQString());
return CVariant::fromValue(m);
}
void CTransponder::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
{
if (index.isMyself()) { (*this) = variant.to<CTransponder>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexMode:
this->setTransponderMode(variant.value<TransponderMode>());
break;
case IndexModeAsString:
this->setTransponderMode(modeFromString(variant.toQString()));
break;
case IndexMode: m_transponderMode = variant.toInt(); break;
case IndexModeAsString: this->setTransponderMode(modeFromString(variant.toQString())); break;
case IndexTransponderCode:
case IndexTransponderCodeFormatted:
if (variant.canConvert<int>())

4
src/blackmisc/aviation/transponder.h
View File

@@ -148,8 +148,8 @@ namespace BlackMisc
//! Default value?
bool isDefaultValue() const { return m_transponderCode == 0; }
int m_transponderCode; //!< Transponder code
TransponderMode m_transponderMode; //!< Transponder mode
int m_transponderCode; //!< Transponder code
int m_transponderMode; //!< Transponder mode
BLACK_METACLASS(
CTransponder,