flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #207, renamed CValueMap to CIndexVariantMap.

Browse Source 
* The map will be used with CSimulaorInfo to transfer a variable number of setting information about the flight simulator. It is being used, because it is already DBus and tupel compliant. The new name better fits its purpose.
* Add == operator for CIndexVariantMap (ambiguity error with tupels)
This commit is contained in:
Klaus Basan
2014-04-14 11:15:14 +02:00
parent 2b07012e4f
commit e474671ead
17 changed files with 121 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/context_network_aircraft.cpp
View File

@@ -45,7 +45,7 @@ namespace BlackCore
else
{
// update
CValueMap vm(CAircraft::IndexIcao, icaoData.toQVariant());
CIndexVariantMap vm(CAircraft::IndexIcao, icaoData.toQVariant());
this->m_aircraftsInRange.applyIf(BlackMisc::Predicates::MemberEqual<CAircraft>(&CAircraft::getCallsign, callsign), vm);
emit this->changedAircraftsInRange();
}
@@ -83,7 +83,7 @@ namespace BlackCore
// update
CLength distance = this->m_ownAircraft.calculcateDistanceToPlane(situation.getPosition());
distance.switchUnit(CLengthUnit::NM());
CValueMap vm;
CIndexVariantMap vm;
vm.addValue(CAircraft::IndexTransponder, transponder);
vm.addValue(CAircraft::IndexSituation, situation);
vm.addValue(CAircraft::IndexDistance, distance);
@@ -111,7 +111,7 @@ namespace BlackCore
// this->log(Q_FUNC_INFO, callsign.toQString(), frequency.toQString());
// update
CValueMap vm(CAircraft::IndexFrequencyCom1, frequency.toQVariant());
CIndexVariantMap vm(CAircraft::IndexFrequencyCom1, frequency.toQVariant());
this->m_aircraftsInRange.applyIf(BlackMisc::Predicates::MemberEqual<CAircraft>(&CAircraft::getCallsign, callsign), vm);
emit this->changedAircraftsInRange();
}

12
src/blackcore/context_network_atc.cpp
View File

@@ -257,7 +257,7 @@ namespace BlackCore
else
{
// update
CValueMap values;
CIndexVariantMap values;
values.addValue(CAtcStation::IndexFrequency, frequency);
values.addValue(CAtcStation::IndexPosition, position);
values.addValue(CAtcStation::IndexRange, range);
@@ -274,7 +274,7 @@ namespace BlackCore
// this->log(Q_FUNC_INFO, callsign.toQString());
this->m_atcStationsOnline.removeIf(&CAtcStation::getCallsign, callsign);
emit this->changedAtcStationsOnline();
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, CValueMap(CAtcStation::IndexIsOnline, QVariant(false)));
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, CIndexVariantMap(CAtcStation::IndexIsOnline, QVariant(false)));
}
/*
@@ -284,7 +284,7 @@ namespace BlackCore
{
// this->log(Q_FUNC_INFO, callsign.toQString(), atisMessage);
CValueMap vm(CAtcStation::IndexAtis, atisMessage.toQVariant());
CIndexVariantMap vm(CAtcStation::IndexAtis, atisMessage.toQVariant());
this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm);
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, vm);
}
@@ -295,7 +295,7 @@ namespace BlackCore
void CContextNetwork::psFsdAtisVoiceRoomQueryReceived(const CCallsign &callsign, const QString &url)
{
QString trimmedUrl = url.trimmed();
CValueMap vm(CAtcStation::IndexVoiceRoomUrl, trimmedUrl);
CIndexVariantMap vm(CAtcStation::IndexVoiceRoomUrl, trimmedUrl);
this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm);
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, vm);
}
@@ -315,7 +315,7 @@ namespace BlackCore
if (!ok) return;
QDateTime logoffDateTime = QDateTime::currentDateTimeUtc();
logoffDateTime.setTime(QTime(h, m));
CValueMap vm(CAtcStation::IndexBookedUntil, logoffDateTime);
CIndexVariantMap vm(CAtcStation::IndexBookedUntil, logoffDateTime);
this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm);
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, vm);
}
@@ -334,7 +334,7 @@ namespace BlackCore
CInformationMessage metar(CInformationMessage::METAR, metarMessage);
// add METAR to existing stations
CValueMap vm(CAtcStation::IndexMetar, metar.toQVariant());
CIndexVariantMap vm(CAtcStation::IndexMetar, metar.toQVariant());
this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsignTower, vm);
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsignTower, vm);
this->m_metarCache.insert(icaoCode, metar);

4
src/blackcore/context_network_impl.cpp
View File

@@ -300,11 +300,11 @@ namespace BlackCore
{
if (this->getRuntime()->isSlotLogForNetworkEnabled()) this->getRuntime()->logSlot(Q_FUNC_INFO, callsign.toQString(), realname);
if (realname.isEmpty()) return;
CValueMap vm(CAtcStation::IndexControllerRealName, realname);
CIndexVariantMap vm(CAtcStation::IndexControllerRealName, realname);
this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm);
this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, vm);
vm = CValueMap(CAircraft::IndexPilotRealName, realname);
vm = CIndexVariantMap(CAircraft::IndexPilotRealName, realname);
this->m_aircraftsInRange.applyIf(&CAircraft::getCallsign, callsign, vm);
}