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

Added updates by VATSIM data file for voice capabilities

Browse Source
This commit is contained in:
Klaus Basan
2014-09-08 23:24:01 +02:00
parent 2127238ed4
commit 4500bda125
7 changed files with 140 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/blackcore/airspace_monitor.cpp
View File

@@ -44,6 +44,7 @@ namespace BlackCore
// AutoConnection: this should also avoid race conditions by updating the bookings
this->connect(this->m_vatsimBookingReader, &CVatsimBookingReader::dataRead, this, &CAirspaceMonitor::ps_receivedBookings);
this->connect(this->m_vatsimDataFileReader, &CVatsimDataFileReader::dataRead, this, &CAirspaceMonitor::ps_receivedDataFile);
}
CFlightPlan CAirspaceMonitor::loadFlightPlanFromNetwork(const CCallsign &callsign)
@@ -237,7 +238,9 @@ namespace BlackCore
vm = CIndexVariantMap({CAircraft::IndexPilot, CUser::IndexRealName}, realname);
this->m_aircraftsInRange.applyIf(&CAircraft::getCallsign, callsign, vm);
// Client
vm = CIndexVariantMap({CClient::IndexUser, CUser::IndexRealName}, realname);
this->addVoiceCapabilitiesFromDataFile(vm, callsign);
this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm);
}
@@ -249,6 +252,7 @@ namespace BlackCore
capabilities.addValue(CClient::FsdWithInterimPositions, (flags & INetwork::SupportsInterimPosUpdates));
capabilities.addValue(CClient::FsdWithModelDescription, (flags & INetwork::SupportsModelDescriptions));
CIndexVariantMap vm(CClient::IndexCapabilities, capabilities.toQVariant());
this->addVoiceCapabilitiesFromDataFile(vm, callsign);
this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm);
}
@@ -293,7 +297,7 @@ namespace BlackCore
if (this->m_atcStationsBooked.contains(&CAtcStation::getCallsign, callsignTower)) { emit this->changedAtcStationsBooked(); }
}
void CAirspaceMonitor::ps_flightplanReceived(const CCallsign &callsign, const CFlightPlan &flightPlan)
void CAirspaceMonitor::ps_flightPlanReceived(const CCallsign &callsign, const CFlightPlan &flightPlan)
{
CFlightPlan plan(flightPlan);
plan.setWhenLastSentOrLoaded(QDateTime::currentDateTimeUtc());
@@ -318,6 +322,17 @@ namespace BlackCore
this->m_network->sendFsipirCustomPacket(recipientCallsign, icao.getAirlineDesignator(), icao.getAircraftDesignator(), icao.getAircraftCombinedType(), modelString);
}
void CAirspaceMonitor::addVoiceCapabilitiesFromDataFile(CIndexVariantMap &vm, const CCallsign &callsign)
{
Q_ASSERT(this->m_vatsimDataFileReader);
if (callsign.isEmpty()) return;
CVoiceCapabilities vc = this->m_vatsimDataFileReader->getVoiceCapabilityForCallsign(callsign);
if (!vc.isUnknown())
{
vm.addValue(CClient::IndexVoiceCapabilities, vc);
}
}
void CAirspaceMonitor::ps_receivedBookings(const CAtcStationList &bookedStations)
{
Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this));
@@ -326,7 +341,7 @@ namespace BlackCore
{
// complete by VATSIM data file data
this->m_vatsimDataFileReader->getAtcStations().updateFromVatsimDataFileStation(bookedStation);
// exchange booking and online data
// exchange booking and online data, both sides are updated
this->m_atcStationsOnline.mergeWithBooking(bookedStation);
// into list
this->m_atcStationsBooked.push_back(bookedStation);
@@ -334,6 +349,20 @@ namespace BlackCore
emit this->changedAtcStationsBooked(); // all booked stations reloaded
}
void CAirspaceMonitor::ps_receivedDataFile()
{
Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this));
for (auto i = this->m_otherClients.begin(); i != this->m_otherClients.end(); ++i)
{
CClient client = (*i);
if (client.hasSpecifiedVoiceCapabilities()) continue;
CVoiceCapabilities vc = this->m_vatsimDataFileReader->getVoiceCapabilityForCallsign(client.getCallsign());
if (vc.isUnknown()) continue;
client.setVoiceCapabilities(vc);
(*i) = client;
}
}
void CAirspaceMonitor::ps_atcPositionUpdate(const CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency, const CCoordinateGeodetic &position, const BlackMisc::PhysicalQuantities::CLength &range)
{
Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this));
@@ -422,7 +451,9 @@ namespace BlackCore
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, vm);
emit this->changedAtcStationsBooked(); // single ATIS received
}
vm = CIndexVariantMap(CClient::IndexVoiceCapabilities, CVoiceCapabilities(CVoiceCapabilities::Voice).toQVariant());
// receiving voice room means ATC has voice
vm = CIndexVariantMap(CClient::IndexVoiceCapabilities, CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Voice).toQVariant());
this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm);
}

3
src/blackcore/airspace_monitor.h
View File

@@ -139,6 +139,9 @@ namespace BlackCore
void sendFsipirCustomPacket(const BlackMisc::Aviation::CCallsign &recipientCallsign) const;
QStringList createFsipiCustomPacketData() const;
//! Helper method, add voice capabilites if available
void addVoiceCapabilitiesFromDataFile(BlackMisc::CIndexVariantMap &vm, const BlackMisc::Aviation::CCallsign &callsign);
private slots:
void ps_realNameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
void ps_capabilitiesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, quint32 flags);

36
src/blackcore/vatsimdatafilereader.cpp
View File

@@ -87,6 +87,19 @@ namespace BlackCore
return aircraft.getIcaoInfo();
}
CVoiceCapabilities CVatsimDataFileReader::getVoiceCapabilityForCallsign(const CCallsign &callsign)
{
QReadLocker rl(&this->m_lock);
if (this->m_voiceCapabilities.contains(callsign))
{
return m_voiceCapabilities[callsign];
}
else
{
return CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::Unknown);
}
}
void CVatsimDataFileReader::updateWithVatsimDataFileData(CAircraft &aircraftToBeUdpated) const
{
this->getAircrafts().updateWithVatsimDataFileData(aircraftToBeUdpated);
@@ -158,9 +171,10 @@ namespace BlackCore
if (lines.isEmpty()) return;
// build on local vars for thread safety
CServerList voiceServers;
CServerList voiceServers;
CAtcStationList atcStations;
CAircraftList aircrafts;
CAircraftList aircrafts;
QMap<CCallsign, CVoiceCapabilities> voiceCapabilities;
QDateTime updateTimestampFromFile;
QStringList clientSectionAttributes;
@@ -213,8 +227,9 @@ namespace BlackCore
case SectionClients:
{
QMap<QString, QString> clientPartsMap = clientPartsToMap(currentLine, clientSectionAttributes);
BlackMisc::Network::CUser user(clientPartsMap["cid"], clientPartsMap["realname"], CCallsign(clientPartsMap["callsign"]));
if (!user.hasValidCallsign()) continue;
CCallsign callsign = CCallsign(clientPartsMap["callsign"]);
if (callsign.isEmpty()) continue;
BlackMisc::Network::CUser user(clientPartsMap["cid"], clientPartsMap["realname"], callsign);
const QString clientType = clientPartsMap["clienttype"].toLower();
if (clientType.isEmpty()) break; // sometimes type is empty
double lat = clientPartsMap["latitude"].toDouble();
@@ -223,7 +238,19 @@ namespace BlackCore
CFrequency frequency = CFrequency(clientPartsMap["frequency"].toDouble(), CFrequencyUnit::MHz());
CCoordinateGeodetic position(lat, lng, -1);
CAltitude altitude(alt, CAltitude::MeanSeaLevel, CLengthUnit::ft());
QString flightPlanRemarks = clientPartsMap["planned_remarks"];
// Voice capabilities
if (!flightPlanRemarks.isEmpty())
{
CVoiceCapabilities vc(flightPlanRemarks);
if (!vc.isUnknown())
{
voiceCapabilities.insert(callsign, vc);
}
}
// set as per ATC/pilot
if (clientType.startsWith('p'))
{
// Pilot section
@@ -300,6 +327,7 @@ namespace BlackCore
this->m_aircrafts = aircrafts;
this->m_atcStations = atcStations;
this->m_voiceServers = voiceServers;
this->m_voiceCapabilities = voiceCapabilities;
}
} // read success

5
src/blackcore/vatsimdatafilereader.h
View File

@@ -17,6 +17,7 @@
#include "blackmisc/avaircraftlist.h"
#include "blackmisc/nwserverlist.h"
#include "blackmisc/nwuserlist.h"
#include "blackmisc/nwvoicecapabilities.h"
#include "blackmisc/avcallsignlist.h"
#include <QObject>
@@ -80,6 +81,10 @@ namespace BlackCore
//! \threadsafe
BlackMisc::Aviation::CAircraftIcao getIcaoInfo(const BlackMisc::Aviation::CCallsign &callsign);
//! Voice capability for callsign
//! \threadsafe
BlackMisc::Network::CVoiceCapabilities getVoiceCapabilityForCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! Update aircraft with VATSIM aircraft data from data file
//! \threadsafe
void updateWithVatsimDataFileData(BlackMisc::Aviation::CAircraft &aircraftToBeUdpated) const;

3
src/blackmisc/nwclient.h
View File

@@ -103,6 +103,9 @@ namespace BlackMisc
//! Get voice capabilities
const CVoiceCapabilities &getVoiceCapabilities() const { return m_voiceCapabilities;}
//! Has known voice capabilities?
bool hasSpecifiedVoiceCapabilities() const { return !m_voiceCapabilities.isUnknown();}
//! Set voice capabilities
void setVoiceCapabilities(const CVoiceCapabilities &voiceCapabilities) { m_voiceCapabilities = voiceCapabilities;}

47
src/blackmisc/nwvoicecapabilites.cpp
View File

@@ -76,6 +76,20 @@ namespace BlackMisc
this->setCapabilities(Voice);
return;
}
if (r.contains("/t/"))
{
this->setCapabilities(TextOnly);
return;
}
if (r.contains("/r/"))
{
this->setCapabilities(VoiceReceivingOnly);
return;
}
this->setCapabilities(Unknown);
}
/*
@@ -191,6 +205,39 @@ namespace BlackMisc
return TupleConverter<CVoiceCapabilities>::jsonMembers();
}
/*
* From enum
*/
const CVoiceCapabilities &CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::VoiceCapabilities capabilities)
{
static const CVoiceCapabilities u(CVoiceCapabilities::Unknown);
static const CVoiceCapabilities to(CVoiceCapabilities::TextOnly);
static const CVoiceCapabilities v(CVoiceCapabilities::Voice);
static const CVoiceCapabilities vro(CVoiceCapabilities::VoiceReceivingOnly);
switch (capabilities)
{
case CVoiceCapabilities::TextOnly:
return to;
case CVoiceCapabilities::Voice:
return v;
case CVoiceCapabilities::VoiceReceivingOnly:
return vro;
case CVoiceCapabilities::Unknown:
default:
return u;
}
}
/*
* All
*/
const QList<CVoiceCapabilities> &CVoiceCapabilities::allCapabilities()
{
static const QList<CVoiceCapabilities> all({fromVoiceCapabilities(Unknown), fromVoiceCapabilities(Voice), fromVoiceCapabilities(VoiceReceivingOnly), fromVoiceCapabilities(TextOnly)});
return all;
}
/*
* Register metadata
*/

17
src/blackmisc/nwvoicecapabilities.h
View File

@@ -51,6 +51,9 @@ namespace BlackMisc
//! Set capabilites
void setCapabilities(VoiceCapabilities capabilites) { m_voiceCapabilities = static_cast<int>(capabilites); }
//! Is capability known
bool isUnknown() const { return m_voiceCapabilities == Unknown; }
//! \copydoc CValueObject::toIcon()
virtual CIcon toIcon() const override;
@@ -81,6 +84,18 @@ namespace BlackMisc
//! Members
static const QStringList &jsonMembers();
//! From enum
static const CVoiceCapabilities &fromVoiceCapabilities(VoiceCapabilities capabilities);
//! From flight plan remarks
static CVoiceCapabilities fromFlightPlanRemarks(const QString &remarks)
{
return CVoiceCapabilities(remarks);
}
//! All capabilities as list
static const QList<CVoiceCapabilities> &allCapabilities();
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
@@ -105,7 +120,7 @@ namespace BlackMisc
int m_voiceCapabilities = Unknown;
//! Capabilites from flight plans remarks such as "/V/"
void fromFlightPlanRemarks(const QString &flightPlanRemarks);
void setFromFlightPlanRemarks(const QString &flightPlanRemarks);
};
} // namespace