Ref T292, Ref T285 removed model set loader from UI components and replaced by central cache

This commit is contained in:
Klaus Basan
2018-07-24 16:57:28 +02:00
parent a24d35f841
commit 18041b1dc2
8 changed files with 96 additions and 89 deletions

View File

@@ -10,17 +10,18 @@
#include "blackcore/webdataservices.h"
#include "blackgui/components/distributorpreferencescomponent.h"
#include "blackgui/components/simulatorselector.h"
#include "blackgui/guiapplication.h"
#include "blackgui/guiutility.h"
#include "blackgui/models/distributorlistmodel.h"
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/views/distributorview.h"
#include "blackgui/views/viewbase.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/orderable.h"
#include "blackgui/models/distributorlistmodel.h"
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/guiapplication.h"
#include "blackgui/guiutility.h"
#include "blackmisc/simulation/data/modelcaches.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/distributor.h"
#include "blackmisc/simulation/distributorlistpreferences.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/orderable.h"
#include "blackmisc/statusmessage.h"
#include "ui_distributorpreferencescomponent.h"
@@ -29,9 +30,11 @@
#include <QTimer>
#include <Qt>
#include <QtGlobal>
#include <QPointer>
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::Data;
using namespace BlackMisc::Network;
using namespace BlackGui::Views;
using namespace BlackGui::Models;
@@ -41,110 +44,111 @@ namespace BlackGui
namespace Components
{
CDistributorPreferencesComponent::CDistributorPreferencesComponent(QWidget *parent) :
QFrame(parent),
COverlayMessagesFrame(parent),
ui(new Ui::CDistributorPreferencesComponent)
{
const CSimulatorInfo simulator = this->m_modelSetLoader.getSimulator();
ui->setupUi(this);
ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
ui->comp_SimulatorSelector->setRememberSelection(true);
ui->comp_SimulatorSelector->setValue(simulator);
ui->comp_SimulatorSelector->setRememberSelectionAndSetToLastSelection();
connect(ui->pb_All, &QPushButton::pressed, this, &CDistributorPreferencesComponent::ps_loadAll);
connect(ui->pb_AllForSimulator, &QPushButton::pressed, this, &CDistributorPreferencesComponent::ps_loadAllForSimulator);
connect(ui->pb_AllInSet, &QPushButton::pressed, this, &CDistributorPreferencesComponent::ps_loadDistributorsFromSet);
connect(ui->pb_Save, &QPushButton::pressed, this, &CDistributorPreferencesComponent::ps_save);
connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CDistributorPreferencesComponent::ps_simulatorChanged);
this->m_overlayMessageFrame = CGuiUtility::nextOverlayMessageFrame(this);
Q_ASSERT_X(this->m_overlayMessageFrame, Q_FUNC_INFO, "Missing message frame");
connect(ui->pb_All, &QPushButton::pressed, this, &CDistributorPreferencesComponent::loadAllDistributors);
connect(ui->pb_AllForSimulator, &QPushButton::pressed, this, &CDistributorPreferencesComponent::loadDistributorsForSimulator);
connect(ui->pb_AllInSet, &QPushButton::pressed, this, &CDistributorPreferencesComponent::loadDistributorsFromSet);
connect(ui->pb_Save, &QPushButton::pressed, this, &CDistributorPreferencesComponent::save);
connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CDistributorPreferencesComponent::onSimulatorChanged);
ui->tvp_Distributors->setDistributorMode(CDistributorListModel::NormalWithOrder);
ui->tvp_Distributors->menuRemoveItems(CDistributorView::MenuBackend | CDistributorView::MenuDisplayAutomaticallyAndRefresh | CDistributorView::MenuLoadAndSave);
ui->tvp_Distributors->menuAddItems(CDistributorView::MenuClear | CDistributorView::MenuOrderable | CDistributorView::MenuRemoveSelectedRows);
ui->tvp_Distributors->initAsOrderable();
QTimer::singleShot(1000, this, &CDistributorPreferencesComponent::ps_deferredInit);
this->triggerDeferredSimulatorChange();
}
CDistributorPreferencesComponent::~CDistributorPreferencesComponent()
{ }
void CDistributorPreferencesComponent::ps_preferencesChanged()
void CDistributorPreferencesComponent::onPreferencesChanged()
{
// changed somewhere else
const CSimulatorInfo sim(ui->comp_SimulatorSelector->getValue());
const CDistributorList distributors = this->m_distributorPreferences.getThreadLocal().getDistributors(sim);
const CDistributorList distributors = m_distributorPreferences.getThreadLocal().getDistributors(sim);
this->updateContainerMaybeAsync(distributors);
}
void CDistributorPreferencesComponent::ps_loadAll()
void CDistributorPreferencesComponent::loadAllDistributors()
{
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Missing application");
const CDistributorList distributors(sGui->getWebDataServices()->getDistributors());
if (distributors.isEmpty())
{
const CStatusMessage m = CStatusMessage(this).error("No distributors");
this->m_overlayMessageFrame->showOverlayMessage(m);
this->showOverlayMessage(m);
return;
}
this->updateContainerMaybeAsync(distributors);
}
void CDistributorPreferencesComponent::ps_loadAllForSimulator()
void CDistributorPreferencesComponent::loadDistributorsForSimulator()
{
const CSimulatorInfo sim(ui->comp_SimulatorSelector->getValue());
const CDistributorList distributors(sGui->getWebDataServices()->getDistributors().matchesSimulator(sim));
if (distributors.isEmpty())
{
const CStatusMessage m = CStatusMessage(this).error("No distributors, or no distributors matching %1") << sim.toQString();
this->m_overlayMessageFrame->showOverlayMessage(m);
this->showOverlayMessage(m);
return;
}
this->updateContainerMaybeAsync(distributors);
}
void CDistributorPreferencesComponent::ps_loadDistributorsFromSet()
void CDistributorPreferencesComponent::loadDistributorsFromSet()
{
const CSimulatorInfo sim(ui->comp_SimulatorSelector->getValue());
const CAircraftModelList models = this->m_modelSetLoader.getAircraftModels(sim);
const CAircraftModelList models = CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModels(sim);
if (models.isEmpty())
{
const CStatusMessage m = CStatusMessage(this).error("No data in model set %1") << sim.toQString();
this->m_overlayMessageFrame->showOverlayMessage(m);
this->showOverlayMessage(m);
return;
}
const CDistributorList distributors = models.getDistributors();
if (distributors.isEmpty())
{
const CStatusMessage m = CStatusMessage(this).error("No distributors for model set %1") << sim.toQString();
this->m_overlayMessageFrame->showOverlayMessage(m);
this->showOverlayMessage(m);
return;
}
this->updateContainerMaybeAsync(distributors);
}
void CDistributorPreferencesComponent::ps_save()
void CDistributorPreferencesComponent::save()
{
const CDistributorList distributors(ui->tvp_Distributors->container());
const CSimulatorInfo simulator = ui->comp_SimulatorSelector->getValue();
CDistributorListPreferences preferences = this->m_distributorPreferences.getThreadLocal();
CDistributorListPreferences preferences = m_distributorPreferences.getThreadLocal();
preferences.setDistributors(distributors, simulator);
const CStatusMessage m = this->m_distributorPreferences.setAndSave(preferences);
const CStatusMessage m = m_distributorPreferences.setAndSave(preferences);
CLogMessage::preformatted(m);
}
void CDistributorPreferencesComponent::ps_simulatorChanged(const CSimulatorInfo &simulator)
void CDistributorPreferencesComponent::onSimulatorChanged(const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Expect single simulator");
const CDistributorList distributors(this->m_distributorPreferences.getThreadLocal().getDistributors(simulator));
const CDistributorList distributors(m_distributorPreferences.getThreadLocal().getDistributors(simulator));
ui->tvp_Distributors->updateContainerMaybeAsync(distributors);
}
void CDistributorPreferencesComponent::ps_deferredInit()
void CDistributorPreferencesComponent::triggerDeferredSimulatorChange()
{
this->ps_simulatorChanged(ui->comp_SimulatorSelector->getValue());
QPointer<CDistributorPreferencesComponent> myself(this);
QTimer::singleShot(1000, this, [ = ]
{
if (!myself) { return; }
if (!sApp || sApp->isShuttingDown()) { return; }
const CSimulatorInfo sim = ui->comp_SimulatorSelector->getValue();
this->onSimulatorChanged(sim);
});
}
void CDistributorPreferencesComponent::updateContainerMaybeAsync(const CDistributorList &models, bool sortByOrder)