flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +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
committed by Mat Sutcliffe
parent f8c73c772a
commit 083293c016
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)
{
if (!simulator.isSingleSimulator()) { return false; }
CSimulatorSettings simSettings = m_multiSimulatorSettings.getSettings(simulator);
const CSimulatorSettings simSettings = m_multiSimulatorSettings.getSettings(simulator);
if (simSettings == settings) { return false; }
const CStatusMessage msg = m_multiSimulatorSettings.setSettings(settings, simulator);
CLogMessage::preformatted(msg);
@@ -637,15 +637,15 @@ namespace BlackCore
// in the first step we already tried to find accurate ICAO codes etc.
// coming from CAirspaceMonitor::sendReadyForModelMatching
MatchingLog whatToLog = m_logMatchingMessages;
const CSimulatorSettings simSettings = this->getSimulatorSettings();
CStatusMessageList matchingMessages;
CStatusMessageList *pMatchingMessages = m_logMatchingMessages > 0 ? &matchingMessages : nullptr;
CAircraftModel aircraftModel = m_aircraftMatcher.getClosestMatch(remoteAircraft, whatToLog, pMatchingMessages, true);
Q_ASSERT_X(remoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "Mismatching callsigns");
// decide CG
CLength cgModel = aircraftModel.getCG();
CLength cgSim = m_simulatorPlugin.second->getSimulatorCGPerModelString(aircraftModel.getModelString());
const CLength cgModel = aircraftModel.getCG();
const CLength cgSim = m_simulatorPlugin.second->getSimulatorCGPerModelString(aircraftModel.getModelString());
const CSimulatorSettings simSettings = this->getSimulatorSettings();
switch (simSettings.getCGSource())
{
case CSimulatorSettings::CGFromSimulatorOnly:
@@ -657,8 +657,9 @@ namespace BlackCore
case CSimulatorSettings::CGFromDBFirst:
if (cgModel.isNull()) { aircraftModel.setCG(cgSim); }
break;
case CSimulatorSettings::CGFromDBOnly:
default: break;
// case CSimulatorSettings::CGFromDBOnly:
default:
break; // leave CG from model alone
}
// model in provider

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

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

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

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