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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2018-02-14 03:48:36 +01:00
parent 8dc25fbad7
commit 78e61e25ac
6 changed files with 40 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -571,7 +571,7 @@ namespace BlackCore
QStringList args;
int id = 0;
QString key;
if (!getCmdLineClientIdAndKey(id, key)) { return args; }
if (!CNetworkVatlib::getCmdLineClientIdAndKey(id, key)) { return args; }
args << "--idAndKey";
args << sApp->getParserValue("clientIdAndKey"); // as typed in
return args;
@@ -672,7 +672,7 @@ namespace BlackCore
void CNetworkVatlib::replyToConfigQuery(const CCallsign &callsign)
{
QJsonObject config = getOwnAircraftParts().toJson();
QJsonObject config = this->getOwnAircraftParts().toJson();
config.insert("is_full_data", true);
QString data = QJsonDocument(QJsonObject { { "config", config } }).toJson(QJsonDocument::Compact);
data = convertToUnicodeEscaped(data);
@@ -754,11 +754,11 @@ namespace BlackCore
// split parser values
const QString clientIdAndKey = sApp->getParserValue("clientIdAndKey").toLower();
if (clientIdAndKey.isEmpty() || !clientIdAndKey.contains(':')) { return false; }
const auto stringList = clientIdAndKey.split(':');
const QStringList stringList = clientIdAndKey.split(':');
const QString clientIdAsString = stringList[0];
bool ok = true;
id = clientIdAsString.toInt(&ok, 0);
if (!ok) { return false; }
id = clientIdAsString.toInt(&ok, 0); // base 0 means C convention
if (!ok || id == 0) { return false; }
key = stringList[1];
return true;
}

5
src/blackmisc/aviation/aircraftengine.h
View File

@@ -31,13 +31,16 @@ namespace BlackMisc
CAircraftEngine() {}
//! Constructor
//! \remark numbers are 1 based!
CAircraftEngine(int number, bool on);
//! Get engine number
//! \remark numbers are 1 based!
int getNumber() const { return m_number; }
//! Set engine number
void setNumber (int number);
//! \remark numbers are 1 based!
void setNumber(int number);
//! Is on/off?
bool isOn() const { return m_on; }

60
src/blackmisc/simulation/ownaircraftprovider.cpp
View File

@@ -26,92 +26,92 @@ namespace BlackMisc
CSimulatedAircraft COwnAircraftAware::getOwnAircraft() const
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->getOwnAircraft();
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraft();
}
CCoordinateGeodetic COwnAircraftAware::getOwnAircraftPosition() const
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->getOwnAircraftPosition();
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftPosition();
}
CAircraftSituation COwnAircraftAware::getOwnAircraftSituation() const
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->getOwnAircraftSituation();
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftSituation();
}
CAircraftParts COwnAircraftAware::getOwnAircraftParts() const
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->getOwnAircraftParts();
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftParts();
}
CAircraftModel COwnAircraftAware::getOwnAircraftModel() const
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->getOwnAircraftModel();
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getOwnAircraftModel();
}
CLength COwnAircraftAware::getDistanceToOwnAircraft(const Geo::ICoordinateGeodetic &position) const
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->getDistanceToOwnAircraft(position);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->getDistanceToOwnAircraft(position);
}
bool COwnAircraftAware::updateCockpit(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateCockpit(aircraft, originator);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateCockpit(aircraft, originator);
}
bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const CIdentifier &originator)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateCockpit(com1, com2, transponder, originator);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateCockpit(com1, com2, transponder, originator);
}
bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, CComSystem::ComUnit comUnit, const CIdentifier &originator)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateActiveComFrequency(frequency, comUnit, originator);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateActiveComFrequency(frequency, comUnit, originator);
}
bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const CIdentifier &originator)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateSelcal(selcal, originator);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateSelcal(selcal, originator);
}
bool COwnAircraftAware::updateOwnModel(const CAircraftModel &model)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateOwnModel(model);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnModel(model);
}
bool COwnAircraftAware::updateOwnSituation(const CAircraftSituation &situation)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateOwnSituation(situation);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnSituation(situation);
}
bool COwnAircraftAware::updateOwnParts(const CAircraftParts &parts)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateOwnParts(parts);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnParts(parts);
}
bool COwnAircraftAware::updateOwnCallsign(const CCallsign &callsign)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateOwnCallsign(callsign);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnCallsign(callsign);
}
bool COwnAircraftAware::updateOwnIcaoCodes(const CAircraftIcaoCode &aircraftIcaoData, const CAirlineIcaoCode &airlineIcaoCode)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateOwnIcaoCodes(aircraftIcaoData, airlineIcaoCode);
Q_ASSERT_X(m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return m_ownAircraftProvider->updateOwnIcaoCodes(aircraftIcaoData, airlineIcaoCode);
}
} // namespace
} // namespace

2
src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp
View File

@@ -233,7 +233,7 @@ namespace BlackSimPlugin
if (objectId == simObj.getObjectId())
{
const CCallsign callsign(simObj.getCallsign());
const CAircraftLights lights = remoteAircraftLights->toLights(); // as in simulator
const CAircraftLights lights(remoteAircraftLights->toLights()); // as in simulator
simulatorFsxP3D->setCurrentLights(callsign, lights);
if (simObj.getLightsAsSent().isNull())
{

19
tests/blackmisc/testaviation.cpp
View File

@@ -50,18 +50,11 @@ using namespace BlackMisc::Geo;
namespace BlackMiscTest
{
/*
* Constructor
*/
CTestAviation::CTestAviation(QObject *parent): QObject(parent)
{
// void
}
/*
* Basic tests
*/
void CTestAviation::headingBasics()
{
CHeading h1(180, CHeading::Magnetic, CAngleUnit::deg());
@@ -84,9 +77,6 @@ namespace BlackMiscTest
QVERIFY2(h2.value() == 360, "Value shall be 360");
}
/*
* COM and NAV units
*/
void CTestAviation::comAndNav()
{
CComSystem c1 = CComSystem::getCom1System(122.8);
@@ -98,9 +88,6 @@ namespace BlackMiscTest
QVERIFY2(!CNavSystem::isValidCivilNavigationFrequency(CFrequency(200.0, CFrequencyUnit::MHz())), "Expect invalid nav frequency");
}
/*
* COM and NAV units
*/
void CTestAviation::transponder()
{
CTransponder t1 = CTransponder::getStandardTransponder(7000, CTransponder::StateStandby);
@@ -120,9 +107,6 @@ namespace BlackMiscTest
QVERIFY2(!tv.validValues(), "No valid transponder");
}
/*
* Callsign
*/
void CTestAviation::callsignWithContainers()
{
CCallsign cs1("EDDm_twr");
@@ -150,9 +134,6 @@ namespace BlackMiscTest
QVERIFY2(set.size() == 0, "Last should be gone");
}
/*
* Copy and compare
*/
void CTestAviation::copyAndEqual()
{
CFrequency f1(123.45, CFrequencyUnit::MHz());

2
tests/blackmisc/testweather.h
View File

@@ -21,7 +21,6 @@
namespace BlackMiscTest
{
//! Aviation classes basic tests
class CTestWeather : public QObject
{
@@ -47,7 +46,6 @@ namespace BlackMiscTest
//! Testing METAR decoder
void metarDecoder();
};
} // namespace
//! \endcond