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

Ref T246, function to display model count and timestamp of model/set caches

Browse Source
This commit is contained in:
Klaus Basan
2018-07-17 18:56:22 +02:00
parent 3b460af8a6
commit 0023fbb57f
7 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackgui/components/firstmodelsetcomponent.cpp
View File

@@ -21,6 +21,7 @@
#include <QStringList>
#include <QFileDialog>
#include <QPointer>
#include <QMessageBox>
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
@@ -53,9 +54,9 @@ namespace BlackGui
bool s = connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CFirstModelSetComponent::onSimulatorChanged);
Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot connect selector signal");
connect(&m_simulatorSettings, &CMultiSimulatorSettings::settingsChanged, this, &CFirstModelSetComponent::onSettingsChanged);
connect(&m_simulatorSettings, &CMultiSimulatorSettings::settingsChanged, this, &CFirstModelSetComponent::onSettingsChanged, Qt::QueuedConnection);
Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot connect settings signal");
connect(m_modelsDialog.data(), &CDbOwnModelsDialog::successfullyLoadedModels, this, &CFirstModelSetComponent::onModelsLoaded);
connect(m_modelsDialog.data(), &CDbOwnModelsDialog::successfullyLoadedModels, this, &CFirstModelSetComponent::onModelsLoaded, Qt::QueuedConnection);
Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot connect models signal");
connect(ui->pb_ModelSet, &QPushButton::clicked, this, &CFirstModelSetComponent::openOwnModelSetDialog);
@@ -86,25 +87,27 @@ namespace BlackGui
// kind of hack, but simplest solution
// we us the loader of the components directly,
// avoid to fully init a loader logic here
static const QString modelInfo("Models indexed: %1");
static const QString modelsNo("No models so far");
const int modelsCount = this->modelLoader()->getAircraftModelsCount();
ui->le_ModelsInfo->setText(modelsCount > 0 ? modelInfo.arg(modelsCount) : modelsNo);
ui->le_ModelsInfo->setText(modelsCount > 0 ? this->modelLoader()->getModelCacheCountAndTimestamp() : modelsNo);
ui->pb_CreateModelSet->setEnabled(modelsCount > 0);
static const QString modelSetInfo("Models in set: %1");
static const QString modelsSetNo("Model set is empty");
const int modelSet = this->modelSetLoader().getAircraftModelsCount();
ui->le_ModelSetInfo->setText(modelsCount > 0 ? modelSetInfo.arg(modelSet) : modelsSetNo);
const int modelsSetCount = this->modelSetLoader().getAircraftModelsCount();
ui->le_ModelSetInfo->setText(modelsSetCount > 0 ? this->modelSetLoader().getModelCacheCountAndTimestamp(simulator) : modelsSetNo);
}
void CFirstModelSetComponent::onSettingsChanged(const CSimulatorInfo &simulator)
{
const CSimulatorInfo currentSimulator = ui->comp_SimulatorSelector->getValue();
if (simulator != currentSimulator) { return; } // ignore changes not for my selected simulator
this->onSimulatorChanged(simulator);
}
void CFirstModelSetComponent::onModelsLoaded(const CSimulatorInfo &simulator)
{
const CSimulatorInfo currentSimulator = ui->comp_SimulatorSelector->getValue();
if (simulator != currentSimulator) { return; } // ignore changes not for my selected simulator
this->onSimulatorChanged(simulator);
}

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

@@ -281,6 +281,16 @@ namespace BlackMisc
return m_caches.getInfoStringFsFamily();
}
QString IAircraftModelLoader::getModelCacheCountAndTimestamp() const
{
return m_caches.getCacheCountAndTimestamp(this->getSimulator());
}
QString IAircraftModelLoader::getModelCacheCountAndTimestamp(const CSimulatorInfo &simulator) const
{
return m_caches.getCacheCountAndTimestamp(simulator);
}
CSpecializedSimulatorSettings IAircraftModelLoader::getCurrentSimulatorSettings() const
{
return m_settings.getSpecializedSettings(this->getSimulator());

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

@@ -150,6 +150,12 @@ namespace BlackMisc
//! \copydoc BlackMisc::Simulation::Data::CModelCaches::getInfoStringFsFamily
QString getModelCacheInfoStringFsFamily() const;
//! \copydoc BlackMisc::Simulation::Data::CModelCaches::getCacheCountAndTimestamp
QString getModelCacheCountAndTimestamp() const;
//! \copydoc BlackMisc::Simulation::Data::CModelCaches::getCacheCountAndTimestamp
QString getModelCacheCountAndTimestamp(const CSimulatorInfo &simulator) const;
//! \copydoc BlackMisc::Simulation::Data::IMultiSimulatorModelCaches::synchronizeCache
void synchronizeModelCache(const CSimulatorInfo &simulator);

10
src/blackmisc/simulation/aircraftmodelsetloader.cpp
View File

@@ -160,5 +160,15 @@ namespace BlackMisc
{
return m_caches.getInfoStringFsFamily();
}
QString CAircraftModelSetLoader::getModelCacheCountAndTimestamp() const
{
return m_caches.getCacheCountAndTimestamp(this->getSimulator());
}
QString CAircraftModelSetLoader::getModelCacheCountAndTimestamp(const CSimulatorInfo &simulator) const
{
return m_caches.getCacheCountAndTimestamp(simulator);
}
} // ns
} // ns

9
src/blackmisc/simulation/aircraftmodelsetloader.h
View File

@@ -64,7 +64,7 @@ namespace BlackMisc
//! The loaded models for given simulator
//! \threadsafe
//! \remark non-const because it synchronizes cache
BlackMisc::Simulation::CAircraftModelList getAircraftModels(const BlackMisc::Simulation::CSimulatorInfo &simulator);
BlackMisc::Simulation::CAircraftModelList getAircraftModels(const CSimulatorInfo &simulator);
//! Count of loaded models
//! \threadsafe
@@ -79,6 +79,7 @@ namespace BlackMisc
BlackMisc::Simulation::CAircraftModelList getCachedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator) const;
//! Current simulator
//! \threadsafe
CSimulatorInfo getSimulator() const;
//! Supported simulators as string
@@ -103,6 +104,12 @@ namespace BlackMisc
//! \copydoc BlackMisc::Simulation::Data::CModelCaches::getInfoStringFsFamily
QString getInfoStringFsFamily() const;
//! \copydoc BlackMisc::Simulation::Data::CModelCaches::getCacheCountAndTimestamp
QString getModelCacheCountAndTimestamp() const;
//! \copydoc BlackMisc::Simulation::Data::CModelCaches::getCacheCountAndTimestamp
QString getModelCacheCountAndTimestamp(const CSimulatorInfo &simulator) const;
//! \name Implementations of the models interfaces
//! @{
virtual void setModels(const BlackMisc::Simulation::CAircraftModelList &models) override { this->setCachedModels(models, this->getSimulator()); }

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

@@ -38,6 +38,12 @@ namespace BlackMisc
return is.arg(this->getCachedModelsCount(CSimulatorInfo::FSX)).arg(this->getCachedModelsCount(CSimulatorInfo::P3D)).arg(this->getCachedModelsCount(CSimulatorInfo::FS9));
}
QString IMultiSimulatorModelCaches::getCacheCountAndTimestamp(const CSimulatorInfo &simulator) const
{
static const QString s("%1 models, ts: %2");
return s.arg(this->getCachedModelsCount(simulator)).arg(this->getCacheTimestamp(simulator).toString("yyyy-MM-dd HH:mm:ss"));
}
void IMultiSimulatorModelCaches::onLastSelectionChanged()
{
this->synchronizeCurrentCache();

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

@@ -238,6 +238,9 @@ namespace BlackMisc
//! Info string without XPlane (FSX,P3D, FS9)
QString getInfoStringFsFamily() const;
//! Cache count and timestamp
QString getCacheCountAndTimestamp(const CSimulatorInfo &simulator) const;
//! Descriptive text
virtual QString getDescription() const = 0;