flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #428 Use COriginator instead of QString in internal API

Browse Source
This commit is contained in:
Roland Winklmeier
2015-05-24 13:36:20 +02:00
parent 136587f564
commit ee0bfd62fa
61 changed files with 265 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,19 +48,19 @@ namespace BlackMisc
return this->m_ownAircraftProvider->getDistanceToOwnAircraft(position);
}
bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const QString &originator)
bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const COriginator &originator)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateCockpit(com1, com2, transponder, originator);
}
bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const QString &originator)
bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const COriginator &originator)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateActiveComFrequency(frequency, comUnit, originator);
}
bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const QString &originator)
bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const COriginator &originator)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateSelcal(selcal, originator);

13
src/blackmisc/simulation/ownaircraftprovider.h
View File

@@ -13,6 +13,7 @@
#define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDER_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/originator.h"
#include "blackmisc/simulation/simulatedaircraft.h"
namespace BlackMisc
@@ -70,15 +71,15 @@ namespace BlackMisc
//! Update cockpit, but send signals when applicable
//! \threadsafe
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) = 0;
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator) = 0;
//! Update cockpit, but send signals when applicable
//! \threadsafe
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) = 0;
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) = 0;
//! Update cockpit, but send signals when applicable
//! \threadsafe
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) = 0;
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) = 0;
};
@@ -102,13 +103,13 @@ namespace BlackMisc
virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const;
//! \copydoc IOwnAircraftProvider::updateCockpit
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator);
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator);
//! \copydoc IOwnAircraftProvider::updateComFrequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator);
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator);
//! \copydoc IOwnAircraftProvider::updateSelcal
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator);
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator);
//! \copydoc IOwnAircraftProvider::updateOwnCallsign
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign);

6
src/blackmisc/simulation/ownaircraftproviderdummy.cpp
View File

@@ -37,7 +37,7 @@ namespace BlackMisc
return m_ownAircraft.calculateGreatCircleDistance(position);
}
bool COwnAircraftProviderDummy::updateCockpit(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder, const QString &originator)
bool COwnAircraftProviderDummy::updateCockpit(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder, const COriginator &originator)
{
m_ownAircraft.setCom1System(com1);
m_ownAircraft.setCom2System(com2);
@@ -46,7 +46,7 @@ namespace BlackMisc
return true;
}
bool COwnAircraftProviderDummy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator)
bool COwnAircraftProviderDummy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator)
{
if (!CComSystem::isValidComFrequency(frequency)) { return false; }
CComSystem::ComUnit comUnitEnum = static_cast<CComSystem::ComUnit>(comUnit);
@@ -57,7 +57,7 @@ namespace BlackMisc
return true;
}
bool COwnAircraftProviderDummy::updateSelcal(const CSelcal &selcal, const QString &originator)
bool COwnAircraftProviderDummy::updateSelcal(const CSelcal &selcal, const BlackMisc::COriginator &originator)
{
m_ownAircraft.setSelcal(selcal);
Q_UNUSED(originator);

6
src/blackmisc/simulation/ownaircraftproviderdummy.h
View File

@@ -50,13 +50,13 @@ namespace BlackMisc
public slots:
//! \copydoc IOwnAircraftProvider::updateCockpit
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) override;
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::COriginator &originator) override;
//! \copydoc IOwnAircraftProvider::updateComFrequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) override;
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::COriginator &originator) override;
//! \copydoc IOwnAircraftProvider::updateSelcal
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) override;
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::COriginator &originator) override;
//! \copydoc IOwnAircraftProvider::updateOwnCallsign
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;

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

@@ -64,19 +64,19 @@ namespace BlackMisc
return this->m_remoteAircraftProvider->remoteAircraftSituationsCount(callsign);
}
bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const QString &originator)
bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const COriginator &originator)
{
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_remoteAircraftProvider->updateAircraftModel(callsign, model, originator);
}
bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator)
bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered, const COriginator &originator)
{
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_remoteAircraftProvider->updateAircraftRendered(callsign, rendered, originator);
}
void CRemoteAircraftAware::updateMarkAllAsNotRendered(const QString &originator)
void CRemoteAircraftAware::updateMarkAllAsNotRendered(const COriginator &originator)
{
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_remoteAircraftProvider->updateMarkAllAsNotRendered(originator);
@@ -88,7 +88,7 @@ namespace BlackMisc
return this->m_remoteAircraftProvider->isRemoteAircraftSupportingParts(callsign);
}
bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator)
bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const COriginator &originator)
{
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_remoteAircraftProvider->updateAircraftEnabled(callsign, enabledForRedering, originator);

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

@@ -13,6 +13,7 @@
#define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/originator.h"
#include "blackmisc/simulation/airspaceaircraftsnapshot.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
@@ -78,23 +79,23 @@ namespace BlackMisc
//! Enable/disable rendering
//! \threadsafe
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const QString &originator) = 0;
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::COriginator &originator) = 0;
//! Rendered?
//! \threadsafe
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator) = 0;
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) = 0;
//! Mark all as not rendered
//! \threadsafe
virtual void updateMarkAllAsNotRendered(const QString &originator) = 0;
virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) = 0;
//! Change model string
//! \threadsafe
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0;
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) = 0;
//! Change fast position updates
//! \threadsafe
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) = 0;
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const BlackMisc::COriginator &originator) = 0;
//! Destructor
virtual ~IRemoteAircraftProvider() {}
@@ -143,16 +144,16 @@ namespace BlackMisc
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
//! \copydoc IRemoteAircraftProvider::updateAircraftEnabled
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator);
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const BlackMisc::COriginator &originator);
//! \copydoc IRemoteAircraftProvider::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator);
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator);
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator);
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator);
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
virtual void updateMarkAllAsNotRendered(const QString &originator);
virtual void updateMarkAllAsNotRendered(const COriginator &originator);
//! Destructor
virtual ~CRemoteAircraftAware() {}

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

@@ -82,7 +82,7 @@ namespace BlackMisc
return c;
}
bool CRemoteAircraftProviderDummy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering, const QString &originator)
bool CRemoteAircraftProviderDummy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering, const COriginator &originator)
{
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexEnabled, CVariant::fromValue(enabledForRendering));
@@ -90,7 +90,7 @@ namespace BlackMisc
return n > 0;
}
bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const QString &originator)
bool CRemoteAircraftProviderDummy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const COriginator &originator)
{
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, model.toCVariant());
@@ -98,7 +98,7 @@ namespace BlackMisc
return n > 0;
}
bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator)
bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates, const COriginator &originator)
{
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositionUpdates));
@@ -106,7 +106,7 @@ namespace BlackMisc
return n > 0;
}
bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator)
bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered, const COriginator &originator)
{
Q_UNUSED(originator);
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexRendered, CVariant::fromValue(rendered));
@@ -114,7 +114,7 @@ namespace BlackMisc
return n > 0;
}
void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const QString &originator)
void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const COriginator &originator)
{
Q_UNUSED(originator);
this->m_aircraft.markAllAsNotRendered();

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

@@ -68,19 +68,19 @@ namespace BlackMisc
) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftEnabled
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const QString &originator) override;
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const BlackMisc::COriginator &originator) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftModel
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) override;
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::COriginator &originator) override;
//! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled
virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) override;
virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const BlackMisc::COriginator &originator) override;
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const QString &originator) override;
virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const BlackMisc::COriginator &originator) override;
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
virtual void updateMarkAllAsNotRendered(const QString &originator) override;
virtual void updateMarkAllAsNotRendered(const BlackMisc::COriginator &originator) override;
//! For testing, add new situation and fire signals
void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation);