flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 15:45:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #459 Removed CAircraftParts::m_correspondingCallsign per Slack discussion MS/RW.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-07 17:29:23 +01:00
parent d1955ba61f
commit 00cd4f4f87
24 changed files with 52 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@ namespace BlackMisc
this->m_callsign.setTypeHint(CCallsign::Aircraft);
this->m_pilot.setCallsign(this->m_callsign);
this->m_situation.setCallsign(this->m_callsign);
this->m_parts.setCallsign(this->m_callsign);
}
QString CAircraft::convertToQString(bool i18n) const
@@ -168,7 +167,6 @@ namespace BlackMisc
void CAircraft::setParts(const CAircraftParts &parts)
{
m_parts = parts;
m_parts.setCallsign(this->getCallsign());
}
void CAircraft::setLights(CAircraftLights &lights)

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

@@ -42,8 +42,6 @@ namespace BlackMisc
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexCallsign:
return m_correspondingCallsign.propertyByIndex(index.copyFrontRemoved());
case IndexEngines:
return CVariant::fromValue(this->m_engines);
case IndexFlapsPercentage:
@@ -86,9 +84,6 @@ namespace BlackMisc
case IndexSpoilersOut:
this->m_spoilersOut = variant.toBool();
break;
case IndexCallsign:
this->m_correspondingCallsign.setPropertyByIndex(variant, index.copyFrontRemoved());
break;
default:
CValueObject::setPropertyByIndex(variant, index);
break;

19
src/blackmisc/aviation/aircraftparts.h
View File

@@ -13,7 +13,6 @@
#define BLACKMISC_AVIATION_AIRCRAFTPARTS_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/timestampbased.h"
#include "blackmisc/propertyindex.h"
@@ -38,8 +37,7 @@ namespace BlackMisc
IndexFlapsPercentage,
IndexSpoilersOut,
IndexEngines,
IndexOnGround,
IndexCallsign
IndexOnGround
};
//! Default constructor
@@ -52,13 +50,6 @@ namespace BlackMisc
m_spoilersOut(spoilersOut), m_isOnGround(onGround)
{}
//! Constructor
CAircraftParts(const CCallsign &callsign, const CAircraftLights &lights, bool gearDown, int flapsPercent, bool spoilersOut,
const CAircraftEngineList &engines, bool onGround)
: m_correspondingCallsign(callsign), m_lights(lights), m_engines(engines), m_flapsPercentage(flapsPercent), m_gearDown(gearDown),
m_spoilersOut(spoilersOut), m_isOnGround(onGround)
{}
//! \copydoc CValueObject::propertyByIndex
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
@@ -113,18 +104,11 @@ namespace BlackMisc
//! Set aircraft on ground
void setOnGround(bool onGround) { m_isOnGround = onGround; }
//! Corresponding callsign
const BlackMisc::Aviation::CCallsign &getCallsign() const { return this->m_correspondingCallsign; }
//! Corresponding callsign
void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; }
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftParts)
BlackMisc::Aviation::CCallsign m_correspondingCallsign;
CAircraftLights m_lights;
CAircraftEngineList m_engines;
int m_flapsPercentage = 0;
@@ -137,7 +121,6 @@ namespace BlackMisc
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftParts, (
attr(o.m_correspondingCallsign, flags < DisabledForJson > ()),
attr(o.m_lights, "lights"),
attr(o.m_gearDown, "gear_down"),
attr(o.m_flapsPercentage, "flaps_pct"),

1
src/blackmisc/aviation/aircraftpartslist.h
View File

@@ -26,7 +26,6 @@ namespace BlackMisc
class BLACKMISC_EXPORT CAircraftPartsList :
public CSequence<CAircraftParts>,
public ITimestampObjectList<CAircraftParts, CAircraftPartsList>,
public ICallsignObjectList<CAircraftParts, CAircraftPartsList>,
public BlackMisc::Mixin::MetaType<CAircraftPartsList>
{
public:

1
src/blackmisc/aviation/callsignobjectlist.cpp
View File

@@ -203,7 +203,6 @@ namespace BlackMisc
template class ICallsignObjectList<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>;
template class ICallsignObjectList<BlackMisc::Aviation::CAircraft, BlackMisc::Aviation::CAircraftList>;
template class ICallsignObjectList<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList>;
template class ICallsignObjectList<BlackMisc::Aviation::CAircraftParts, BlackMisc::Aviation::CAircraftPartsList>;
template class ICallsignObjectList<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList>;
template class ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;

1
src/blackmisc/aviation/callsignobjectlist.h
View File

@@ -112,7 +112,6 @@ namespace BlackMisc
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraft, BlackMisc::Aviation::CAircraftList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraftParts, BlackMisc::Aviation::CAircraftPartsList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;
//! \endcond

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

@@ -106,7 +106,7 @@ namespace BlackMisc
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot,
std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshot
) = 0;

16
src/blackmisc/simulation/remoteaircraftproviderdummy.cpp
View File

@@ -41,8 +41,8 @@ namespace BlackMisc
CAircraftPartsList CRemoteAircraftProviderDummy::remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore) const
{
if (cutoffTimeBefore < 0) { return m_parts.findByCallsign(callsign); }
return m_parts.findByCallsign(callsign).findBefore(cutoffTimeBefore);
if (cutoffTimeBefore < 0) { return m_parts.value(callsign); }
return m_parts.value(callsign).findBefore(cutoffTimeBefore);
}
CAircraftSituationList CRemoteAircraftProviderDummy::remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const
@@ -57,7 +57,7 @@ namespace BlackMisc
CCallsignSet CRemoteAircraftProviderDummy::remoteAircraftSupportingParts() const
{
return m_parts.getCallsigns();
return CCollection<CCallsign>(m_parts.keys());
}
bool CRemoteAircraftProviderDummy::isRemoteAircraftSupportingParts(const CCallsign &callsign) const
@@ -68,7 +68,7 @@ namespace BlackMisc
QList<QMetaObject::Connection> CRemoteAircraftProviderDummy::connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void (const CAircraftSituation &)> situationSlot,
std::function<void (const CAircraftParts &)> partsSlot,
std::function<void (const BlackMisc::Aviation::CCallsign &, const CAircraftParts &)> partsSlot,
std::function<void (const CCallsign &)> removedAircraftSlot,
std::function<void (const CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
)
@@ -129,11 +129,11 @@ namespace BlackMisc
emit addedRemoteAircraftSituation(situation);
}
void CRemoteAircraftProviderDummy::insertNewAircraftParts(const CAircraftParts &parts)
void CRemoteAircraftProviderDummy::insertNewAircraftParts(const CCallsign &callsign, const CAircraftParts &parts)
{
this->m_parts.push_front(parts);
this->m_parts.sortLatestFirst(); // like in real world, latest should be first
emit addedRemoteAircraftParts(parts);
this->m_parts[callsign].push_front(parts);
this->m_parts[callsign].sortLatestFirst(); // like in real world, latest should be first
emit addedRemoteAircraftParts(callsign, parts);
}
void CRemoteAircraftProviderDummy::clear()

8
src/blackmisc/simulation/remoteaircraftproviderdummy.h
View File

@@ -63,7 +63,7 @@ namespace BlackMisc
virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
QObject *receiver,
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot,
std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
) override;
@@ -87,7 +87,7 @@ namespace BlackMisc
void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! For testing, add new parts and fire signals
void insertNewAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
void insertNewAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts);
//! Clear all data
void clear();
@@ -97,7 +97,7 @@ namespace BlackMisc
void addedRemoteAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
//! Added parts
void addedRemoteAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
void addedRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts);
//! Added aircraft
void removedRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);
@@ -108,7 +108,7 @@ namespace BlackMisc
private:
BlackMisc::Simulation::CSimulatedAircraftList m_aircraft;
BlackMisc::Aviation::CAircraftSituationList m_situations;
BlackMisc::Aviation::CAircraftPartsList m_parts;
CPartsPerCallsign m_parts;
};
} // namespace