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

refs #614, use interfaces from last step to reuse mergeWithDb data in multiple components

Browse Source 
* adjusted menus
* adjusted loaders and components
This commit is contained in:
Klaus Basan
2016-04-08 14:11:40 +02:00
parent 43c69d2ed0
commit abca1fde52
12 changed files with 115 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -10,7 +10,7 @@
#include "aircraftmodelmenus.h"
#include "blackgui/guiapplication.h"
#include "blackmisc/icons.h"
#include "blackmisc/simulation/aircraftmodelloader.h"
#include "blackmisc/simulation/aircraftmodelutils.h"
#include <QDesktopServices>
using namespace BlackMisc;
@@ -78,11 +78,22 @@ namespace BlackGui
}
}
CMergeWithDbDataMenu::CMergeWithDbDataMenu(CAircraftModelView *modelView, QObject *modelsTarget, bool separator) :
IAircraftModelViewMenu(modelView, separator), m_modelsTarget(modelsTarget)
{
if (modelsTarget)
{
bool ok = modelsTargetSetable() || modelsTargetUpdatable();
Q_ASSERT_X(ok, Q_FUNC_INFO, "Neither setable nor updatable");
Q_UNUSED(ok);
}
}
void CMergeWithDbDataMenu::customMenu(QMenu &menu) const
{
const CAircraftModelView *mv = modelView();
if (mv->isEmpty()) { this->nestedCustomMenu(menu); return; }
if (!sGui->hasWebDataServices()) { return; }
if (!sGui->hasWebDataServices()) { this->nestedCustomMenu(menu); return; }
this->addSeparator(menu);
QMenu *mm = menu.addMenu(CIcons::databaseEdit16(), "Merge with DB data");
@@ -97,37 +108,41 @@ namespace BlackGui
void CMergeWithDbDataMenu::ps_mergeData()
{
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Missing sGui");
CAircraftModelView *mv = modelView();
if (mv->isEmpty()) { return; }
if (!sGui->hasWebDataServices()) { return; }
const CAircraftModelList dbModels(sGui->getWebDataServices()->getModels());
CAircraftModelList models(this->getAircraftModels());
IAircraftModelLoader::mergeWithDbData(models, dbModels, true);
mv->updateContainerMaybeAsync(models);
if (this->m_loader)
CAircraftModelUtilities::mergeWithDbData(models, dbModels, true);
if (this->modelsTargetSetable())
{
this->m_loader->setModelsInCache(models);
this->modelsTargetSetable()->setModels(models);
}
}
void CMergeWithDbDataMenu::ps_mergeSelectedData()
{
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Missing sGui");
CAircraftModelView *mv = modelView();
if (mv->isEmpty()) { return; }
if (!sGui->hasWebDataServices()) { return; }
CAircraftModelList models(this->getSelectedAircraftModels());
if (models.isEmpty()) { return; }
const CAircraftModelList dbModels(sGui->getWebDataServices()->getModels());
IAircraftModelLoader::mergeWithDbData(models, dbModels, true);
mv->replaceOrAddModelsWithString(models);
if (this->m_loader)
CAircraftModelUtilities::mergeWithDbData(models, dbModels, true);
if (this->modelsTargetUpdatable())
{
this->m_loader->setModelsInCache(models);
this->modelsTargetUpdatable()->updateModels(models);
}
}
IModelsSetable *CMergeWithDbDataMenu::modelsTargetSetable() const
{
return qobject_cast<IModelsSetable *>(this->m_modelsTarget);
}
IModelsUpdatable *CMergeWithDbDataMenu::modelsTargetUpdatable() const
{
return qobject_cast<IModelsUpdatable *>(this->m_modelsTarget);
}
} // ns
} // ns

7
src/blackgui/menus/aircraftmodelmenus.h
View File

@@ -12,7 +12,7 @@
#include "menudelegate.h"
#include "blackgui/views/aircraftmodelview.h"
#include "blackmisc/simulation/aircraftmodelloader.h"
#include "blackmisc/simulation/aircraftmodelinterfaces.h"
#include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
#include <QMenu>
#include <QObject>
@@ -68,10 +68,7 @@ namespace BlackGui
using IAircraftModelViewMenu::IAircraftModelViewMenu;
//! Constructor
CMergeWithDbDataMenu(BlackGui::Views::CAircraftModelView *modelView,
BlackMisc::Simulation::IAircraftModelLoader *modelLoader, bool separator = true) :
IAircraftModelViewMenu(modelView, separator), m_loader(modelLoader)
{}
CMergeWithDbDataMenu(BlackGui::Views::CAircraftModelView *modelView, QObject *modelsTarget, bool separator = true);
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(QMenu &menu) const override;