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

refs #555, load models from directory

Browse Source 
* file dialog
* adjusted signatures to pass directory
This commit is contained in:
Klaus Basan
2016-08-20 18:08:14 +02:00
committed by Mathew Sutcliffe
parent 126df28d0c
commit 5789120ecc
8 changed files with 92 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
#include <QAction>
#include <QIcon>
#include <QtGlobal>
#include <QFileDialog>
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
@@ -192,6 +193,15 @@ namespace BlackGui
this->ui->tvp_OwnAircraftModels->setSaveFileName(n);
}
QString CDbOwnModelsComponent::directorySelector(const CSimulatorInfo &simulatorInfo)
{
const QString text("Open directory (%1)");
const QString dir = QFileDialog::getExistingDirectory(nullptr, text.arg(simulatorInfo.toQString()),
"",
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
return dir;
}
void CDbOwnModelsComponent::CLoadModelsMenu::customMenu(CMenuActions &menuActions)
{
// for the moment I use all sims, I could restrict to CSimulatorInfo::getLocallyInstalledSimulators();
@@ -261,7 +271,7 @@ namespace BlackGui
// I need those models because I want to merge with DM data in the loader
if (sGui->getWebDataServices() && sGui->getWebDataServices()->getModelsCount() > 0)
{
if (this->m_reloadActions.isEmpty()) { this->m_reloadActions = QList<QAction *>({nullptr, nullptr, nullptr, nullptr}); }
if (this->m_reloadActions.isEmpty()) { this->m_reloadActions = QList<QAction *>({nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr}); }
menuActions.addMenu(CIcons::refresh16(), "Force model reload", CMenuAction::pathSimulatorModelsReload());
if (sims.fsx())
{
@@ -273,47 +283,98 @@ namespace BlackGui
Q_UNUSED(checked);
ownModelsComp->ps_requestSimulatorModels(CSimulatorInfo(CSimulatorInfo::FSX), IAircraftModelLoader::InBackgroundNoCache);
});
this->m_reloadActions[1] = new QAction(CIcons::appModels16(), "FSX models from directory", this);
connect(this->m_reloadActions[1], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{
Q_UNUSED(checked);
const CSimulatorInfo sim(CSimulatorInfo::FSX);
const QString dir = CDbOwnModelsComponent::directorySelector(sim);
if (!dir.isEmpty())
{
ownModelsComp->ps_requestSimulatorModels(sim, IAircraftModelLoader::InBackgroundNoCache, dir);
}
});
}
menuActions.addAction(this->m_reloadActions[0], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(this->m_reloadActions[1], CMenuAction::pathSimulatorModelsReload());
}
if (sims.p3d())
{
if (!this->m_reloadActions[1])
if (!this->m_reloadActions[2])
{
this->m_reloadActions[1] = new QAction(CIcons::appModels16(), "P3D models", this);
connect(this->m_reloadActions[1], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
this->m_reloadActions[2] = new QAction(CIcons::appModels16(), "P3D models", this);
connect(this->m_reloadActions[2], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{
Q_UNUSED(checked);
ownModelsComp->ps_requestSimulatorModels(CSimulatorInfo(CSimulatorInfo::P3D), IAircraftModelLoader::InBackgroundNoCache);
});
this->m_reloadActions[3] = new QAction(CIcons::appModels16(), "P3D models from directoy", this);
connect(this->m_reloadActions[3], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{
Q_UNUSED(checked);
const CSimulatorInfo sim(CSimulatorInfo::P3D);
const QString dir = CDbOwnModelsComponent::directorySelector(sim);
if (!dir.isEmpty())
{
ownModelsComp->ps_requestSimulatorModels(sim, IAircraftModelLoader::InBackgroundNoCache, dir);
}
});
}
menuActions.addAction(this->m_reloadActions[1], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(this->m_reloadActions[2], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(this->m_reloadActions[3], CMenuAction::pathSimulatorModelsReload());
}
if (sims.fs9())
{
if (!this->m_reloadActions[2])
if (!this->m_reloadActions[4])
{
this->m_reloadActions[2] = new QAction(CIcons::appModels16(), "FS9 models", this);
connect(this->m_reloadActions[2], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
this->m_reloadActions[4] = new QAction(CIcons::appModels16(), "FS9 models", this);
connect(this->m_reloadActions[4], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{
Q_UNUSED(checked);
ownModelsComp->ps_requestSimulatorModels(CSimulatorInfo(CSimulatorInfo::FS9), IAircraftModelLoader::InBackgroundNoCache);
});
this->m_reloadActions[5] = new QAction(CIcons::appModels16(), "FS9 models from directoy", this);
connect(this->m_reloadActions[5], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{
Q_UNUSED(checked);
const CSimulatorInfo sim(CSimulatorInfo::FS9);
const QString dir = CDbOwnModelsComponent::directorySelector(sim);
if (!dir.isEmpty())
{
ownModelsComp->ps_requestSimulatorModels(sim, IAircraftModelLoader::InBackgroundNoCache, dir);
}
});
}
menuActions.addAction(this->m_reloadActions[2], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(this->m_reloadActions[4], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(this->m_reloadActions[5], CMenuAction::pathSimulatorModelsReload());
}
if (sims.xplane())
{
if (!this->m_reloadActions[3])
if (!this->m_reloadActions[6])
{
this->m_reloadActions[3] = new QAction(CIcons::appModels16(), "XPlane models", this);
this->m_reloadActions[6] = new QAction(CIcons::appModels16(), "XPlane models", this);
connect(this->m_reloadActions[3], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{
Q_UNUSED(checked);
ownModelsComp->ps_requestSimulatorModels(CSimulatorInfo(CSimulatorInfo::XPLANE), IAircraftModelLoader::InBackgroundNoCache);
});
this->m_reloadActions[7] = new QAction(CIcons::appModels16(), "XPlane models from directoy", this);
connect(this->m_reloadActions[7], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{
Q_UNUSED(checked);
const CSimulatorInfo sim(CSimulatorInfo::XPLANE);
const QString dir = CDbOwnModelsComponent::directorySelector(sim);
if (!dir.isEmpty())
{
ownModelsComp->ps_requestSimulatorModels(sim, IAircraftModelLoader::InBackgroundNoCache, dir);
}
});
}
menuActions.addAction(this->m_reloadActions[3], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(this->m_reloadActions[6], CMenuAction::pathSimulatorModelsReload());
menuActions.addAction(this->m_reloadActions[7], CMenuAction::pathSimulatorModelsReload());
}
}
else
@@ -334,7 +395,7 @@ namespace BlackGui
);
}
void CDbOwnModelsComponent::ps_loadInstalledModels(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode mode)
void CDbOwnModelsComponent::ps_loadInstalledModels(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode mode, const QString &directory)
{
if (!this->initModelLoader(simulator))
{
@@ -351,7 +412,7 @@ namespace BlackGui
CLogMessage(this).info("Starting loading for %1") << simulator.toQString();
this->ui->tvp_OwnAircraftModels->showLoadIndicator();
Q_ASSERT_X(sGui && sGui->getWebDataServices(), Q_FUNC_INFO, "missing web data services");
this->m_modelLoader->startLoading(mode, &CDatabaseUtils::consolidateModelsWithDbData);
this->m_modelLoader->startLoading(mode, &CDatabaseUtils::consolidateModelsWithDbData, directory);
}
void CDbOwnModelsComponent::ps_onOwnModelsLoadingFinished(bool success, const CSimulatorInfo &simulator)
@@ -376,9 +437,9 @@ namespace BlackGui
this->ui->tvp_OwnAircraftModels->hideLoadIndicator();
}
void CDbOwnModelsComponent::ps_requestSimulatorModels(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode mode)
void CDbOwnModelsComponent::ps_requestSimulatorModels(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode mode, const QString &directory)
{
this->ps_loadInstalledModels(simulator, mode);
this->ps_loadInstalledModels(simulator, mode, directory);
}
} // ns
} // ns

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

@@ -110,13 +110,13 @@ namespace BlackGui
void ps_requestOwnModelsUpdate();
//! Load the models
void ps_loadInstalledModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode);
void ps_loadInstalledModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode, const QString &directory = "");
//! Model loading finished
void ps_onOwnModelsLoadingFinished(bool success, const BlackMisc::Simulation::CSimulatorInfo &simulator);
//! Request simulator models
void ps_requestSimulatorModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode);
void ps_requestSimulatorModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode, const QString &directory = "");
private:
QScopedPointer<Ui::CDbOwnModelsComponent> ui;
@@ -129,6 +129,9 @@ namespace BlackGui
//! File name for savinf
void setSaveFileName(const BlackMisc::Simulation::CSimulatorInfo &sim);
//! Directory selector
static QString directorySelector(const BlackMisc::Simulation::CSimulatorInfo &simulatorInfo);
//! The menu for loading and handling own models for mapping tasks
//! \note This is specific for that very component
class CLoadModelsMenu : public BlackGui::Menus::IMenuDelegate