flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 20:25:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting, renaming

Browse Source
This commit is contained in:
Klaus Basan
2018-04-18 04:57:33 +02:00
committed by Roland Winklmeier
parent eb0fa92e7e
commit d021e2dcce
9 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/airspacemonitor.cpp
View File

@@ -932,7 +932,7 @@ namespace BlackCore
} }
// do we already have ground details? // do we already have ground details?
if (situation.getOnGroundDetails() == CAircraftSituation::NotSet) if (situation.getOnGroundDetails() == CAircraftSituation::NotSetGroundDetails)
{ {
const CClient client = this->getClientOrDefaultForCallsign(callsign); const CClient client = this->getClientOrDefaultForCallsign(callsign);
if (client.hasCapability(CClient::FsdWithGroundFlag)) if (client.hasCapability(CClient::FsdWithGroundFlag))

3
src/blackcore/simulator.h
View File

@@ -351,7 +351,8 @@ namespace BlackCore
}; };
} // namespace } // namespace
Q_DECLARE_INTERFACE(BlackCore::ISimulatorFactory, "org.swift-project.blackcore.simulatorinterface") Q_DECLARE_INTERFACE(BlackCore::ISimulator, "org.swift-project.blackcore.simulator")
Q_DECLARE_INTERFACE(BlackCore::ISimulatorFactory, "org.swift-project.blackcore.simulatorfactory")
Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::ISimulator::SimulatorStatus) Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::ISimulator::SimulatorStatus)
#endif // guard #endif // guard

2
src/blackmisc/aviation/aircraftparts.cpp
View File

@@ -92,7 +92,7 @@ namespace BlackMisc
} }
else else
{ {
if (!situation.hasInboundGroundInformation()) if (!situation.hasInboundGroundDetails())
{ {
// the ground flag is not reliable and we have no ground elevation // the ground flag is not reliable and we have no ground elevation
if (situation.getOnGroundDetails() == CAircraftSituation::OnGroundByGuessing) if (situation.getOnGroundDetails() == CAircraftSituation::OnGroundByGuessing)

25
src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -50,15 +50,15 @@ namespace BlackMisc
QString CAircraftSituation::convertToQString(bool i18n) const QString CAircraftSituation::convertToQString(bool i18n) const
{ {
return QStringLiteral("ts: ") % this->getFormattedTimestampAndOffset(true) % return QStringLiteral("ts: ") % this->getFormattedTimestampAndOffset(true) %
QStringLiteral(" ") % m_position.toQString(i18n) % QStringLiteral(" | ") % m_position.toQString(i18n) %
QStringLiteral(" bank: ") % (m_bank.toQString(i18n)) % QStringLiteral(" | bank: ") % (m_bank.toQString(i18n)) %
QStringLiteral(" pitch: ") % (m_pitch.toQString(i18n)) % QStringLiteral(" | pitch: ") % (m_pitch.toQString(i18n)) %
QStringLiteral(" heading: ") % (m_heading.toQString(i18n)) % QStringLiteral(" | heading: ") % (m_heading.toQString(i18n)) %
QStringLiteral(" og: ") % this->getOnGroundInfo() % QStringLiteral(" | og: ") % this->getOnGroundInfo() %
QStringLiteral(" factor: ") % QString::number(m_onGroundFactor, 'f', 2) % QStringLiteral(" | factor: ") % QString::number(m_onGroundFactor, 'f', 2) %
QStringLiteral(" gs: ") % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::kts(), 1, true) % QStringLiteral(" | gs: ") % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::kts(), 1, true) %
QStringLiteral(" ") % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::m_s(), 1, true) % QStringLiteral(" ") % m_groundSpeed.valueRoundedWithUnit(CSpeedUnit::m_s(), 1, true) %
QStringLiteral(" elevation: ") % (m_groundElevationPlane.toQString(i18n)); QStringLiteral(" | elevation: ") % (m_groundElevationPlane.toQString(i18n));
} }
const QString &CAircraftSituation::isOnGroundToString(CAircraftSituation::IsOnGround onGround) const QString &CAircraftSituation::isOnGroundToString(CAircraftSituation::IsOnGround onGround)
@@ -98,7 +98,7 @@ namespace BlackMisc
case CAircraftSituation::InFromNetwork: return inNetwork; case CAircraftSituation::InFromNetwork: return inNetwork;
case CAircraftSituation::InFromParts: return inFromParts; case CAircraftSituation::InFromParts: return inFromParts;
case CAircraftSituation::InNoGroundInfo: return InNoGroundInfo; case CAircraftSituation::InNoGroundInfo: return InNoGroundInfo;
case CAircraftSituation::NotSet: case CAircraftSituation::NotSetGroundDetails:
default: return unknown; default: return unknown;
} }
} }
@@ -229,7 +229,7 @@ namespace BlackMisc
m_bank.setNull(); m_bank.setNull();
m_groundElevationPlane.setNull(); m_groundElevationPlane.setNull();
m_groundSpeed.setNull(); m_groundSpeed.setNull();
m_onGroundDetails = CAircraftSituation::NotSet; m_onGroundDetails = CAircraftSituation::NotSetGroundDetails;
} }
const QString &CAircraftSituation::onGroundAsString() const const QString &CAircraftSituation::onGroundAsString() const
@@ -239,8 +239,9 @@ namespace BlackMisc
bool CAircraftSituation::isOnGroundInfoAvailable() const bool CAircraftSituation::isOnGroundInfoAvailable() const
{ {
if (this->hasInboundGroundDetails()) { return true; }
return this->getOnGround() != CAircraftSituation::OnGroundSituationUnknown && return this->getOnGround() != CAircraftSituation::OnGroundSituationUnknown &&
this->getOnGroundDetails() != CAircraftSituation::NotSet; this->getOnGroundDetails() != CAircraftSituation::NotSetGroundDetails;
} }
void CAircraftSituation::setOnGround(bool onGround) void CAircraftSituation::setOnGround(bool onGround)
@@ -326,7 +327,7 @@ namespace BlackMisc
this->setOnGroundDetails(OnGroundByInterpolation); this->setOnGroundDetails(OnGroundByInterpolation);
if (this->getOnGroundFactor() < 0.0) if (this->getOnGroundFactor() < 0.0)
{ {
this->setOnGround(NotSet); this->setOnGround(NotSetGroundDetails);
return false; return false;
} }

10
src/blackmisc/aviation/aircraftsituation.h
View File

@@ -79,7 +79,7 @@ namespace BlackMisc
//! Reliability of on ground information //! Reliability of on ground information
enum OnGroundDetails enum OnGroundDetails
{ {
NotSet, NotSetGroundDetails,
// interpolated situation // interpolated situation
OnGroundByInterpolation, //!< strongest for remote aircraft OnGroundByInterpolation, //!< strongest for remote aircraft
OnGroundByElevationAndCG, OnGroundByElevationAndCG,
@@ -229,8 +229,8 @@ namespace BlackMisc
//! Is ground elevation value available //! Is ground elevation value available
bool hasGroundElevation() const; bool hasGroundElevation() const;
//! Has inbound ground information //! Has inbound ground details
bool hasInboundGroundInformation() const; bool hasInboundGroundDetails() const;
//! Elevation of the ground directly beneath at the given situation //! Elevation of the ground directly beneath at the given situation
void setGroundElevation(const Aviation::CAltitude &altitude); void setGroundElevation(const Aviation::CAltitude &altitude);
@@ -261,7 +261,7 @@ namespace BlackMisc
const PhysicalQuantities::CLengthUnit &getAltitudeUnit() const { return m_position.geodeticHeight().getUnit(); } const PhysicalQuantities::CLengthUnit &getAltitudeUnit() const { return m_position.geodeticHeight().getUnit(); }
//! Get altitude under consideration of ground elevation and ground flag //! Get altitude under consideration of ground elevation and ground flag
//! \remark with dragToGround it will also compensate overflows, otherwise ony underflow //! \remark with dragToGround it will also compensate overflows, otherwise only underflow
CAltitude getCorrectedAltitude(const PhysicalQuantities::CLength &centerOfGravity = PhysicalQuantities::CLength::null(), bool enableDragToGround = true, AltitudeCorrection *correctetion = nullptr) const; CAltitude getCorrectedAltitude(const PhysicalQuantities::CLength &centerOfGravity = PhysicalQuantities::CLength::null(), bool enableDragToGround = true, AltitudeCorrection *correctetion = nullptr) const;
//! Set the corrected altitude from CAircraftSituation::getCorrectedAltitude //! Set the corrected altitude from CAircraftSituation::getCorrectedAltitude
@@ -364,7 +364,7 @@ namespace BlackMisc
bool m_isInterim = false; bool m_isInterim = false;
Geo::CElevationPlane m_groundElevationPlane; //!< NULL elevation as default Geo::CElevationPlane m_groundElevationPlane; //!< NULL elevation as default
int m_onGround = static_cast<int>(CAircraftSituation::OnGroundSituationUnknown); int m_onGround = static_cast<int>(CAircraftSituation::OnGroundSituationUnknown);
int m_onGroundDetails = static_cast<int>(CAircraftSituation::NotSet); int m_onGroundDetails = static_cast<int>(CAircraftSituation::NotSetGroundDetails);
double m_onGroundFactor = -1; //!< interpolated ground flag, 1..on ground, 0..not on ground, -1 no info double m_onGroundFactor = -1; //!< interpolated ground flag, 1..on ground, 0..not on ground, -1 no info
BLACK_METACLASS( BLACK_METACLASS(

12
src/blackmisc/geo/coordinategeodetic.cpp
View File

@@ -146,8 +146,8 @@ namespace BlackMisc
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n);
return this->latitudeAsString() % QLatin1Char(' ') % return this->latitudeAsString() % QLatin1Char(' ') %
this->longitudeAsString() % QLatin1Char(' ') % QStringLiteral(" | ") % this->longitudeAsString() % QLatin1Char(' ') %
this->geodeticHeightAsString(); QStringLiteral(" | ") % this->geodeticHeightAsString();
} }
CVariant CCoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const CVariant CCoordinateGeodetic::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
@@ -305,12 +305,8 @@ namespace BlackMisc
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexRelativeBearing: case IndexRelativeBearing: m_relativeBearing.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
m_relativeBearing.setPropertyByIndex(index.copyFrontRemoved(), variant); case IndexRelativeDistance: m_relativeDistance.setPropertyByIndex(index.copyFrontRemoved(), variant); break;
break;
case IndexRelativeDistance:
m_relativeDistance.setPropertyByIndex(index.copyFrontRemoved(), variant);
break;
default: default:
const QString m = QString("no property, index ").append(index.toQString()); const QString m = QString("no property, index ").append(index.toQString());
BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m));

18
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -121,8 +121,20 @@ namespace BlackMisc
} }
// locked members // locked members
{ QWriteLocker l(&m_lockParts); m_partsByCallsign.clear(); m_aircraftWithParts.clear(); m_partsAdded = 0; m_partsLastModified.clear(); } {
{ QWriteLocker l(&m_lockSituations); m_situationsByCallsign.clear(); m_situationsAdded = 0; m_situationsLastModified.clear(); } QWriteLocker l(&m_lockParts);
m_partsByCallsign.clear();
m_aircraftWithParts.clear();
m_partsAdded = 0;
m_partsLastModified.clear();
}
{
QWriteLocker l(&m_lockSituations);
m_situationsByCallsign.clear();
m_situationsAdded = 0;
m_situationsLastModified.clear();
m_testOffset.clear();
}
{ QWriteLocker l(&m_lockPartsHistory); m_aircraftPartsHistory.clear(); } { QWriteLocker l(&m_lockPartsHistory); m_aircraftPartsHistory.clear(); }
{ QWriteLocker l(&m_lockMessages); m_reverseLookupMessages.clear(); } { QWriteLocker l(&m_lockMessages); m_reverseLookupMessages.clear(); }
{ QWriteLocker l(&m_lockAircraft); m_aircraftInRange.clear(); } { QWriteLocker l(&m_lockAircraft); m_aircraftInRange.clear(); }
@@ -187,7 +199,7 @@ namespace BlackMisc
} }
// unify all inbound ground information // unify all inbound ground information
if (situation.hasInboundGroundInformation()) if (situation.hasInboundGroundDetails())
{ {
situationList.setOnGroundDetails(situation.getOnGroundDetails()); situationList.setOnGroundDetails(situation.getOnGroundDetails());
} }

4
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -145,7 +145,7 @@ namespace BlackMisc
//! \threadsafe //! \threadsafe
virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositonUpdates) = 0; virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositonUpdates) = 0;
//! Ground elevation of aircraft //! Update the ground elevation
//! \threadsafe //! \threadsafe
virtual int updateAircraftGroundElevation(const Aviation::CCallsign &callsign, const Geo::CElevationPlane &elevation) = 0; virtual int updateAircraftGroundElevation(const Aviation::CCallsign &callsign, const Geo::CElevationPlane &elevation) = 0;
@@ -360,7 +360,7 @@ namespace BlackMisc
//! \remark latest parts are kept first //! \remark latest parts are kept first
//! \threadsafe //! \threadsafe
//! @{ //! @{
void storeAircraftParts(const Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool removeOutdated); void storeAircraftParts(const Aviation::CCallsign &callsign, const Aviation::CAircraftParts &parts, bool removeOutdated);
void storeAircraftParts(const Aviation::CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset); void storeAircraftParts(const Aviation::CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset);
//! @} //! @}

4
tests/blackmisc/testinterpolatorparts.cpp
View File

@@ -108,7 +108,7 @@ namespace BlackMiscTest
for (int i = 0; i < number; i++) for (int i = 0; i < number; i++)
{ {
CAircraftSituation s = createTestSituation(cs, i, ts, deltaT, 0); CAircraftSituation s = createTestSituation(cs, i, ts, deltaT, 0);
s.setOnGround(CAircraftSituation::OnGroundSituationUnknown, CAircraftSituation::NotSet); s.setOnGround(CAircraftSituation::OnGroundSituationUnknown, CAircraftSituation::NotSetGroundDetails);
situations.push_back(s); situations.push_back(s);
} }
@@ -124,7 +124,7 @@ namespace BlackMiscTest
const qint64 Offset = 33; const qint64 Offset = 33;
partsOnGround.addMsecsToOffset(Offset); partsOnGround.addMsecsToOffset(Offset);
CAircraftSituation s1 = situations[1]; CAircraftSituation s1 = situations[1];
s1.setOnGroundDetails(CAircraftSituation::NotSet); s1.setOnGroundDetails(CAircraftSituation::NotSetGroundDetails);
s1.adjustGroundFlag(partsOnGround, true, 0.1, &distanceMs); s1.adjustGroundFlag(partsOnGround, true, 0.1, &distanceMs);
QVERIFY2(s1.getOnGround(), "Supposed to be on ground"); QVERIFY2(s1.getOnGround(), "Supposed to be on ground");
QVERIFY2(distanceMs == deltaT - Offset, "Offset time wrong"); QVERIFY2(distanceMs == deltaT - Offset, "Offset time wrong");