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

refs #889, log categories

Browse Source
This commit is contained in:
Klaus Basan
2017-02-25 16:34:31 +01:00
committed by Mathew Sutcliffe
parent 2c2a043e40
commit ff0c37ff58
8 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/components/dbownmodelscomponent.cpp
View File

@@ -76,6 +76,12 @@ namespace BlackGui
// void
}
const CLogCategoryList &CDbOwnModelsComponent::getLogCategories()
{
static const CLogCategoryList l({ CLogCategory::modelGui(), CLogCategory::guiComponent() });
return l;
}
CAircraftModelView *CDbOwnModelsComponent::view() const
{
return ui->tvp_OwnAircraftModels;

3
src/blackgui/components/dbownmodelscomponent.h
View File

@@ -64,6 +64,9 @@ namespace BlackGui
//! Destructor
virtual ~CDbOwnModelsComponent();
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
//! Own (installed) model for given model string
BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const;

32
src/blackmisc/logcategory.h
View File

@@ -131,6 +131,34 @@ namespace BlackMisc
return cat;
}
//! Model loader
static const CLogCategory &modelLoader()
{
static const CLogCategory cat { "swift.modelloader" };
return cat;
}
//! Model cache
static const CLogCategory &modelCache()
{
static const CLogCategory cat { "swift.modelcache" };
return cat;
}
//! Model set cache
static const CLogCategory &modelSetCache()
{
static const CLogCategory cat { "swift.modelsetcache" };
return cat;
}
//! Model UI
static const CLogCategory &modelGui()
{
static const CLogCategory cat { "swift.modelui" };
return cat;
}
//! Plugin
static const CLogCategory &plugin()
{
@@ -209,6 +237,10 @@ namespace BlackMisc
guiComponent(),
mapping(),
matching(),
modelLoader(),
modelCache(),
modelSetCache(),
modelGui(),
network(),
plugin(),
swiftDbWebservice(),

4
src/blackmisc/logpattern.cpp
View File

@@ -35,6 +35,10 @@ namespace BlackMisc
{ "background task", exactMatch(CLogCategory::worker()) },
{ "model mapping", exactMatch(CLogCategory::mapping()) },
{ "model matching", exactMatch(CLogCategory::matching()) },
{ "model loader", exactMatch(CLogCategory::modelLoader()) },
{ "model cache", exactMatch(CLogCategory::modelCache()) },
{ "model set cache", exactMatch(CLogCategory::modelSetCache()) },
{ "model GUI", exactMatch(CLogCategory::modelGui()) },
{ "network (flight)", exactMatch(CLogCategory::network()) },
{ "swift contexts", exactMatch(CLogCategory::context()) },
{ "swift context slots", exactMatch(CLogCategory::contextSlot()) },

6
src/blackmisc/simulation/aircraftmodelloader.cpp
View File

@@ -41,6 +41,12 @@ namespace BlackMisc
this->gracefulShutdown();
}
const CLogCategoryList &IAircraftModelLoader::getLogCategories()
{
static const CLogCategoryList cats({ CLogCategory::modelLoader() });
return cats;
}
CStatusMessage IAircraftModelLoader::setCachedModels(const CAircraftModelList &models, const CSimulatorInfo &simulator)
{
const CSimulatorInfo sim = simulator.isSingleSimulator() ? simulator : this->getSimulator(); // support default value

3
src/blackmisc/simulation/aircraftmodelloader.h
View File

@@ -73,6 +73,9 @@ namespace BlackMisc
//! \remark this has to be a abstarct, as DB handling is subject of BlackCore
using ModelConsolidation = std::function<int (BlackMisc::Simulation::CAircraftModelList &, bool)>;
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
//! Start the loading process from disk.
//! Optional DB models can be passed and used for data consolidation.
void startLoading(LoadMode mode = InBackgroundWithCache, const ModelConsolidation &modelConsolidation = {}, const QString &directory = {});

12
src/blackmisc/simulation/data/modelcaches.cpp
View File

@@ -126,6 +126,12 @@ namespace BlackMisc
}
}
const CLogCategoryList &CModelCaches::getLogCategories()
{
static const CLogCategoryList l({ CLogCategory::modelCache() });
return l;
}
CAircraftModelList CModelCaches::getCachedModels(const CSimulatorInfo &simulator) const
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
@@ -253,6 +259,12 @@ namespace BlackMisc
}
}
const CLogCategoryList &CModelSetCaches::getLogCategories()
{
static const CLogCategoryList l({ CLogCategory::modelSetCache() });
return l;
}
CAircraftModelList CModelSetCaches::getCachedModels(const CSimulatorInfo &simulator) const
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");

6
src/blackmisc/simulation/data/modelcaches.h
View File

@@ -234,6 +234,9 @@ namespace BlackMisc
//! Construtor
CModelCaches(bool synchronizeCache, QObject *parent = nullptr);
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
//! \name Interface implementations
//! @{
virtual CAircraftModelList getCachedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const override;
@@ -270,6 +273,9 @@ namespace BlackMisc
//! Construtor
CModelSetCaches(bool synchronizeCache, QObject *parent = nullptr);
//! Log categories
static const BlackMisc::CLogCategoryList &getLogCategories();
//! \name Interface implementations
//! @{
virtual CAircraftModelList getCachedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const override;