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

Ref T275, utility functions to trace request ids

Browse Source
This commit is contained in:
Klaus Basan
2018-06-10 14:45:36 +02:00
parent bf0db64f65
commit bdf58ff538
4 changed files with 87 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/simulation/fsx/simconnectutilities.cpp
View File

@@ -119,12 +119,12 @@ namespace BlackMisc
return n;
}
const QString CSimConnectUtilities::simConnectExceptionToString(const DWORD id)
QString CSimConnectUtilities::simConnectExceptionToString(const DWORD id)
{
return CSimConnectUtilities::resolveEnumToString(id, "SIMCONNECT_EXCEPTION");
}
const QString CSimConnectUtilities::simConnectSurfaceTypeToString(const DWORD type, bool beautify)
QString CSimConnectUtilities::simConnectSurfaceTypeToString(const DWORD type, bool beautify)
{
QString sf = CSimConnectUtilities::resolveEnumToString(type, "SIMCONNECT_SURFACE");
return beautify ? sf.replace('_', ' ') : sf;
@@ -188,6 +188,12 @@ namespace BlackMisc
return iniDir;
}
QString CSimConnectUtilities::simConnectReceiveIdToString(DWORD type)
{
const QString ri = CSimConnectUtilities::resolveEnumToString(type, "SIMCONNECT_RECV_ID");
return ri;
}
int CSimConnectUtilities::lightsToLightStates(const CAircraftLights &lights)
{
int lightMask = 0;

46
src/blackmisc/simulation/fsx/simconnectutilities.h
View File

@@ -90,13 +90,12 @@ namespace BlackMisc
//! Resolve SimConnect exception (based on Qt metadata).
//! \param id enum element
//! \return enum element's name
static const QString simConnectExceptionToString(const DWORD id);
static QString simConnectExceptionToString(const DWORD id);
//! Resolve SimConnect surface (based on Qt metadata).
//! \param type enum element
//! \param beautify remove "_"
//! \return
static const QString simConnectSurfaceTypeToString(const DWORD type, bool beautify = true);
static QString simConnectSurfaceTypeToString(const DWORD type, bool beautify = true);
//! For all P3D and FSX simulators
//! \remark reevaluating directories every time
@@ -200,11 +199,47 @@ namespace BlackMisc
Cabin = 0x0200
};
//! Receive IDs for SimConnect
enum SIMCONNECT_RECV_ID
{
SIMCONNECT_RECV_ID_NULL,
SIMCONNECT_RECV_ID_EXCEPTION,
SIMCONNECT_RECV_ID_OPEN,
SIMCONNECT_RECV_ID_QUIT,
SIMCONNECT_RECV_ID_EVENT,
SIMCONNECT_RECV_ID_EVENT_OBJECT_ADDREMOVE,
SIMCONNECT_RECV_ID_EVENT_FILENAME,
SIMCONNECT_RECV_ID_EVENT_FRAME,
SIMCONNECT_RECV_ID_SIMOBJECT_DATA,
SIMCONNECT_RECV_ID_SIMOBJECT_DATA_BYTYPE,
SIMCONNECT_RECV_ID_WEATHER_OBSERVATION,
SIMCONNECT_RECV_ID_CLOUD_STATE,
SIMCONNECT_RECV_ID_ASSIGNED_OBJECT_ID,
SIMCONNECT_RECV_ID_RESERVED_KEY,
SIMCONNECT_RECV_ID_CUSTOM_ACTION,
SIMCONNECT_RECV_ID_SYSTEM_STATE,
SIMCONNECT_RECV_ID_CLIENT_DATA,
SIMCONNECT_RECV_ID_EVENT_WEATHER_MODE,
SIMCONNECT_RECV_ID_AIRPORT_LIST,
SIMCONNECT_RECV_ID_VOR_LIST,
SIMCONNECT_RECV_ID_NDB_LIST,
SIMCONNECT_RECV_ID_WAYPOINT_LIST,
SIMCONNECT_RECV_ID_EVENT_MULTIPLAYER_SERVER_STARTED,
SIMCONNECT_RECV_ID_EVENT_MULTIPLAYER_CLIENT_STARTED,
SIMCONNECT_RECV_ID_EVENT_MULTIPLAYER_SESSION_ENDED,
SIMCONNECT_RECV_ID_EVENT_RACE_END,
SIMCONNECT_RECV_ID_EVENT_RACE_LAP,
};
Q_ENUM(SIMCONNECT_RECV_ID)
//! Receive id to string
static QString simConnectReceiveIdToString(DWORD type);
//! Lights to states
static int lightsToLightStates(const BlackMisc::Aviation::CAircraftLights &lights);
static int lightsToLightStates(const Aviation::CAircraftLights &lights);
//! Converts the weather at gridPoint to a SimConnect METAR string
static QString convertToSimConnectMetar(const BlackMisc::Weather::CGridPoint &gridPoint);
static QString convertToSimConnectMetar(const Weather::CGridPoint &gridPoint);
//! Get info about SimConnect DLL
static BlackMisc::CWinDllUtils::DLLInfo simConnectDllInfo();
@@ -237,5 +272,6 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::Fsx::CSimConnectUtilities::SIMCONNECT_EXCEPTION)
Q_DECLARE_METATYPE(BlackMisc::Simulation::Fsx::CSimConnectUtilities::SIMCONNECT_SURFACE)
Q_DECLARE_METATYPE(BlackMisc::Simulation::Fsx::CSimConnectUtilities::SIMCONNECT_RECV_ID)
#endif // guard

29
src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp
View File

@@ -20,6 +20,35 @@ namespace BlackSimPlugin
{
namespace FsxCommon
{
const QString &CSimConnectDefinitions::requestToString(Request request)
{
static const QString ownAircraft("RequestOwnAircraft");
static const QString removeAircraft("RequestRemoveAircraft");
static const QString title("RequestOwnAircraftTitle");
static const QString simEnv("RequestSimEnvironment");
static const QString sbData("RequestSbData");
static const QString unknown("unknown");
static const QString end("<end>");
static const QString simdata("range simdata");
static const QString probe("range probe");
static const QString lights("range lights");
switch (request)
{
case RequestOwnAircraft: return ownAircraft;
case RequestRemoveAircraft: return removeAircraft;
case RequestOwnAircraftTitle: return title;
case RequestSimEnvironment: return simEnv;
case RequestSbData: return sbData;
case RequestRangeForLights: return lights;
case RequestRangeForProbe: return probe;
case RequestRangeForSimData: return simdata;
case RequestEndMarker: return end;
default: break;
}
return unknown;
}
CSimConnectDefinitions::CSimConnectDefinitions() { }
HRESULT CSimConnectDefinitions::initDataDefinitionsWhenConnected(const HANDLE hSimConnect)

12
src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
View File

@@ -140,7 +140,7 @@ namespace BlackSimPlugin
double cgToGroundFt; //!< Static CG to ground (ft)
//! Above ground ft
double aboveGround() const { return altitudeFt - elevationFt; }
double aboveGroundFt() const { return altitudeFt - elevationFt; }
};
//! Data struct simulator environment
@@ -208,10 +208,16 @@ namespace BlackSimPlugin
RequestRemoveAircraft,
RequestOwnAircraftTitle,
RequestSimEnvironment,
RequestSbData, //!< SB client area / XPDR mode
RequestEndMarker //!< free request ids can start here
RequestSbData, //!< SB client area / XPDR mode
RequestRangeForSimData, //!< range for sim data
RequestRangeForProbe, //!< range for probe
RequestRangeForLights, //!< range for lights
RequestEndMarker //!< free request ids can start here
};
//! Request to string
static const QString &requestToString(Request request);
//! Constructor
CSimConnectDefinitions();