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

refs #640, support for simulator in distributor

Browse Source 
* changed backend (JSON) and added support for simulator data
* get distributors by simulator
* renamed to setSimulator / getSimulator
This commit is contained in:
Klaus Basan
2016-04-17 19:08:44 +02:00
parent b78308b059
commit 5d39c906e4
17 changed files with 125 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -241,8 +241,8 @@ namespace BlackMisc
const CSimulatorInfo::Simulator s = info.getSimulator();
for (CAircraftModel &model : (*this))
{
if (model.getSimulatorInfo().getSimulator() == s) { continue; }
model.setSimulatorInfo(info);
if (model.getSimulator().getSimulator() == s) { continue; }
model.setSimulator(info);
c++;
}
return c;
@@ -253,7 +253,7 @@ namespace BlackMisc
CSimulatorInfo::Simulator s = CSimulatorInfo::None;
for (const CAircraftModel &model : (*this))
{
s |= model.getSimulatorInfo().getSimulator();
s |= model.getSimulator().getSimulator();
if (s == CSimulatorInfo::All) { break; }
}
return CSimulatorInfo(s);
@@ -403,7 +403,7 @@ namespace BlackMisc
CCountPerSimulator count;
for (const CAircraftModel &model : (*this))
{
count.increaseSimulatorCounts(model.getSimulatorInfo());
count.increaseSimulatorCounts(model.getSimulator());
}
return count;
}
@@ -439,6 +439,20 @@ namespace BlackMisc
}
}
CDistributorList CAircraftModelList::getDistributors(bool onlyDbDistributors) const
{
if (this->isEmpty()) { return CDistributorList(); }
CDistributorList distributors;
for (const CAircraftModel &model : *this)
{
const CDistributor d(model.getDistributor());
if (onlyDbDistributors && !d.hasValidDbKey()) { continue; }
if (distributors.contains(d)) { continue; }
distributors.push_back(d);
}
return distributors;
}
void CAircraftModelList::updateAircraftIcao(const CAircraftIcaoCode &icao)
{
for (CAircraftModel &model : *this)