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

Style

Browse Source
This commit is contained in:
Klaus Basan
2019-08-28 01:07:08 +02:00
parent 2b8dc0bef6
commit ce57af5a3d
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ namespace BlackCore
bool CContextSimulator::setSimulatorSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator) bool CContextSimulator::setSimulatorSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator)
{ {
if (!simulator.isSingleSimulator()) { return false; } if (!simulator.isSingleSimulator()) { return false; }
CSimulatorSettings simSettings = m_multiSimulatorSettings.getSettings(simulator); const CSimulatorSettings simSettings = m_multiSimulatorSettings.getSettings(simulator);
if (simSettings == settings) { return false; } if (simSettings == settings) { return false; }
const CStatusMessage msg = m_multiSimulatorSettings.setSettings(settings, simulator); const CStatusMessage msg = m_multiSimulatorSettings.setSettings(settings, simulator);
CLogMessage::preformatted(msg); CLogMessage::preformatted(msg);
@@ -637,15 +637,15 @@ namespace BlackCore
// in the first step we already tried to find accurate ICAO codes etc. // in the first step we already tried to find accurate ICAO codes etc.
// coming from CAirspaceMonitor::sendReadyForModelMatching // coming from CAirspaceMonitor::sendReadyForModelMatching
MatchingLog whatToLog = m_logMatchingMessages; MatchingLog whatToLog = m_logMatchingMessages;
const CSimulatorSettings simSettings = this->getSimulatorSettings();
CStatusMessageList matchingMessages; CStatusMessageList matchingMessages;
CStatusMessageList *pMatchingMessages = m_logMatchingMessages > 0 ? &matchingMessages : nullptr; CStatusMessageList *pMatchingMessages = m_logMatchingMessages > 0 ? &matchingMessages : nullptr;
CAircraftModel aircraftModel = m_aircraftMatcher.getClosestMatch(remoteAircraft, whatToLog, pMatchingMessages, true); CAircraftModel aircraftModel = m_aircraftMatcher.getClosestMatch(remoteAircraft, whatToLog, pMatchingMessages, true);
Q_ASSERT_X(remoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "Mismatching callsigns"); Q_ASSERT_X(remoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "Mismatching callsigns");
// decide CG // decide CG
CLength cgModel = aircraftModel.getCG(); const CLength cgModel = aircraftModel.getCG();
CLength cgSim = m_simulatorPlugin.second->getSimulatorCGPerModelString(aircraftModel.getModelString()); const CLength cgSim = m_simulatorPlugin.second->getSimulatorCGPerModelString(aircraftModel.getModelString());
const CSimulatorSettings simSettings = this->getSimulatorSettings();
switch (simSettings.getCGSource()) switch (simSettings.getCGSource())
{ {
case CSimulatorSettings::CGFromSimulatorOnly: case CSimulatorSettings::CGFromSimulatorOnly:
@@ -657,8 +657,9 @@ namespace BlackCore
case CSimulatorSettings::CGFromDBFirst: case CSimulatorSettings::CGFromDBFirst:
if (cgModel.isNull()) { aircraftModel.setCG(cgSim); } if (cgModel.isNull()) { aircraftModel.setCG(cgSim); }
break; break;
case CSimulatorSettings::CGFromDBOnly: // case CSimulatorSettings::CGFromDBOnly:
default: break; default:
break; // leave CG from model alone
} }
// model in provider // model in provider

6
src/blackmisc/simulation/settings/simulatorsettings.cpp
View File

@@ -38,9 +38,9 @@ namespace BlackMisc
switch (source) switch (source)
{ {
case CGFromSimulatorFirst: return sf; case CGFromSimulatorFirst: return sf;
case CGFromDBFirst: return dbf; case CGFromDBFirst: return dbf;
case CGFromSimulatorOnly: return so; case CGFromSimulatorOnly: return so;
case CGFromDBOnly: return dbo; case CGFromDBOnly: return dbo;
default: break; default: break;
} }
static const QString u("unknown"); static const QString u("unknown");

2
src/blackmisc/simulation/settings/simulatorsettings.h
View File

@@ -19,8 +19,8 @@
#include "blackmisc/settingscache.h" #include "blackmisc/settingscache.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/directoryutils.h" #include "blackmisc/directoryutils.h"
#include "blackmisc/blackmiscexport.h"
#include <QStringList> #include <QStringList>
#include <QObject> #include <QObject>