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

Ref T348, updated utility functions in CSimConnectObject/CAircraftCfgEntriesList, also fixed bug that type need to be updated to probe setting when aircraft changes

Browse Source 
Related: Ref T317 Ref T247 Ref T335
This commit is contained in:
Klaus Basan
2018-09-14 00:11:21 +02:00
parent ba7906b0a6
commit 13ebf6bafe
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp
View File

@@ -7,11 +7,12 @@
* contained in the LICENSE file.
*/
#include "blackmisc/predicates.h"
#include "blackmisc/range.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/statusmessagelist.h"
#include "stringutils.h"
#include "blackmisc/predicates.h"
#include "blackmisc/range.h"
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
@@ -26,9 +27,7 @@ namespace BlackMisc
bool CAircraftCfgEntriesList::containsModelWithTitle(const QString &title, Qt::CaseSensitivity caseSensitivity)
{
if (title.isEmpty()) { return false; }
return this->containsBy(
[ = ](const CAircraftCfgEntries & entries) { return title.compare(entries.getTitle(), caseSensitivity) == 0; }
);
return this->containsBy([ = ](const CAircraftCfgEntries & entries) { return title.compare(entries.getTitle(), caseSensitivity) == 0; });
}
QStringList CAircraftCfgEntriesList::detectAmbiguousTitles() const
@@ -58,6 +57,21 @@ namespace BlackMisc
return titles;
}
QString CAircraftCfgEntriesList::getTitlesAsString(bool sorted, const QString &separator) const
{
return this->getTitles(sorted).join(separator);
}
bool CAircraftCfgEntriesList::containsTitle(const QString &title) const
{
if (title.isEmpty()) { return false; }
for (const CAircraftCfgEntries &entries : (*this))
{
if (stringCompare(entries.getTitle(), title, Qt::CaseInsensitive)) { return true; }
}
return false;
}
CAircraftModelList CAircraftCfgEntriesList::toAircraftModelList(bool ignoreDuplicatesAndEmptyModelStrings, CStatusMessageList &msgs) const
{
CAircraftModelList ml;

6
src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h
View File

@@ -49,6 +49,9 @@ namespace BlackMisc
//! All titles (aka model names)
QStringList getTitles(bool sorted = false) const;
//! All titles as string
QString getTitlesAsString(bool sorted, const QString &separator = ", ") const;
//! As aircraft models
BlackMisc::Simulation::CAircraftModelList toAircraftModelList(bool ignoreDuplicatesAndEmptyModelStrings, CStatusMessageList &msgs) const;
@@ -61,6 +64,9 @@ namespace BlackMisc
//! Find by title
CAircraftCfgEntriesList findByTitle(const QString &title, Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive) const;
//! Can check if a title (model string) is known
bool containsTitle(const QString &title) const;
private:
//! Section within file
enum FileSection

2
src/plugins/simulator/fsxcommon/simconnectobject.cpp
View File

@@ -52,6 +52,7 @@ namespace BlackSimPlugin
{
m_aircraft = aircraft;
m_callsignByteArray = aircraft.getCallsignAsString().toLatin1();
m_type = aircraft.isTerrainProbe() ? TerrainProbe : Aircraft;
}
void CSimConnectObject::setAircraftModelString(const QString &modelString)
@@ -327,6 +328,7 @@ namespace BlackSimPlugin
CSimConnectObject CSimConnectObjects::getOldestObject() const
{
if (this->isEmpty()) { return CSimConnectObject(); }
CSimConnectObject oldestSimObj = *this->begin();
for (const CSimConnectObject &simObj : this->values())
{

3
src/plugins/simulator/fsxcommon/simconnectobject.h
View File

@@ -54,6 +54,9 @@ namespace BlackSimPlugin
//! Get callsign
const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_aircraft.getCallsign(); }
//! Get callsign
const QString &getCallsignAsString() const { return m_aircraft.getCallsign().asString(); }
//! Callsign?
bool hasCallsign() const { return !this->getCallsign().isEmpty(); }