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

refs #614, allow to merge own models with vPilot rules (this can be used if no DB data are available yet)

Browse Source 
* menus
* utility functions
This commit is contained in:
Klaus Basan
2016-03-29 09:32:31 +02:00
parent a1d6492ff2
commit b1c32dac10
12 changed files with 186 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -256,9 +256,9 @@ namespace BlackMisc
m_livery.setAirlineIcaoCode(airlineIcaoCode);
}
bool CAircraftModel::hasAircraftAndAirlineDesignator() const
bool CAircraftModel::hasValidAircraftAndAirlineDesignator() const
{
return this->m_aircraftIcao.hasDesignator() && this->m_livery.hasValidAirlineDesignator();
return this->hasKnownAircraftDesignator() && this->m_livery.hasValidAirlineDesignator();
}
bool CAircraftModel::hasAircraftDesignator() const

4
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -152,8 +152,8 @@ namespace BlackMisc
//! Set ICAO codes
void setAircraftIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode);
//! Airline and aircraft designator?
bool hasAircraftAndAirlineDesignator() const;
//! Valid airline and aircraft designator?
bool hasValidAircraftAndAirlineDesignator() const;
//! Has aircraft designator?
bool hasAircraftDesignator() const;

37
src/blackmisc/simulation/aircraftmodelloader.cpp
View File

@@ -39,46 +39,23 @@ namespace BlackMisc
return dir.exists();
}
bool IAircraftModelLoader::mergeWithDbData(CAircraftModelList &modelsFromSimulator, const CAircraftModelList &dbModels, bool force)
{
if (dbModels.isEmpty() || modelsFromSimulator.isEmpty()) { return false; }
for (CAircraftModel &simModel : modelsFromSimulator)
{
if (!force && simModel.hasValidDbKey()) { continue; } // already done
CAircraftModel dbModel(dbModels.findFirstByModelStringOrDefault(simModel.getModelString()));
if (!dbModel.hasValidDbKey())
{
continue; // not found
}
dbModel.updateMissingParts(simModel, false);
simModel = dbModel;
}
return true;
}
CStatusMessage IAircraftModelLoader::setModelsInCache(const CAircraftModelList &models, const CSimulatorInfo &simulator)
CStatusMessage IAircraftModelLoader::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->m_simulatorInfo;
if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); }
const CStatusMessage m(this->m_caches.setModels(models, sim));
if (m.isSeverityInfoOrLess())
{
// set is asynchronous
// emit loadingFinished(true, sim);
}
return m;
return this->m_caches.setCachedModels(models, sim);
}
CStatusMessage IAircraftModelLoader::replaceOrAddModelsInCache(const CAircraftModelList &models, const CSimulatorInfo &simulator)
CStatusMessage IAircraftModelLoader::replaceOrAddCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
if (models.isEmpty()) { return CStatusMessage(this, CStatusMessage::SeverityInfo, "No data"); }
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->m_simulatorInfo;
if (!sim.isSingleSimulator()) { return CStatusMessage(this, CStatusMessage::SeverityError, "Invalid simuataor"); }
CAircraftModelList allModels(this->m_caches.getModels(sim));
CAircraftModelList allModels(this->m_caches.getCachedModels(sim));
int c = allModels.replaceOrAddModelsWithString(models, Qt::CaseInsensitive);
if (c > 0)
{
return this->setModelsInCache(models, sim);
return this->setCachedModels(allModels, sim);
}
else
{
@@ -186,8 +163,8 @@ namespace BlackMisc
if (simInfo.xplane())
{
loader = std::make_unique<CAircraftModelLoaderXPlane>(
CSimulatorInfo(CSimulatorInfo::XPLANE),
CXPlaneUtil::xplaneRootDir());
CSimulatorInfo(CSimulatorInfo::XPLANE),
CXPlaneUtil::xplaneRootDir());
}
else
{

15
src/blackmisc/simulation/aircraftmodelloader.h
View File

@@ -92,20 +92,25 @@ namespace BlackMisc
//! Shutdown
void gracefulShutdown();
//! \name Implementations of the models interfaces
//! @{
virtual void setModels(const CAircraftModelList &models) override { this->setCachedModels(models, this->m_simulatorInfo); }
virtual void updateModels(const CAircraftModelList &models) override { this->replaceOrAddCachedModels(models, this->m_simulatorInfo); }
virtual void setModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { this->setCachedModels(models, simulator); }
virtual void updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { this->replaceOrAddCachedModels(models, simulator); }
//! @}
//! Create a loader and syncronize caches
static std::unique_ptr<IAircraftModelLoader> createModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simInfo);
//! Merge with DB data if possible
static bool mergeWithDbData(BlackMisc::Simulation::CAircraftModelList &modelsFromSimulator, const BlackMisc::Simulation::CAircraftModelList &dbModels, bool force = false);
public slots:
//! Set cache from outside, this should only be used in special cases.
//! But it allows to modify data elsewhere and update the cache with manipulated data.
BlackMisc::CStatusMessage setModelsInCache(const CAircraftModelList &models, const CSimulatorInfo &simulator = CSimulatorInfo());
BlackMisc::CStatusMessage setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator = CSimulatorInfo());
//! Set cache from outside, this should only be used in special cases.
//! But it allows to modify data elsewhere and update the cache with manipulated data.
BlackMisc::CStatusMessage replaceOrAddModelsInCache(const CAircraftModelList &models, const CSimulatorInfo &simulator = CSimulatorInfo());
BlackMisc::CStatusMessage replaceOrAddCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator = CSimulatorInfo());
signals:
//! Parsing is finished

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

@@ -82,6 +82,16 @@ namespace BlackMisc
return fsx() && fs9() && xplane() && p3d();
}
bool CSimulatorInfo::isMicrosoftSimulator() const
{
return fsx() || fs9();
}
bool CSimulatorInfo::isMicrosoftOrPrepare3DSimulator() const
{
return isMicrosoftSimulator() || p3d();
}
int CSimulatorInfo::numberSimulators() const
{
int c = fs9() ? 1 : 0;

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

@@ -92,6 +92,12 @@ namespace BlackMisc
//! Is all simulators?
bool isAllSimulators() const;
//! Microsoft Simulator?
bool isMicrosoftSimulator() const;
//! Microsoft Simulator or P3D?
bool isMicrosoftOrPrepare3DSimulator() const;
//! Number simulators selected
int numberSimulators() const;