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

refs #768, some minor formatting during debugging of mapping wizard

Browse Source 
(found that some unnecessary model changed events are sent, will result in some refactoring)
This commit is contained in:
Klaus Basan
2016-10-17 03:30:54 +02:00
parent 6322c6d302
commit 45a620dab5
8 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackcore/context/contextownaircraftimpl.cpp
View File

@@ -117,7 +117,7 @@ namespace BlackCore
ownAircraft.initComSystems();
ownAircraft.initTransponder();
CAircraftSituation situation(
const CAircraftSituation situation(
CCoordinateGeodetic(
CLatitude::fromWgs84("N 049° 18' 17"),
CLongitude::fromWgs84("E 008° 27' 05"),
@@ -130,7 +130,7 @@ namespace BlackCore
// reverse lookup if possible
if (!ownAircraft.getModel().isLoadedFromDb() && !ownAircraft.getModelString().isEmpty())
{
ownAircraft.setModel(reverseLookupModel(ownAircraft.getModelString()));
ownAircraft.setModel(this->reverseLookupModel(ownAircraft.getModelString()));
}
// override empty values
@@ -187,6 +187,7 @@ namespace BlackCore
{
if (modelString.isEmpty()) { return CAircraftModel(); }
if (!sApp || !sApp->hasWebDataServices()) { return CAircraftModel(); }
if (sApp->getWebDataServices()->getModelsCount() < 1) { return CAircraftModel(); }
const CAircraftModel reverseLookupModel = sApp->getWebDataServices()->getModelForModelString(modelString);
return reverseLookupModel;
}
@@ -195,7 +196,7 @@ namespace BlackCore
{
// reverse lookup if not yet from DB:
// this is the central place where we keep our own model, so we use best effort
// to make that model as accuarate as we can
// to make that model as accurate as we can
CAircraftModel updateModel(model);
if (!updateModel.isLoadedFromDb())
{
@@ -209,10 +210,10 @@ namespace BlackCore
}
}
updateModel.setModelType(CAircraftModel::TypeOwnSimulatorModel);
QWriteLocker l(&m_lockAircraft);
const bool changed = (this->m_ownAircraft.getModel() != updateModel);
if (!changed) { return false; }
updateModel.setModelType(CAircraftModel::TypeOwnSimulatorModel);
this->m_ownAircraft.setModel(updateModel);
return true;
}
@@ -296,7 +297,7 @@ namespace BlackCore
if (this->m_ownAircraft.getPilot() == pilot) { return false; }
this->m_ownAircraft.setPilot(pilot);
}
emit changedPilot(pilot);
emit this->changedPilot(pilot);
return true;
}
@@ -307,7 +308,7 @@ namespace BlackCore
if (this->m_ownAircraft.getCallsign() == callsign) { return false; }
this->m_ownAircraft.setCallsign(callsign);
}
emit changedCallsign(callsign);
emit this->changedCallsign(callsign);
return true;
}
@@ -317,7 +318,7 @@ namespace BlackCore
QWriteLocker l(&m_lockAircraft);
return this->m_ownAircraft.setIcaoCodes(aircraftIcaoCode, airlineIcaoCode);
}
emit changedAircraftIcaoCodes(aircraftIcaoCode, airlineIcaoCode);
emit this->changedAircraftIcaoCodes(aircraftIcaoCode, airlineIcaoCode);
}
bool CContextOwnAircraft::updateSelcal(const CSelcal &selcal, const CIdentifier &originator)