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

refs #808, CSimulatorInternals

Browse Source 
* renamed from CSimulatorSetup to CSimulatorInternals
* removed the FSX class, no longer needed
* utility functions for CNameVariantPair
This commit is contained in:
Klaus Basan
2016-11-17 04:39:19 +01:00
parent e9f52bb829
commit 2163fd9b01
21 changed files with 100 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/simulation/simulatorsetup.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include "blackmisc/weather/weathergrid.h"
#include <QObject>
@@ -133,7 +133,7 @@ namespace BlackCore
ISimulator::SimulatorStatus getSimulatorStatusEnum() const;
//! Simulator setup
virtual BlackMisc::Simulation::CSimulatorSetup getSimulatorSetup() const = 0;
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const = 0;
//! Airports in range
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const = 0;

6
src/blackcore/context/contextsimulatorempty.h
View File

@@ -110,11 +110,11 @@ namespace BlackCore
return 0;
}
//! \copydoc IContextSimulator::getSimulatorSetup
virtual BlackMisc::Simulation::CSimulatorSetup getSimulatorSetup() const override
//! \copydoc IContextSimulator::getSimulatorInternals
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Simulation::CSimulatorSetup();
return BlackMisc::Simulation::CSimulatorInternals();
}
//! \copydoc IContextSimulator::setTimeSynchronization

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

@@ -121,16 +121,16 @@ namespace BlackCore
return m_simulatorPlugin.first;
}
CSimulatorSetup CContextSimulator::getSimulatorSetup() const
CSimulatorInternals CContextSimulator::getSimulatorInternals() const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
if (m_simulatorPlugin.first.isUnspecified())
{
return BlackMisc::Simulation::CSimulatorSetup();
return BlackMisc::Simulation::CSimulatorInternals();
}
Q_ASSERT(m_simulatorPlugin.second);
return m_simulatorPlugin.second->getSimulatorSetup();
return m_simulatorPlugin.second->getSimulatorInternals();
}
CAirportList CContextSimulator::getAirportsInRange() const

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

@@ -31,7 +31,7 @@
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/simulation/simulatorsetup.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include "blackmisc/simulation/simulationsettings.h"
#include "blackmisc/worker.h"
@@ -80,7 +80,7 @@ namespace BlackCore
virtual bool startSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
virtual void stopSimulatorPlugin(const BlackMisc::Simulation::CSimulatorPluginInfo &simulatorInfo) override;
virtual int getSimulatorStatus() const override;
virtual BlackMisc::Simulation::CSimulatorSetup getSimulatorSetup() const override;
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
virtual BlackMisc::Simulation::CAircraftModelList getModelSet() const override;
virtual QStringList getModelSetStrings() const override;

4
src/blackcore/context/contextsimulatorproxy.cpp
View File

@@ -114,9 +114,9 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatorPluginInfo>(QLatin1Literal("getSimulatorPluginInfo"));
}
CSimulatorSetup CContextSimulatorProxy::getSimulatorSetup() const
CSimulatorInternals CContextSimulatorProxy::getSimulatorInternals() const
{
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatorSetup>(QLatin1Literal("getSimulatorSetup"));
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatorInternals>(QLatin1Literal("getSimulatorInternals"));
}
bool CContextSimulatorProxy::setTimeSynchronization(bool enable, const CTime &offset)

4
src/blackcore/context/contextsimulatorproxy.h
View File

@@ -22,7 +22,7 @@
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorplugininfolist.h"
#include "blackmisc/simulation/simulatorsetup.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include <QObject>
#include <QString>
@@ -64,7 +64,7 @@ namespace BlackCore
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString modelString) const override;
virtual int getModelSetCount() const override;
virtual BlackMisc::Simulation::CSimulatorSetup getSimulatorSetup() const override;
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
virtual bool isTimeSynchronized() const override;
virtual BlackMisc::CInterpolationAndRenderingSetup getInterpolationAndRenderingSetup() const override;

4
src/blackcore/simulator.h
View File

@@ -36,7 +36,7 @@ namespace BlackMisc
namespace Network { class CTextMessage; }
namespace Simulation
{
class CSimulatorSetup;
class CSimulatorInternals;
class IOwnAircraftProvider;
class IRemoteAircraftProvider;
}
@@ -79,7 +79,7 @@ namespace BlackCore
virtual const BlackMisc::Simulation::CSimulatorPluginInfo &getSimulatorPluginInfo() const = 0;
//! Get the setup (simulator environemnt)
virtual const BlackMisc::Simulation::CSimulatorSetup &getSimulatorSetup() const = 0;
virtual const BlackMisc::Simulation::CSimulatorInternals &getSimulatorInternals() const = 0;
//! Connect to simulator
virtual bool connectTo() = 0;

2
src/blackcore/simulatorcommon.cpp
View File

@@ -238,7 +238,7 @@ namespace BlackCore
return m_simulatorPluginInfo;
}
const CSimulatorSetup &CSimulatorCommon::getSimulatorSetup() const
const CSimulatorInternals &CSimulatorCommon::getSimulatorInternals() const
{
return m_simulatorSetup;
}

6
src/blackcore/simulatorcommon.h
View File

@@ -31,7 +31,7 @@
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/simulatorsetup.h"
#include "blackmisc/simulation/simulatorinternals.h"
#include "blackmisc/weather/weathergridprovider.h"
namespace BlackMisc
@@ -76,7 +76,7 @@ namespace BlackCore
virtual BlackMisc::CInterpolationAndRenderingSetup getInterpolationAndRenderingSetup() const override;
virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) override;
virtual const BlackMisc::Simulation::CSimulatorPluginInfo &getSimulatorPluginInfo() const override;
virtual const BlackMisc::Simulation::CSimulatorSetup &getSimulatorSetup() const override;
virtual const BlackMisc::Simulation::CSimulatorInternals &getSimulatorInternals() const override;
virtual void unload() override;
virtual int physicallyRemoveMultipleRemoteAircraft(const BlackMisc::Aviation::CCallsignSet &callsigns) override;
//! @}
@@ -137,7 +137,7 @@ namespace BlackCore
BlackMisc::IInterpolator *m_interpolator = nullptr; //!< interpolator instance
bool m_pausedSimFreezesInterpolation = false; //!< paused simulator will also pause interpolation (so AI aircraft will hold)
BlackMisc::Simulation::CSimulatorSetup m_simulatorSetup; //!< setup object
BlackMisc::Simulation::CSimulatorInternals m_simulatorSetup; //!< setup object
BlackMisc::CInterpolationAndRenderingSetup m_interpolationRenderingSetup; //!< debug messages, rendering etc.
BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< default model
qint64 m_statsUpdateAircraftTimeTotalMs = 0; //!< statistics update time