refs #649, with #659 deferred caches available

* adjustments to use deferred caches
* removed simulator from CAircraftModelSetLoader`s signature as it was not used
* only change current simulator when explicitly set (avoid unintended setting)
* added function to obtain number of elements from model caches
This commit is contained in:
Klaus Basan
2016-05-29 12:37:03 +02:00
parent 771c531125
commit 875b311ede
19 changed files with 123 additions and 66 deletions

View File

@@ -123,22 +123,27 @@ namespace BlackGui
void ps_onJsonDataLoaded(const BlackMisc::Simulation::CSimulatorInfo &simulator);
//! Preferences changed
void ps_preferencesChanged();
void ps_distributorPreferencesChanged();
//! Model has been changed
void ps_modelChanged();
//! Model (of view) has been changed
void ps_viewModelChanged();
private:
//! Default file name
void setSaveFileName(const BlackMisc::Simulation::CSimulatorInfo &sim);
//! Update view to current models
void updateViewToCurrentModels();
//! Update distributor order
void updateDistributorOrder(const BlackMisc::Simulation::CSimulatorInfo &simulator);
QScopedPointer<Ui::CDbOwnModelSetComponent> ui;
QScopedPointer<Ui::CDbOwnModelSetComponent> ui;
QScopedPointer<CDbOwnModelSetDialog> m_modelSetDialog;
BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { BlackMisc::Simulation::CSimulatorInfo(BlackMisc::Simulation::CSimulatorInfo::FSX), this };
BlackMisc::CSetting<BlackCore::Settings::Simulation::DistributorListPreferences> m_distributorPreferences { this, &CDbOwnModelSetComponent::ps_preferencesChanged };
BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { this };
BlackMisc::CSetting<BlackCore::Settings::Simulation::DistributorListPreferences> m_distributorPreferences { this, &CDbOwnModelSetComponent::ps_distributorPreferencesChanged };
// -------------------------- custom menus -----------------------------------
//! The menu for loading and handling own models for mapping tasks
//! \note This is specific for that very component