flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:17:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #720, adjusted model loader

Browse Source 
* callback function to data consolidation (so I can refer to consolidation in BlackCore)
* use status message in parser
* avoid duplicate keys (WOAI has ambiguous model strings which are to be excluded)
This commit is contained in:
Klaus Basan
2016-08-09 01:33:32 +02:00
committed by Mathew Sutcliffe
parent d75b105ee3
commit 019b623f43
8 changed files with 90 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/simulation/fscommon/aircraftcfgparser.h
View File

@@ -30,7 +30,6 @@ class QSettings;
namespace BlackMisc
{
class CWorker;
namespace Simulation
{
namespace FsCommon
@@ -62,7 +61,7 @@ namespace BlackMisc
protected:
//! \name Interface functions
//! @{
virtual void startLoadingFromDisk(LoadMode mode, const BlackMisc::Simulation::CAircraftModelList &dbModels) override;
virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation) override;
//! @}
private slots:
@@ -80,7 +79,9 @@ namespace BlackMisc
//! Perform the parsing
//! \threadsafe
CAircraftCfgEntriesList performParsing(const QString &directory, const QStringList &excludeDirectories, bool *ok);
CAircraftCfgEntriesList performParsing(
const QString &directory, const QStringList &excludeDirectories,
BlackMisc::CStatusMessageList &messages, bool *ok);
//! Fix the content read
static QString fixedStringContent(const QVariant &qv);
@@ -94,11 +95,11 @@ namespace BlackMisc
//! Files to be used
static const QString &fileFilter();
CAircraftCfgEntriesList m_parsedCfgEntriesList; //!< parsed entries
QPointer<BlackMisc::CWorker> m_parserWorker; //!< worker will destroy itself, so weak pointer
CAircraftCfgEntriesList m_parsedCfgEntriesList; //!< parsed entries
QPointer<BlackMisc::CWorker> m_parserWorker; //!< worker will destroy itself, so weak pointer
};
} // namespace
} // namespace
} // namespace
} // ns
} // ns
} // ns
#endif // guard