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

[Mappimg tool] Clear "own models" if there are NO models and hence NO "models changed" signal

Browse Source
This commit is contained in:
Klaus Basan
2020-03-24 00:20:43 +01:00
committed by Mat Sutcliffe
parent 8c2d2b0667
commit 9c01983f25
4 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/blackgui/components/dbmappingcomponent.cpp
View File

@@ -105,24 +105,25 @@ namespace BlackGui
// connects // connects
connect(ui->editor_ModelMapping, &CModelMappingForm::requestStash, this, &CDbMappingComponent::stashCurrentModel); connect(ui->editor_ModelMapping, &CModelMappingForm::requestStash, this, &CDbMappingComponent::stashCurrentModel);
connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::onModelRowSelected); connect(ui->comp_OwnAircraftModels, &CDbOwnModelsComponent::ownModelsSimulatorChanged, this, &CDbMappingComponent::onOwnModelsSimulatorChanged, Qt::QueuedConnection);
connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onOwnModelsChangedDigest, Qt::QueuedConnection); connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::onModelRowSelected);
connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::requestStash, this, &CDbMappingComponent::stashSelectedModels); connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onOwnModelsChangedDigest, Qt::QueuedConnection);
connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::requestStash, this, &CDbMappingComponent::stashSelectedModels);
connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::toggledHighlightStashedModels, this, &CDbMappingComponent::onStashedModelsChangedTriggerDigest); connect(ui->comp_OwnAircraftModels->view(), &CAircraftModelView::toggledHighlightStashedModels, this, &CDbMappingComponent::onStashedModelsChangedTriggerDigest);
connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::onModelRowSelected); connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::onModelRowSelected);
connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onWorkbenchDataChanged, Qt::QueuedConnection); connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onWorkbenchDataChanged, Qt::QueuedConnection);
connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::requestStash, this, &CDbMappingComponent::stashSelectedModels); connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::requestStash, this, &CDbMappingComponent::stashSelectedModels);
connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::toggledHighlightStashedModels, this, &CDbMappingComponent::onStashedModelsChangedTriggerDigest); connect(ui->comp_ModelWorkbench->view(), &CAircraftModelView::toggledHighlightStashedModels, this, &CDbMappingComponent::onStashedModelsChangedTriggerDigest);
connect(ui->comp_StashAircraft->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onStashedModelsDataChangedDigest); connect(ui->comp_StashAircraft->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onStashedModelsDataChangedDigest);
connect(ui->comp_StashAircraft->view(), &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::onModelRowSelected); connect(ui->comp_StashAircraft->view(), &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::onModelRowSelected);
connect(ui->comp_StashAircraft->view(), &CAircraftModelView::requestHandlingOfStashDrop, this, &CDbMappingComponent::handleStashDropRequest); connect(ui->comp_StashAircraft->view(), &CAircraftModelView::requestHandlingOfStashDrop, this, &CDbMappingComponent::handleStashDropRequest);
connect(ui->comp_StashAircraft, &CDbStashComponent::stashedModelsChanged, this, &CDbMappingComponent::onStashedModelsChangedTriggerDigest); connect(ui->comp_StashAircraft, &CDbStashComponent::stashedModelsChanged, this, &CDbMappingComponent::onStashedModelsChangedTriggerDigest);
connect(ui->comp_StashAircraft, &CDbStashComponent::modelsSuccessfullyPublished, this, &CDbMappingComponent::onModelsSuccessfullyPublished, Qt::QueuedConnection); connect(ui->comp_StashAircraft, &CDbStashComponent::modelsSuccessfullyPublished, this, &CDbMappingComponent::onModelsSuccessfullyPublished, Qt::QueuedConnection);
connect(ui->comp_OwnModelSet->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onModelSetChangedDigest, Qt::QueuedConnection); connect(ui->comp_OwnModelSet->view(), &CAircraftModelView::modelDataChangedDigest, this, &CDbMappingComponent::onModelSetChangedDigest, Qt::QueuedConnection);
connect(ui->comp_OwnModelSet->view(), &CAircraftModelView::requestStash, this, &CDbMappingComponent::stashSelectedModels); connect(ui->comp_OwnModelSet->view(), &CAircraftModelView::requestStash, this, &CDbMappingComponent::stashSelectedModels);
connect(ui->tw_ModelsToBeMapped, &QTabWidget::currentChanged, this, &CDbMappingComponent::onTabIndexChanged); connect(ui->tw_ModelsToBeMapped, &QTabWidget::currentChanged, this, &CDbMappingComponent::onTabIndexChanged);
connect(ui->tw_ModelsToBeMapped, &QTabWidget::currentChanged, ui->comp_ModelMatcher, &CModelMatcherComponent::tabIndexChanged); connect(ui->tw_ModelsToBeMapped, &QTabWidget::currentChanged, ui->comp_ModelMatcher, &CModelMatcherComponent::tabIndexChanged);
@@ -481,7 +482,7 @@ namespace BlackGui
{ {
const int h = this->height(); // total height const int h = this->height(); // total height
int h2 = ui->qw_EditorsScrollArea->minimumHeight(); int h2 = ui->qw_EditorsScrollArea->minimumHeight();
h2 *= 1.10; // desired height of inner widget + some space for scrollarea h2 = qRound(h2 * 1.10); // desired height of inner widget + some space for scrollarea
int currentSize = ui->sp_MappingComponent->sizes().last(); // current size int currentSize = ui->sp_MappingComponent->sizes().last(); // current size
if (h2 <= currentSize) { return; } if (h2 <= currentSize) { return; }
@@ -503,8 +504,8 @@ namespace BlackGui
void CDbMappingComponent::maxTableView() void CDbMappingComponent::maxTableView()
{ {
const int h = this->height(); const int h = this->height();
int h1 = h; const int h1 = h;
int h2 = 0; const int h2 = 0;
const QList<int> sizes({h1, h2}); const QList<int> sizes({h1, h2});
ui->sp_MappingComponent->setSizes(sizes); ui->sp_MappingComponent->setSizes(sizes);
} }
@@ -636,15 +637,15 @@ namespace BlackGui
void CDbMappingComponent::onVPilotDataChanged(int count, bool withFilter) void CDbMappingComponent::onVPilotDataChanged(int count, bool withFilter)
{ {
Q_UNUSED(count); Q_UNUSED(count)
Q_UNUSED(withFilter); Q_UNUSED(withFilter)
ui->tvp_AircraftModelsForVPilot->setTabWidgetViewText(ui->tw_ModelsToBeMapped, ui->tw_ModelsToBeMapped->indexOf(ui->tab_VPilot)); ui->tvp_AircraftModelsForVPilot->setTabWidgetViewText(ui->tw_ModelsToBeMapped, ui->tw_ModelsToBeMapped->indexOf(ui->tab_VPilot));
} }
void CDbMappingComponent::onWorkbenchDataChanged(int count, bool withFilter) void CDbMappingComponent::onWorkbenchDataChanged(int count, bool withFilter)
{ {
Q_UNUSED(count); Q_UNUSED(count)
Q_UNUSED(withFilter); Q_UNUSED(withFilter)
ui->comp_ModelWorkbench->view()->setTabWidgetViewText(ui->tw_ModelsToBeMapped, ui->tw_ModelsToBeMapped->indexOf(ui->tab_Workbench)); ui->comp_ModelWorkbench->view()->setTabWidgetViewText(ui->tw_ModelsToBeMapped, ui->tw_ModelsToBeMapped->indexOf(ui->tab_Workbench));
} }
@@ -695,13 +696,13 @@ namespace BlackGui
contextMenu->addAction("Max.data area", this, &CDbMappingComponent::resizeForSelect, QKeySequence(Qt::CTRL + Qt::Key_M, Qt::Key_D)); contextMenu->addAction("Max.data area", this, &CDbMappingComponent::resizeForSelect, QKeySequence(Qt::CTRL + Qt::Key_M, Qt::Key_D));
contextMenu->addAction("Max.mapping area", this, &CDbMappingComponent::resizeForMapping, QKeySequence(Qt::CTRL + Qt::Key_M, Qt::Key_M)); contextMenu->addAction("Max.mapping area", this, &CDbMappingComponent::resizeForMapping, QKeySequence(Qt::CTRL + Qt::Key_M, Qt::Key_M));
QAction *selectedItem = contextMenu.data()->exec(globalPos); QAction *selectedItem = contextMenu.data()->exec(globalPos);
Q_UNUSED(selectedItem); Q_UNUSED(selectedItem)
} }
void CDbMappingComponent::onStashedModelsDataChangedDigest(int count, bool withFilter) void CDbMappingComponent::onStashedModelsDataChangedDigest(int count, bool withFilter)
{ {
Q_UNUSED(count); Q_UNUSED(count)
Q_UNUSED(withFilter); Q_UNUSED(withFilter)
ui->comp_StashAircraft->view()->setTabWidgetViewText(ui->tw_ModelsToBeMapped, ui->tw_ModelsToBeMapped->indexOf(ui->tab_StashAircraftModels)); ui->comp_StashAircraft->view()->setTabWidgetViewText(ui->tw_ModelsToBeMapped, ui->tw_ModelsToBeMapped->indexOf(ui->tab_StashAircraftModels));
// update editors // update editors
@@ -710,8 +711,8 @@ namespace BlackGui
void CDbMappingComponent::onModelSetChangedDigest(int count, bool withFilter) void CDbMappingComponent::onModelSetChangedDigest(int count, bool withFilter)
{ {
Q_UNUSED(count); Q_UNUSED(count)
Q_UNUSED(withFilter); Q_UNUSED(withFilter)
// none standard with simulator // none standard with simulator
int i = ui->tw_ModelsToBeMapped->indexOf(ui->tab_OwnModelSet); int i = ui->tw_ModelsToBeMapped->indexOf(ui->tab_OwnModelSet);
@@ -723,8 +724,8 @@ namespace BlackGui
void CDbMappingComponent::onOwnModelsChangedDigest(int count, bool withFilter) void CDbMappingComponent::onOwnModelsChangedDigest(int count, bool withFilter)
{ {
Q_UNUSED(count); Q_UNUSED(count)
Q_UNUSED(withFilter); Q_UNUSED(withFilter)
// non standard with sim // non standard with sim
const int i = ui->tw_ModelsToBeMapped->indexOf(ui->tab_OwnModels); const int i = ui->tw_ModelsToBeMapped->indexOf(ui->tab_OwnModels);
@@ -804,6 +805,15 @@ namespace BlackGui
} }
} }
void CDbMappingComponent::onOwnModelsSimulatorChanged(const CSimulatorInfo simulator)
{
// loading of models can fail, so we clean the tab text
Q_UNUSED(simulator)
ui->comp_OwnAircraftModels->clearView();
this->onOwnModelsChangedDigest(0, false);
}
CAircraftModel CDbMappingComponent::getEditorAircraftModel() const CAircraftModel CDbMappingComponent::getEditorAircraftModel() const
{ {
CAircraftModel model(ui->editor_ModelMapping->getValue()); CAircraftModel model(ui->editor_ModelMapping->getValue());

3
src/blackgui/components/dbmappingcomponent.h
View File

@@ -285,6 +285,9 @@ namespace BlackGui
//! Row has been selected //! Row has been selected
void onModelRowSelected(const QModelIndex &index); void onModelRowSelected(const QModelIndex &index);
//! Simulator for own model has changed
void onOwnModelsSimulatorChanged(const BlackMisc::Simulation::CSimulatorInfo simulator);
//! User object changed //! User object changed
void onUserChanged(); void onUserChanged();

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

@@ -150,7 +150,11 @@ namespace BlackGui
bool CDbOwnModelsComponent::setSimulator(const CSimulatorInfo &simulator, bool forced) bool CDbOwnModelsComponent::setSimulator(const CSimulatorInfo &simulator, bool forced)
{ {
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator"); Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
if (!forced && m_simulator == simulator) { return false; }
const bool simUnchanged = (m_simulator == simulator);
if (!simUnchanged) { emit this->ownModelsSimulatorChanged(simulator); }
if (!forced && simUnchanged) { return false; }
// changed simulator // changed simulator
m_simulator = simulator; m_simulator = simulator;
@@ -200,6 +204,11 @@ namespace BlackGui
return m; return m;
} }
void CDbOwnModelsComponent::clearView()
{
ui->tvp_OwnAircraftModels->clear();
}
void CDbOwnModelsComponent::gracefulShutdown() void CDbOwnModelsComponent::gracefulShutdown()
{ {
// void // void
@@ -531,7 +540,7 @@ namespace BlackGui
connect(m_loadActions[0], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked) connect(m_loadActions[0], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{ {
if (!ownModelsComp) { return; } if (!ownModelsComp) { return; }
Q_UNUSED(checked); Q_UNUSED(checked)
ownModelsComp->clearSimulatorCache(CSimulatorInfo::fsx()); ownModelsComp->clearSimulatorCache(CSimulatorInfo::fsx());
}); });
} }
@@ -545,7 +554,7 @@ namespace BlackGui
connect(m_clearCacheActions[1], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked) connect(m_clearCacheActions[1], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{ {
if (!ownModelsComp) { return; } if (!ownModelsComp) { return; }
Q_UNUSED(checked); Q_UNUSED(checked)
ownModelsComp->clearSimulatorCache(CSimulatorInfo::p3d()); ownModelsComp->clearSimulatorCache(CSimulatorInfo::p3d());
}); });
} }
@@ -559,7 +568,7 @@ namespace BlackGui
connect(m_clearCacheActions[2], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked) connect(m_clearCacheActions[2], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{ {
if (!ownModelsComp) { return; } if (!ownModelsComp) { return; }
Q_UNUSED(checked); Q_UNUSED(checked)
ownModelsComp->clearSimulatorCache(CSimulatorInfo::fs9()); ownModelsComp->clearSimulatorCache(CSimulatorInfo::fs9());
}); });
} }
@@ -587,7 +596,7 @@ namespace BlackGui
connect(m_clearCacheActions[3], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked) connect(m_clearCacheActions[3], &QAction::triggered, ownModelsComp, [ownModelsComp](bool checked)
{ {
if (!ownModelsComp) { return; } if (!ownModelsComp) { return; }
Q_UNUSED(checked); Q_UNUSED(checked)
ownModelsComp->clearSimulatorCache(CSimulatorInfo::fg()); ownModelsComp->clearSimulatorCache(CSimulatorInfo::fg());
}); });
} }

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

@@ -101,6 +101,9 @@ namespace BlackGui
//! Update view and cache //! Update view and cache
BlackMisc::CStatusMessage updateViewAndCache(const BlackMisc::Simulation::CAircraftModelList &models); BlackMisc::CStatusMessage updateViewAndCache(const BlackMisc::Simulation::CAircraftModelList &models);
//! Clear the view
void clearView();
//! Models view //! Models view
BlackGui::Views::CAircraftModelView *view() const; BlackGui::Views::CAircraftModelView *view() const;
@@ -128,6 +131,9 @@ namespace BlackGui
//! Models have been successfully loaded //! Models have been successfully loaded
void successfullyLoadedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, int count); void successfullyLoadedModels(const BlackMisc::Simulation::CSimulatorInfo &simulator, int count);
//! Own models simulator has changed
void ownModelsSimulatorChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);
private: private:
QScopedPointer<Ui::CDbOwnModelsComponent> ui; QScopedPointer<Ui::CDbOwnModelsComponent> ui;
BlackMisc::Simulation::IAircraftModelLoader *m_modelLoader = nullptr; //!< read own aircraft models, aka models on disk BlackMisc::Simulation::IAircraftModelLoader *m_modelLoader = nullptr; //!< read own aircraft models, aka models on disk