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

Move aircraft matching out of simulator plugins

Browse Source 
All model matching will be done simulator independent in
CContextSimulator. The simulator specific part is kept in the model
set.
This also caused the signal modelMatchingCompleted to be renamed to
aircraftRenderingChanged, since the name wasn't accurate anymore.
Both getInstalledModels(), getInstalledModelsCount() and iconForModel()
were removed from the ISimulator interface.

refs #765
This commit is contained in:
Roland Winklmeier
2016-09-11 20:18:26 +02:00
parent 079c790aa7
commit fb3df51013
14 changed files with 98 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/context/contextsimulator.h
View File

@@ -96,6 +96,9 @@ namespace BlackCore
//! A single model has been matched for given aircraft
void modelMatchingCompleted(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Aircraft rendering changed
void aircraftRenderingChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
//! Emitted when own aircraft model changes
void ownAircraftModelChanged(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);

32
src/blackcore/context/contextsimulatorimpl.cpp
View File

@@ -149,7 +149,7 @@ namespace BlackCore
}
Q_ASSERT(m_simulatorPlugin.second);
return m_simulatorPlugin.second->getInstalledModels();
return m_modelMatcher.getModelSet();
}
int CContextSimulator::getInstalledModelsCount() const
@@ -158,7 +158,7 @@ namespace BlackCore
if (m_simulatorPlugin.first.isUnspecified()) { return 0; }
Q_ASSERT(m_simulatorPlugin.second);
return m_simulatorPlugin.second->getInstalledModels().size();
return getInstalledModels().size();
}
CAircraftModelList CContextSimulator::getInstalledModelsStartingWith(const QString modelString) const
@@ -170,7 +170,7 @@ namespace BlackCore
}
Q_ASSERT(m_simulatorPlugin.second);
return m_simulatorPlugin.second->getInstalledModels().findModelsStartingWith(modelString);
return getInstalledModels().findModelsStartingWith(modelString);
}
void CContextSimulator::reloadInstalledModels()
@@ -350,11 +350,17 @@ namespace BlackCore
ISimulator *simulator = factory->create(simulatorPluginInfo, ownAircraftProvider, renderedAircraftProvider, &m_weatherManager);
Q_ASSERT_X(simulator, Q_FUNC_INFO, "no simulator driver can be created");
setRemoteAircraftProvider(renderedAircraftProvider);
const CSimulatorInfo simInfo(simulatorPluginInfo.getIdentifier());
m_modelSetLoader.changeSimulator(simInfo);
m_modelMatcher.setModelSet(m_modelSetLoader.getAircraftModels());
m_modelMatcher.setDefaultModel(simulator->getDefaultModel());
bool c = connect(simulator, &ISimulator::simulatorStatusChanged, this, &CContextSimulator::ps_onSimulatorStatusChanged);
Q_ASSERT(c);
c = connect(simulator, &ISimulator::ownAircraftModelChanged, this, &IContextSimulator::ownAircraftModelChanged);
Q_ASSERT(c);
c = connect(simulator, &ISimulator::modelMatchingCompleted, this, &IContextSimulator::modelMatchingCompleted);
c = connect(simulator, &ISimulator::aircraftRenderingChanged, this, &IContextSimulator::aircraftRenderingChanged);
Q_ASSERT(c);
c = connect(simulator, &ISimulator::installedAircraftModelsChanged, this, &IContextSimulator::installedAircraftModelsChanged);
Q_ASSERT(c);
@@ -476,7 +482,13 @@ namespace BlackCore
if (!isSimulatorSimulating()) { return; }
Q_ASSERT(!remoteAircraft.getCallsign().isEmpty());
m_simulatorPlugin.second->logicallyAddRemoteAircraft(remoteAircraft);
CCallsign callsign = remoteAircraft.getCallsign();
CAircraftModel aircraftModel = m_modelMatcher.getClosestMatch(remoteAircraft);
Q_ASSERT_X(remoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "mismatching callsigns");
updateAircraftModel(callsign, aircraftModel, identifier());
CSimulatedAircraft aircraftAfterModelApplied = getAircraftInRangeForCallsign(remoteAircraft.getCallsign());
m_simulatorPlugin.second->logicallyAddRemoteAircraft(aircraftAfterModelApplied);
emit modelMatchingCompleted(remoteAircraft);
}
void CContextSimulator::ps_removedRemoteAircraft(const CCallsign &callsign)
@@ -500,7 +512,7 @@ namespace BlackCore
for (const CSimulatedAircraft &simulatedAircraft : aircrafts)
{
Q_ASSERT(!simulatedAircraft.getCallsign().isEmpty());
m_simulatorPlugin.second->logicallyAddRemoteAircraft(simulatedAircraft);
ps_addRemoteAircraft(simulatedAircraft);
}
m_initallyAddAircrafts = false;
}
@@ -569,7 +581,13 @@ namespace BlackCore
{
if (m_simulatorPlugin.first.isUnspecified()) { return CPixmap(); }
Q_ASSERT_X(m_simulatorPlugin.second, Q_FUNC_INFO, "Missing simulator");
return m_simulatorPlugin.second->iconForModel(modelString);
const CAircraftModel model(this->m_modelSetLoader.getModelForModelString(modelString));
// load from file
CStatusMessage msg;
const CPixmap pm(model.loadIcon(msg));
if (!msg.isEmpty()) { CLogMessage::preformatted(msg);}
return pm;
}
void CContextSimulator::enableDebugMessages(bool driver, bool interpolator)

7
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -12,6 +12,7 @@
#ifndef BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
#define BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
#include "blackcore/aircraftmatcher.h"
#include "blackcore/blackcoreexport.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/corefacadeconfig.h"
@@ -25,6 +26,8 @@
#include "blackmisc/pq/time.h"
#include "blackmisc/settingscache.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/aircraftmodelsetloader.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/simulation/simulatorsetup.h"
@@ -52,6 +55,7 @@ namespace BlackCore
//! Network simulator concrete implementation
class BLACKCORE_EXPORT CContextSimulator :
public IContextSimulator,
public BlackMisc::Simulation::CRemoteAircraftAware, // gain access to in memory remote aircraft data
public BlackMisc::CIdentifiable
{
Q_OBJECT
@@ -209,6 +213,9 @@ namespace BlackCore
BlackCore::CWeatherManager m_weatherManager { this };
BlackMisc::CSetting<BlackCore::Application::TEnabledSimulators> m_enabledSimulators { this, &CContextSimulator::restoreSimulatorPlugins };
bool m_initallyAddAircrafts = false;
BlackCore::CAircraftMatcher m_modelMatcher; //!< Model matcher
BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { this }; //!< load model set from caches
};
} // namespace
} // namespace