flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-14 19:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Just typos and formatting

Browse Source
This commit is contained in:
Klaus Basan
2016-10-23 18:32:35 +02:00
parent ff3f04f74c
commit fc65deb778
7 changed files with 34 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/modelsetbuilder.cpp
View File

@@ -28,14 +28,14 @@ namespace BlackCore
// void
}
CAircraftModelList CModelSetBuilder::buildModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &models, const CAircraftModelList &currentSet, Builder oprions, const CDistributorList &distributors) const
CAircraftModelList CModelSetBuilder::buildModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &models, const CAircraftModelList &currentSet, Builder options, const CDistributorList &distributors) const
{
if (models.isEmpty()) { return CAircraftModelList(); }
CAircraftModelList modelSet;
// Select by distributor:
// I avoid an empty distributor set because it wipes out everything
if (oprions.testFlag(GivenDistributorsOnly) && !distributors.isEmpty())
if (options.testFlag(GivenDistributorsOnly) && !distributors.isEmpty())
{
modelSet = models.findByDistributors(distributors);
}
@@ -45,11 +45,11 @@ namespace BlackCore
}
// Only DB data?
if (oprions.testFlag(OnlyDbData))
if (options.testFlag(OnlyDbData))
{
modelSet.removeObjectsWithoutDbKey();
}
else if (oprions.testFlag(OnlyDbIcaoCodes))
else if (options.testFlag(OnlyDbIcaoCodes))
{
Q_ASSERT_X(sApp->hasWebDataServices(), Q_FUNC_INFO, "No web data services");
const QSet<QString> designators(sApp->getWebDataServices()->getAircraftIcaoCodes().allIcaoCodes());
@@ -65,7 +65,7 @@ namespace BlackCore
modelSet = modelSet.matchesSimulator(simulator);
modelSet.setModelMode(CAircraftModel::Include); // in sets we only include, exclude means not present in set
if (oprions.testFlag(Incremental))
if (options.testFlag(Incremental))
{
if (!currentSet.isEmpty())
{
@@ -78,14 +78,14 @@ namespace BlackCore
// sort by preferences if applicable
modelSet.resetOrder();
if (oprions.testFlag(SortByDistributors))
if (options.testFlag(SortByDistributors))
{
modelSet.updateDistributorOrder(distributors);
modelSet.sortBy(&CAircraftModel::getDistributorOrder);
}
// DB consolidation
if (oprions.testFlag(ConsolidateWithDb))
if (options.testFlag(ConsolidateWithDb))
{
CDatabaseUtils::consolidateModelsWithDbData(modelSet, true);
}

2
src/blackcore/modelsetbuilder.h
View File

@@ -51,7 +51,7 @@ namespace BlackCore
BlackMisc::Simulation::CAircraftModelList buildModelSet(
const BlackMisc::Simulation::CSimulatorInfo &simulator,
const BlackMisc::Simulation::CAircraftModelList &models,
const BlackMisc::Simulation::CAircraftModelList &currentSet, Builder oprions,
const BlackMisc::Simulation::CAircraftModelList &currentSet, Builder options,
const BlackMisc::Simulation::CDistributorList &distributors = {}) const;
};
} // ns

1
src/blackcore/simulatorcommon.cpp
View File

@@ -372,5 +372,4 @@ namespace BlackCore
{
Q_UNUSED(callsign);
}
} // namespace

1
src/blackgui/models/simulatedaircraftlistmodel.cpp
View File

@@ -67,6 +67,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn("gs.", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundspeed }, new CAircraftSpeedFormatter()));
this->m_columns.addColumn(CColumn::standardString("icao", "icao and livery info", { CSimulatedAircraft::IndexCombinedIcaoLiveryString}));
// icon column for airline
CColumn col("airline", { CSimulatedAircraft::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexIcon });
col.setSortPropertyIndex({ CSimulatedAircraft::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator});
this->m_columns.addColumn(col);

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

@@ -26,17 +26,11 @@ namespace BlackMisc
{
CSimConnectUtilities::CSimConnectUtilities() { }
//
// Filename / path of a "local" SimConnect.cfg file
//
QString CSimConnectUtilities::getLocalSimConnectCfgFilename()
{
return QCoreApplication::applicationDirPath() + "/SimConnect.cfg";
}
//
// Create a very simple SimConnect.cfg
//
bool CSimConnectUtilities::writeSimConnectCfg(const QString &fileName, const QString &ip, int port)
{
QString sc = CSimConnectUtilities::simConnectCfg(ip, port);
@@ -51,9 +45,6 @@ namespace BlackMisc
return success;
}
//
// simconnect.cfg file
//
QString CSimConnectUtilities::simConnectCfg(const QString &ip, int port)
{
QString sc = QString("[SimConnect]\nProtocol=Ipv4\nAddress=%1\nPort=%2\n"
@@ -61,30 +52,20 @@ namespace BlackMisc
return sc;
}
//
// Resolve enum id to string
// http://labs.qt.nokia.com/2008/10/09/coding-tip-pretty-printing-enum-values/
//
const QString CSimConnectUtilities::resolveEnumToString(const DWORD id, const char *enumName)
{
int i = CSimConnectUtilities::staticMetaObject.indexOfEnumerator(enumName);
if (i < 0) return QString("No enumerator for %1").arg(enumName);
QMetaEnum m = CSimConnectUtilities::staticMetaObject.enumerator(i);
const QMetaEnum m = CSimConnectUtilities::staticMetaObject.enumerator(i);
const char *k = m.valueToKey(id);
return (k) ? QLatin1String(k) : QString("Id %1 not found for %2").arg(id).arg(enumName);
}
//
// Exception id to something human readible
//
const QString CSimConnectUtilities::simConnectExceptionToString(const DWORD id)
{
return CSimConnectUtilities::resolveEnumToString(id, "SIMCONNECT_EXCEPTION");
}
//
// The surface types
//
const QString CSimConnectUtilities::simConnectSurfaceTypeToString(const DWORD type, bool beautify)
{
QString sf = CSimConnectUtilities::resolveEnumToString(type, "SIMCONNECT_SURFACE");

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

@@ -1,5 +1,5 @@
/* Copyright (C) 2013
* swift Project Community / Contributors
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
@@ -47,36 +47,28 @@ namespace BlackMisc
//! Path to local config file
static QString getLocalSimConnectCfgFilename();
/*!
* Content for FSX simconnect.cfg file
* \param ip IP address of FSX
* \param port Port of FSX (e.g. 500)
* \return content for simconnect.cfg
*/
//! Content for FSX simconnect.cfg file
//! \param ip IP address of FSX
//! \param port Port of FSX (e.g. 500)
//! \return content for simconnect.cfg
static QString simConnectCfg(const QString &ip, int port = 500);
/*!
* Create a FSX simconnect.cfg file
* \param fileName and path
* \param ip IP address of FSX
* \param port Port of FSX (e.g. 500)
* \return success
*/
//! Create a FSX simconnect.cfg file
//! \param fileName and path
//! \param ip IP address of FSX
//! \param port Port of FSX (e.g. 500)
//! \return success
static bool writeSimConnectCfg(const QString &fileName, const QString &ip, int port = 500);
/*!
* Resolve SimConnect exception (based on Qt metadata).
* \param id enum element
* \return enum element's name
*/
//! Resolve SimConnect exception (based on Qt metadata).
//! \param id enum element
//! \return enum element's name
static const QString simConnectExceptionToString(const DWORD id);
/*!
* Resolve SimConnect surface (based on Qt metadata).
* \param type enum element
* \param beautify remove "_"
* \return
*/
//! 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);
//! SimConnect surfaces.
@@ -157,12 +149,11 @@ namespace BlackMisc
static void registerMetadata();
private:
/*!
* Resolve enum value to its cleartext (based on Qt metadata).
* \param id enum element
* \param enumName name of the resolved enum
* \return enum element's name
*/
//!
//! Resolve enum value to its cleartext (based on Qt metadata).
//! \param id enum element
//! \param enumName name of the resolved enum
//! \return enum element's name
static const QString resolveEnumToString(const DWORD id, const char *enumName);
//! Hidden constructor

4
src/blackmisc/weather/metardecoder.cpp
View File

@@ -84,7 +84,7 @@ namespace BlackMisc
}
while (isRepeatable());
if (!isValid) { CLogMessage(this).debug() << "Failed to match" << getDecoderType() << "in remaining metar:" << metarString; }
if (!isValid) { CLogMessage(this).debug() << "Failed to match" << getDecoderType() << "in remaining METAR:" << metarString; }
return isValid;
}
};
@@ -926,7 +926,7 @@ namespace BlackMisc
{
if (!decoder->parse(metarStringCopy, metar))
{
CLogMessage(this).debug() << "Invalid metar:" << metarString;
CLogMessage(this).debug() << "Invalid METAR:" << metarString;
return CMetar();
}
}